code cleanup (#311)

ddsharpe · web-flow · commit f1944b5b5f28 · 2021-08-16T13:06:41.000-05:00
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruPatch.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruPatch.java
@@ -302,6 +302,7 @@ public String toString() {
         return patchId + " - " + description;
     }
 
+    @Override
     public int compareTo(AruPatch obj) {
         return version.compareTo(obj.version);
     }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java
@@ -91,9 +91,9 @@ private void handleAdditionalBuildCommands() throws IOException {
                 Path targetFile = Paths.get(getTempDirectory(), FILESFOLDER, additionalFile.getFileName().toString());
                 logger.info("IMG-0043", additionalFile);
                 if (Files.isDirectory(additionalFile)) {
-                    Utils.copyLocalDirectory(additionalFile, targetFile, false);
+                    Utils.copyLocalDirectory(additionalFile, targetFile);
                 } else {
-                    Utils.copyLocalFile(additionalFile, targetFile, false);
+                    Utils.copyLocalFile(additionalFile, targetFile);
                 }
             }
         }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java
@@ -91,7 +91,7 @@ public CommandResponse call() throws Exception {
             // Set the inventory location, so that it will be copied
             if (inventoryPointerFile != null) {
                 Utils.setInventoryLocation(inventoryPointerFile, dockerfileOptions);
-                Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir, "/oraInst.loc"), false);
+                Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir, "/oraInst.loc"));
             } else {
                 Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir);
             }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/RebaseImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/RebaseImage.java
@@ -148,7 +148,7 @@ public CommandResponse call() throws Exception {
                 // Set the inventory pointer
                 if (inventoryPointerFile != null) {
                     Utils.setInventoryLocation(inventoryPointerFile, dockerfileOptions);
-                    Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir,"/oraInst.loc"), false);
+                    Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir,"/oraInst.loc"));
                 } else {
                     Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir);
                 }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java
@@ -17,7 +17,7 @@
  * This class should be replaced if/when a full JSON parser is added to the project.
  */
 public class InspectOutput {
-    private static final String patchesKey = "oraclePatches";
+    private static final String PATCHES_KEY = "oraclePatches";
     Map<String,String> attributes;
     List<InventoryPatch> patches;
     OperatingSystemProperties os;
@@ -30,15 +30,15 @@ public InspectOutput(Properties imageProperties) {
         // convert Properties to TreeMap (to sort attributes alphabetically)
         Map<String,String> sorted = imageProperties.entrySet().stream()
             .map(InspectOutput::convertToStringEntry)
-            .filter(e -> !e.getKey().equals(patchesKey)) // do not store patches entry as a normal attribute
+            .filter(e -> !e.getKey().equals(PATCHES_KEY)) // do not store patches entry as a normal attribute
             .filter(e -> !e.getKey().startsWith("__OS__")) // do not store OS entries as a normal attribute
             .collect(Collectors.toMap(
                 Map.Entry::getKey, Map.Entry::getValue,
                 (v1, v2) -> v1, // discard duplicates, but there shouldn't be any dupes
                 TreeMap::new)); // use a sorted map
 
-        if (imageProperties.containsKey(patchesKey)) {
-            patches = InventoryPatch.parseInventoryPatches(imageProperties.get(patchesKey).toString());
+        if (imageProperties.containsKey(PATCHES_KEY)) {
+            patches = InventoryPatch.parseInventoryPatches(imageProperties.get(PATCHES_KEY).toString());
         }
 
         attributes = sorted;
@@ -53,7 +53,7 @@ private static Map.Entry<String,String> convertToStringEntry(Map.Entry<Object,Ob
     public String toString() {
         StringBuilder result = new StringBuilder().append("{\n");
         if (patches != null) {
-            result.append(pad(1)).append('\"').append(patchesKey).append('\"').append(" : [\n");
+            result.append(pad(1)).append('\"').append(PATCHES_KEY).append('\"').append(" : [\n");
             Iterator<InventoryPatch> patchesIter = patches.iterator();
             while (patchesIter.hasNext()) {
                 InventoryPatch patch = patchesIter.next();
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstall.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/MiddlewareInstall.java
@@ -61,10 +61,7 @@ private static String getJarNameFromInstaller(Path installerFile) throws IOExcep
                     ZipEntry entry = entries.nextElement();
                     String entryName = entry.getName();
                     logger.finer("Entry in zip {0}: {1}", filename, entryName);
-                    if (entryName.endsWith(".jar")) {
-                        filename = entryName;
-                        break;
-                    } else if (entryName.endsWith(".bin")) {
+                    if (entryName.endsWith(".jar") || entryName.endsWith(".bin")) {
                         filename = entryName;
                         break;
                     }
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/logging/ConsoleFormatter.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/logging/ConsoleFormatter.java
@@ -75,32 +75,32 @@ private String replaceColorTokens(String text) {
     /**
      * Formats the log record.
      *
-     * @param record the log record
+     * @param logRecord the log record
      * @return the formatted log record
      */
     @Override
-    public synchronized String format(LogRecord record) {
+    public synchronized String format(LogRecord logRecord) {
         StringBuilder sb = new StringBuilder();
 
         // Level
         sb.append("[")
-            .append(getMessageLevelColor(record.getLevel()))
-            .append(String.format("%-7s", record.getLevel().getLocalizedName()))
+            .append(getMessageLevelColor(logRecord.getLevel()))
+            .append(String.format("%-7s", logRecord.getLevel().getLocalizedName()))
             .append(AnsiColor.RESET)
             .append("] ");
 
         // message
-        sb.append(replaceColorTokens(formatMessage(record)));
+        sb.append(replaceColorTokens(formatMessage(logRecord)));
 
         // throwable
-        if (record.getThrown() != null) {
+        if (logRecord.getThrown() != null) {
             try {
                 StringWriter sw = new StringWriter();
                 PrintWriter pw = new PrintWriter(sw);
-                record.getThrown().printStackTrace(pw);
+                logRecord.getThrown().printStackTrace(pw);
                 pw.close();
                 sb.append(LINE_SEPARATOR)
-                    .append(sw.toString())
+                    .append(sw)
                     .append(LINE_SEPARATOR);
             } catch (Exception ex) {
                 //ignore
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java
@@ -19,7 +19,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Base64;
@@ -85,30 +84,23 @@ public static void copyResourceAsFile(String resourcePath, String destPath) thro
      *
      * @param sourcePath   resource path in the local directory
      * @param destPath     local file to copy to.
-     * @param markExec     sets the executable flag if true
      * @throws IOException in case of error
      */
-    public static void copyLocalFile(Path sourcePath, Path destPath, boolean markExec) throws IOException {
+    public static void copyLocalFile(Path sourcePath, Path destPath) throws IOException {
         Objects.requireNonNull(sourcePath);
         Objects.requireNonNull(destPath);
         logger.fine("copyLocalFile: copying file {0}->{1}", sourcePath, destPath);
         Files.copy(sourcePath, destPath, StandardCopyOption.REPLACE_EXISTING);
-        if (markExec) {
-            if (!System.getProperty("os.name").toLowerCase().startsWith("windows")) {
-                Files.setPosixFilePermissions(destPath, PosixFilePermissions.fromString("r-xr-xr-x"));
-            }
-        }
     }
 
     /**
      * Utility method to copy a local directory to another local file system location.
      *
      * @param sourcePath   path to the local directory
      * @param destPath     local directory to copy to.
-     * @param markExec     sets the executable flag if true
      * @throws IOException in case of error
      */
-    public static void copyLocalDirectory(Path sourcePath, Path destPath, boolean markExec) throws IOException {
+    public static void copyLocalDirectory(Path sourcePath, Path destPath) throws IOException {
         Objects.requireNonNull(sourcePath);
         Objects.requireNonNull(destPath);
         if (!Files.isDirectory(sourcePath)) {
@@ -124,9 +116,9 @@ public static void copyLocalDirectory(Path sourcePath, Path destPath, boolean ma
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(sourcePath)) {
             for (Path child : stream) {
                 if (Files.isDirectory(child)) {
-                    copyLocalDirectory(child, destPath.resolve(child.getFileName()), markExec);
+                    copyLocalDirectory(child, destPath.resolve(child.getFileName()));
                 } else if (Files.isRegularFile(child)) {
-                    copyLocalFile(child, destPath.resolve(child.getFileName()), markExec);
+                    copyLocalFile(child, destPath.resolve(child.getFileName()));
                 } else {
                     logger.info("IMG-0035", sourcePath.toString());
                 }
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/aru/InstalledPatchTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/aru/InstalledPatchTest.java
@@ -13,7 +13,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @Tag("unit")
-public class InstalledPatchTest {
+class InstalledPatchTest {
     @Test
     void getPatchesTest() {
         // Parse the output from the image probe to get a list of installed patches
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/CachedFileTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/CachedFileTest.java
@@ -28,7 +28,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @Tag("unit")
-public class CachedFileTest {
+class CachedFileTest {
 
     static Path cacheDir;
     static CacheStore cacheStore;
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/OPatchFileTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/OPatchFileTest.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Tag("unit")
-public class OPatchFileTest {
+class OPatchFileTest {
     @Test
     void opatchPatchIdTest() {
         assertTrue(OPatchFile.isOPatchPatch("28186730"), "OPatch bug number");
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/PatchFileTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cachestore/PatchFileTest.java
@@ -38,7 +38,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @Tag("unit")
-public class PatchFileTest {
+class PatchFileTest {
     static Path cacheDir;
     static CacheStore cacheStore;
     static final List<String> fileContents = Arrays.asList("A", "B", "C");
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntryTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntryTest.java
@@ -21,12 +21,12 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @Tag("unit")
-public class AddPatchEntryTest {
+class AddPatchEntryTest {
     private static LoggingFacade commandLogger = LoggingFactory.getLogger(AddPatchEntry.class);
     private static Level oldLevel;
 
     @BeforeAll
-    static void setUp() throws NoSuchFieldException, IllegalAccessException {
+    static void setUp() {
         // disable logging for the tested tool to prevent filling up the screen with errors (that are expected)
         oldLevel = commandLogger.getLevel();
         commandLogger.setLevel(Level.OFF);
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptionsTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptionsTest.java
@@ -29,7 +29,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @Tag("unit")
-public class CommonOptionsTest {
+class CommonOptionsTest {
     /**
      * Test CommonOptions handleChown method.
      * @throws Exception if reflection fails (developer error)
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/inspect/InspectTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/inspect/InspectTest.java
@@ -18,7 +18,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @Tag("unit")
-public class InspectTest {
+class InspectTest {
     @Test
     void testJsonOutput() throws IOException {
         testPropertiesToJson("src/test/resources/inspect/image1.properties",
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java
@@ -14,7 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @Tag("unit")
-public class InstallerTest {
+class InstallerTest {
     @Test
     void fmwInstallerTypeStringTest() {
         assertEquals("fmw, soa, osb", FmwInstallerType.SOA_OSB.installerListString(),
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/ResponseFileTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/ResponseFileTest.java
@@ -15,7 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @Tag("unit")
-public class ResponseFileTest {
+class ResponseFileTest {
     @Test
     void copyProvidedResponseFile(@TempDir File tmpDir) throws Exception {
         String filename = "responseA.txt";
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/wdt/WdtUnitTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/wdt/WdtUnitTest.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @Tag("unit")
-public class WdtUnitTest {
+class WdtUnitTest {
     @Test
     void parseStringValues() {
         assertEquals(DomainType.JRF, DomainType.fromValue("jrf"));
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -109,9 +109,7 @@
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <failIfNoTests>false</failIfNoTests>
-                    <argLine>
-                        -Xmx1024m -XX:MaxPermSize=256m
-                    </argLine>
+                    <argLine>@{argLine} -Xmx1024m -XX:MaxPermSize=256m</argLine>
                     <systemPropertyVariables>
                         <WLSIMG_BLDDIR>${project.build.directory}/blddir</WLSIMG_BLDDIR>
                         <WLSIMG_CACHEDIR>${project.build.directory}/cachedir</WLSIMG_CACHEDIR>

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,7 @@ public String toString() {`
`302`	`302`	`return patchId + " - " + description;`
`303`	`303`	`}`
`304`	`304`
	`305`	`+ @Override`
`305`	`306`	`public int compareTo(AruPatch obj) {`
`306`	`307`	`return version.compareTo(obj.version);`
`307`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ private void handleAdditionalBuildCommands() throws IOException {`
`91`	`91`	`Path targetFile = Paths.get(getTempDirectory(), FILESFOLDER, additionalFile.getFileName().toString());`
`92`	`92`	`logger.info("IMG-0043", additionalFile);`
`93`	`93`	`if (Files.isDirectory(additionalFile)) {`
`94`		`- Utils.copyLocalDirectory(additionalFile, targetFile, false);`
	`94`	`+ Utils.copyLocalDirectory(additionalFile, targetFile);`
`95`	`95`	`} else {`
`96`		`- Utils.copyLocalFile(additionalFile, targetFile, false);`
	`96`	`+ Utils.copyLocalFile(additionalFile, targetFile);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public CommandResponse call() throws Exception {`
`91`	`91`	`// Set the inventory location, so that it will be copied`
`92`	`92`	`if (inventoryPointerFile != null) {`
`93`	`93`	`Utils.setInventoryLocation(inventoryPointerFile, dockerfileOptions);`
`94`		`- Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir, "/oraInst.loc"), false);`
	`94`	`+ Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir, "/oraInst.loc"));`
`95`	`95`	`} else {`
`96`	`96`	`Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir);`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public CommandResponse call() throws Exception {`
`148`	`148`	`// Set the inventory pointer`
`149`	`149`	`if (inventoryPointerFile != null) {`
`150`	`150`	`Utils.setInventoryLocation(inventoryPointerFile, dockerfileOptions);`
`151`		`- Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir,"/oraInst.loc"), false);`
	`151`	`+ Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir,"/oraInst.loc"));`
`152`	`152`	`} else {`
`153`	`153`	`Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir);`
`154`	`154`	`}`