Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c2ec60c

Browse files
some sonar cleanup (#1108)
1 parent ea981d1 commit c2ec60c

File tree

13 files changed

+157
-88
lines changed

13 files changed

+157
-88
lines changed

‎core/src/main/java/oracle/weblogic/deploy/aliases/TypeUtils.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.io.File;
88
import java.lang.reflect.Array;
9-
import java.lang.NumberFormatException;
109
import java.util.ArrayList;
1110
import java.util.Arrays;
1211
import java.util.HashMap;
@@ -274,7 +273,7 @@ public static Object[] convertToObjectArray(Object value, String strValue, Strin
274273
if (Object[].class.isAssignableFrom(value.getClass())) {
275274
result = Object[].class.cast(value);
276275
} else if (value instanceof List) {
277-
List list = (List) value;
276+
List<?> list = (List<?>) value;
278277
if (!list.isEmpty()) {
279278
//thanks to Java Generics type erasure in List, need to get element type from list element
280279
Class<?> elementClass = list.get(0).getClass();
@@ -293,9 +292,9 @@ public static Object[] convertToObjectArray(Object value, String strValue, Strin
293292
}
294293

295294
private static List convertToList(Object value, String strValue, String delimiter) throws AliasException {
296-
List result = null;
295+
List<?> result = null;
297296
if (value instanceof List) {
298-
result = (List) value;
297+
result = (List<?>) value;
299298
} else if (value instanceof Object[]) {
300299
Object[] array = (Object[]) value;
301300
if (array.length > 0) {
@@ -359,7 +358,7 @@ private static PyDictionary convertToDictionary(Object value, String delimiter,
359358
final String METHOD = "convertToDictionary";
360359

361360
PyDictionary dictionary;
362-
if (value instanceof PyOrderedDict || valueinstanceofPyDictionary) {
361+
if (value instanceof PyDictionary) {
363362
dictionary = (PyDictionary)value;
364363
} else if (value instanceof Properties) {
365364
dictionary = convertPropertiesToDictionary((Properties)value, useOrderedDict);
@@ -374,9 +373,9 @@ private static PyDictionary convertToDictionary(Object value, String delimiter,
374373
}
375374

376375
private static Map convertToMap(Object value, String strValue, String delimiter) throws AliasException {
377-
Map result;
376+
Map<?,?> result;
378377
if (Map.class.isAssignableFrom(value.getClass())) {
379-
result = Map.class.cast(value);
378+
result = (Map<?,?>)value;
380379
} else {
381380
result = convertStringToMap(strValue, delimiter);
382381
}

‎core/src/main/java/oracle/weblogic/deploy/aliases/VersionUtils.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,8 @@ public static int compareVersions(String thisVersion, String otherVersion) throw
8585
int thisVersionNumber = parseVersionElement(thisVersionElements[idx], thisVersion);
8686
int otherVersionNumber = parseVersionElement(otherVersionElements[idx], otherVersion);
8787

88-
if (thisVersionNumber > otherVersionNumber) {
89-
result = 1;
90-
break;
91-
} else if (thisVersionNumber < otherVersionNumber) {
92-
result = -1;
88+
result = Integer.compare(thisVersionNumber, otherVersionNumber);
89+
if (result != 0) {
9390
break;
9491
}
9592
}
@@ -123,9 +120,6 @@ public static int compareVersions(String thisVersion, String otherVersion) throw
123120
useCase += 2;
124121
}
125122
switch (useCase) {
126-
case 0:
127-
break;
128-
129123
case 1:
130124
result = -1;
131125
break;
@@ -139,6 +133,9 @@ public static int compareVersions(String thisVersion, String otherVersion) throw
139133
String otherQualifier = otherVersion.substring(otherVersion.indexOf('-'));
140134
result = thisQualifier.compareTo(otherQualifier);
141135
break;
136+
137+
default:
138+
break;
142139
}
143140
}
144141
LOGGER.exiting(CLASS, METHOD, result);

‎core/src/main/java/oracle/weblogic/deploy/create/RCURunner.java‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,19 @@ public class RCURunner {
6161

6262
private static final Pattern SCHEMA_DOES_NOT_EXIST_PATTERN = Pattern.compile("(ORA-01918|RCU-6013|ORA-12899)");
6363

64-
private File oracleHome;
65-
private File javaHome;
66-
private String rcuDb;
67-
private String rcuPrefix;
68-
private List<String> rcuSchemas;
69-
private boolean ATP_DB = false;
64+
private final File oracleHome;
65+
private final File javaHome;
66+
private final String rcuDb;
67+
private final String rcuPrefix;
68+
private final List<String> rcuSchemas;
69+
private final String rcuVariables;
70+
71+
private boolean atpDB = false;
7072
private String atpSSlArgs = null;
7173
private String atpAdminUser = null;
7274
private String rcuAdminUser = DB_USER;
7375
private String atpDefaultTablespace = null;
7476
private String atpTemporaryTablespace = null;
75-
private String rcuVariables;
7677
private String componentInfoLocation = null;
7778
private String storageLocation = null;
7879

@@ -89,6 +90,7 @@ public class RCURunner {
8990
* @param rcuVariables a comma separated list of key=value variables
9091
* @throws CreateException if a parameter validation error occurs
9192
*/
93+
@SuppressWarnings("unused")
9294
private RCURunner(String domainType, String oracleHome, String javaHome, String rcuDb, String rcuPrefix,
9395
List<String> rcuSchemas, String rcuVariables) throws CreateException {
9496

@@ -146,24 +148,26 @@ public static RCURunner createAtpRunner(String domainType, String oracleHome, St
146148
String keyStorePassword = get(rcuProperties, "javax.net.ssl.keyStorePassword");
147149
String trustStorePassword = get(rcuProperties, "javax.net.ssl.trustStorePassword");
148150

149-
StringBuffer sslArgs = new StringBuffer();
151+
StringBuilder sslArgs = new StringBuilder();
150152
sslArgs.append("oracle.net.tns_admin=");
151153
sslArgs.append(tnsAdmin);
152154
sslArgs.append(",oracle.net.ssl_version=1.2");
153155
sslArgs.append(",javax.net.ssl.trustStore=");
154-
sslArgs.append(tnsAdmin + "/truststore.jks");
156+
sslArgs.append(tnsAdmin);
157+
sslArgs.append("/truststore.jks");
155158
sslArgs.append(",javax.net.ssl.trustStoreType=JKS");
156159
sslArgs.append(",javax.net.ssl.trustStorePassword=");
157160
sslArgs.append(trustStorePassword);
158161
sslArgs.append(",javax.net.ssl.keyStore=");
159-
sslArgs.append(tnsAdmin + "/keystore.jks");
162+
sslArgs.append(tnsAdmin);
163+
sslArgs.append("/keystore.jks");
160164
sslArgs.append(",javax.net.ssl.keyStoreType=JKS");
161165
sslArgs.append(",javax.net.ssl.keyStorePassword=");
162166
sslArgs.append(keyStorePassword);
163167
sslArgs.append(",oracle.jdbc.fanEnabled=false");
164168
sslArgs.append(",oracle.net.ssl_server_dn_match=true");
165169

166-
runner.ATP_DB = true;
170+
runner.atpDB = true;
167171
runner.atpSSlArgs = sslArgs.toString();
168172
runner.atpAdminUser = get(rcuProperties, "atp.admin.user");
169173
runner.atpDefaultTablespace = get(rcuProperties, "atp.default.tablespace");
@@ -227,7 +231,7 @@ public void runRcu(String rcuSysPass, String rcuSchemaPass) throws CreateExcepti
227231
runner = new ScriptRunner(createEnv, RCU_CREATE_LOG_BASENAME);
228232
try {
229233
exitCode = runner.executeScript(rcuScript, scriptStdinLines, scriptArgs);
230-
if (ATP_DB && exitCode != 0 && isSchemaNotExistError(runner)) {
234+
if (atpDB && exitCode != 0 && isSchemaNotExistError(runner)) {
231235
exitCode = 0;
232236
}
233237
} catch (ScriptRunnerException sre) {
@@ -247,7 +251,7 @@ public void runRcu(String rcuSysPass, String rcuSchemaPass) throws CreateExcepti
247251
///////////////////////////////////////////////////////////////////////////
248252

249253
private void addATPEnv(Map<String, String> env) {
250-
if (ATP_DB) {
254+
if (atpDB) {
251255
env.put("RCU_SSL_MODE", "true");
252256
env.put("SKIP_CONNECTSTRING_VALIDATION", "true");
253257
env.put("RCU_SKIP_PRE_REQS", "ALL");
@@ -299,7 +303,7 @@ private String[] getCommandLineArgs(String operationSwitch) {
299303
arguments.add(DB_CONNECT_SWITCH);
300304
arguments.add(rcuDb);
301305

302-
if (ATP_DB) {
306+
if (atpDB) {
303307
arguments.add(DB_USER_SWITCH);
304308
arguments.add(this.atpAdminUser);
305309
arguments.add(USE_SSL_SWITCH);
@@ -321,7 +325,7 @@ private String[] getCommandLineArgs(String operationSwitch) {
321325
for (String rcuSchema : rcuSchemas) {
322326
arguments.add(COMPONENT_SWITCH);
323327
arguments.add(rcuSchema);
324-
if (ATP_DB && isCreate) {
328+
if (atpDB && isCreate) {
325329
arguments.add(TABLESPACE_SWITCH);
326330
arguments.add(this.atpDefaultTablespace);
327331
arguments.add(TEMPTABLESPACE_SWITCH);
@@ -348,6 +352,7 @@ private List<String> getRcuCreateStdinLines(String rcuSysPass, String rcuSchemaP
348352
return getRcuStdinLines(RcuOpType.CREATE, rcuSysPass, rcuSchemaPass);
349353
}
350354

355+
@SuppressWarnings("unused")
351356
private List<String> getRcuStdinLines(RcuOpType rcuOpType, String rcuSysPass, String rcuSchemaPass) {
352357
List<String> stdinLines = new ArrayList<>(2);
353358
stdinLines.add(rcuSysPass);

‎core/src/main/java/oracle/weblogic/deploy/json/AbstractJsonTranslator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void exitPair(JSONParser.PairContext ctx) {
117117
*/
118118
@Override
119119
public void enterJsonObject(JSONParser.JsonObjectContext ctx) {
120-
String METHOD = "enterJsonObject";
120+
finalString METHOD = "enterJsonObject";
121121
if (currentPairName.isEmpty()) {
122122
// This should only happen for the outermost object that the file defines.
123123
//
@@ -134,7 +134,8 @@ public void enterJsonObject(JSONParser.JsonObjectContext ctx) {
134134
}
135135

136136
String name = currentPairName.peek();
137-
if (currentDict.peek().has_key(new PyString(name))) {
137+
PyDictionary nextDict = currentDict.peek();
138+
if (name != null && nextDict != null && nextDict.has_key(new PyString(name))) {
138139
String message = ExceptionHelper.getMessage("WLSDPLY-18028", name);
139140
ParseCancellationException ex =
140141
new ParseCancellationException(message);

‎core/src/main/java/oracle/weblogic/deploy/logging/SummaryHandler.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232
public class SummaryHandler extends WLSDeployLogEndHandler {
3333
private static final String CLASS = SummaryHandler.class.getName();
34+
private static final PlatformLogger LOGGER = WLSDeployLogFactory.getLogger("wlsdeploy.exit");
3435

3536
private static final String LEVEL_PROPERTY = ".level";
3637
private static final String TARGET_PROPERTY = ".target";
@@ -42,7 +43,6 @@ public class SummaryHandler extends WLSDeployLogEndHandler {
4243
private WLSDeployContext context;
4344
private boolean suppressOutput = false;
4445

45-
private final PlatformLogger LOGGER;
4646
private final Handler outputTargetHandler;
4747
private final List<LevelHandler> handlers = new ArrayList<>();
4848
private boolean closed = false;
@@ -52,7 +52,6 @@ public class SummaryHandler extends WLSDeployLogEndHandler {
5252
*/
5353
public SummaryHandler() {
5454
super();
55-
LOGGER = WLSDeployLogFactory.getLogger("wlsdeploy.exit");
5655
this.outputTargetHandler = getOutputTargetHandler();
5756

5857
this.bufferSize = getMemoryBufferSize(CLASS + SIZE_PROPERTY);
@@ -264,10 +263,10 @@ public synchronized String format(LogRecord logRecord) {
264263
}
265264

266265
private class SummaryFormatter extends Formatter {
267-
private final String MSG_FORMAT = " %15ドルd. %2$s: %3$s" + System.lineSeparator();
268-
private final String INTERNAL = System.lineSeparator() + "%s" + System.lineSeparator() + System.lineSeparator();
266+
private final String msgFormat = " %15ドルd. %2$s: %3$s" + System.lineSeparator();
267+
private final String internal = System.lineSeparator() + "%s" + System.lineSeparator() + System.lineSeparator();
269268
private int sequence = 0;
270-
private Level level;
269+
private finalLevel level;
271270

272271
public SummaryFormatter(Level level) {
273272
this.level = level;
@@ -283,14 +282,14 @@ public synchronized String format(LogRecord logRecord) {
283282
String formatted = formatMessage(logRecord);
284283
if (msgId != null && !msgId.equals(formatted)) {
285284
// this has a msg id. don't post any that don't have msg id.
286-
message = String.format(MSG_FORMAT, ++sequence, msgId, formatted);
285+
message = String.format(msgFormat, ++sequence, msgId, formatted);
287286
}
288287
return message;
289288
}
290289

291290
@Override
292291
public String getHead(Handler handler) {
293-
return String.format(INTERNAL, formatMessage(getLogRecord("WLSDPLY-21000", level.getLocalizedName())));
292+
return String.format(internal, formatMessage(getLogRecord("WLSDPLY-21000", level.getLocalizedName())));
294293
}
295294
}
296295

‎core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLogFormatter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* The log formatting class.
1717
*/
1818
public class WLSDeployLogFormatter extends Formatter {
19-
private static final String CATALOG_KEY_PATTERN_STRING = "^[A-Z]{3,10}?-[0-9]{3,5}?$";
19+
private static final String CATALOG_KEY_PATTERN_STRING = "^[A-Z]{3,10}?-[0-9]{3,5}$";
2020
private static final Pattern CATALOG_KEY_PATTERN = Pattern.compile(CATALOG_KEY_PATTERN_STRING);
2121

2222
private static final String DATE_FORMAT_STRING = "####<{0,date} {0,time}>";

‎core/src/main/java/oracle/weblogic/deploy/util/CommentMap.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
public class CommentMap {
1717
public static final String BLANK_LINE_KEY = "__BLANK_LINE__";
1818

19-
private final Map<String, List<String>> commentMap = new HashMap<>();
19+
private final Map<String, List<String>> internalCommentMap = new HashMap<>();
2020

2121
public void addBlankLine(String key) {
2222
getOrCreateComments(key).add(BLANK_LINE_KEY);
@@ -27,15 +27,15 @@ public void addComment(String key, String comment) {
2727
}
2828

2929
public List<String> getComments(String key) {
30-
List<String> comments = commentMap.get(key);
30+
List<String> comments = internalCommentMap.get(key);
3131
return (comments == null) ? Collections.<String>emptyList() : comments;
3232
}
3333

3434
private List<String> getOrCreateComments(String key) {
35-
List<String> comments = commentMap.get(key);
35+
List<String> comments = internalCommentMap.get(key);
3636
if(comments == null) {
3737
comments = new ArrayList<>();
38-
commentMap.put(key, comments);
38+
internalCommentMap.put(key, comments);
3939
}
4040
return comments;
4141
}

‎core/src/main/java/oracle/weblogic/deploy/util/FileUtils.java‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,7 @@ public static InputStream getResourceAsStream(String fileName) {
7272
*/
7373
public static InputStream getFileAsStream(String fileName) throws IOException {
7474
File file = validateExistingFile(fileName);
75-
InputStream inputStream = null;
76-
if (file != null) {
77-
inputStream = new FileInputStream(getCanonicalFile(file));
78-
}
79-
return inputStream;
75+
return new FileInputStream(getCanonicalFile(file));
8076
}
8177

8278
/**
@@ -576,7 +572,7 @@ public static String computeHash(File file) throws IOException, NoSuchAlgorithmE
576572
* @throws NoSuchAlgorithmException if an error occurs obtaining the hashing algorithm
577573
*/
578574
public static String computeHash(byte[] bytes) throws NoSuchAlgorithmException {
579-
MessageDigest messageDigest = MessageDigest.getInstance("MD5");
575+
MessageDigest messageDigest = MessageDigest.getInstance("SHA-512");
580576
byte[] hash = messageDigest.digest(bytes);
581577
return DatatypeConverter.printBase64Binary(hash);
582578
}
@@ -622,20 +618,12 @@ public static byte[] readInputStreamToByteArray(InputStream input) throws IOExce
622618
}
623619

624620
public static File writeInputStreamToFile(InputStream input, String fileName) throws IOException {
625-
FileOutputStream fos = null;
626-
File file = null;
627-
628-
try {
629-
File tmpdir = new File(System.getProperty("java.io.tmpdir"));
630-
file = new File(tmpdir, fileName);
621+
File tmpdir = new File(System.getProperty("java.io.tmpdir"));
622+
File file = new File(tmpdir, fileName);
623+
try (FileOutputStream fos = new FileOutputStream(file)) {
631624
byte[] byteArray = FileUtils.readInputStreamToByteArray(input);
632-
fos = new FileOutputStream(file);
633625
fos.write(byteArray);
634626
}
635-
finally {
636-
if (fos != null) { fos.close(); }
637-
}
638-
639627
return file;
640628
}
641629

@@ -644,9 +632,7 @@ public static void extractZipFileContent(WLSDeployArchive archiveFile, String zi
644632
final String METHOD = "extractZipFileContent";
645633

646634
try {
647-
648635
if (zipEntry != null) {
649-
650636
File extractDir = new File(extractPath);
651637
extractDir.mkdirs();
652638
String walletZip = archiveFile.extractFile(zipEntry,
@@ -682,7 +668,6 @@ public static void extractZipFileContent(WLSDeployArchive archiveFile, String zi
682668
fos.close();
683669
zis.closeEntry();
684670
ze = zis.getNextEntry();
685-
686671
}
687672
zis.closeEntry();
688673
zis.close();
@@ -695,9 +680,7 @@ public static void extractZipFileContent(WLSDeployArchive archiveFile, String zi
695680
IllegalArgumentException iae = new IllegalArgumentException(message);
696681
LOGGER.throwing(CLASS, METHOD, iae);
697682
throw iae;
698-
699683
}
700-
701684
}
702685

703686
/**
@@ -707,7 +690,7 @@ public static void extractZipFileContent(WLSDeployArchive archiveFile, String zi
707690
* @throws IllegalArgumentException if the file is not writable
708691
*/
709692
public static PrintWriter getPrintWriter(String fileName) {
710-
String METHOD = "getPrintWriter";
693+
finalString METHOD = "getPrintWriter";
711694
validateWritableFile(fileName);
712695
try {
713696
return new PrintWriter(new File(fileName));

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /