no functional changes, only static code cleanup (#309)

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/InvalidCredential.java

@@ -0,0 +1,12 @@
+// Copyright (c) 2021, Oracle and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+package com.oracle.weblogic.imagetool.aru;
+
+import com.oracle.weblogic.imagetool.util.Utils;
+
+public class InvalidCredential extends AruException {
+    public InvalidCredential() {
+        super(Utils.getMessage("IMG-0022"));
+    }
+}

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/MultiplePatchVersionsException.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.oracle.weblogic.imagetool.aru.AruPatch;
 import com.oracle.weblogic.imagetool.util.Utils;
 
 public class MultiplePatchVersionsException extends IOException {

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntry.java

@@ -7,8 +7,6 @@
 import java.util.List;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
-import com.oracle.weblogic.imagetool.logging.LoggingFacade;
-import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import com.oracle.weblogic.imagetool.util.Utils;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -20,8 +18,6 @@
 )
 public class AddPatchEntry extends CacheAddOperation {
 
-    private static final LoggingFacade logger = LoggingFactory.getLogger(AddPatchEntry.class);
-
     @Override
     public CommandResponse call() throws Exception {
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java

@@ -24,6 +24,7 @@
 import com.oracle.weblogic.imagetool.aru.AruProduct;
 import com.oracle.weblogic.imagetool.aru.AruUtil;
 import com.oracle.weblogic.imagetool.aru.InstalledPatch;
+import com.oracle.weblogic.imagetool.aru.InvalidCredential;
 import com.oracle.weblogic.imagetool.aru.InvalidPatchNumberException;
 import com.oracle.weblogic.imagetool.aru.MultiplePatchVersionsException;
 import com.oracle.weblogic.imagetool.builder.BuildCommand;
@@ -162,20 +163,18 @@ void setTempDirectory(String value) {
         tempDirectory = value;
     }
 
-    void init(String buildId) throws Exception {
+    void init(String buildId) throws InvalidCredential, IOException {
         logger.entering(buildId);
         logger.info(HelpVersionProvider.versionString());
         dockerfileOptions = new DockerfileOptions(buildId);
         logger.info("IMG-0016", buildId);
 
         handleProxyUrls();
         password = Utils.getPasswordFromInputs(passwordStr, passwordFile, passwordEnv);
-        // check user support credentials if useCache not set to always and we are applying any patches
 
-        if (userId != null || password != null) {
-            if (!AruUtil.checkCredentials(userId, password)) {
-                throw new Exception("user Oracle support credentials do not match");
-            }
+        // if userid or password is provided, validate the pair of provided values
+        if ((userId != null || password != null) && !AruUtil.checkCredentials(userId, password)) {
+            throw new InvalidCredential();
         }
 
         handleChown();

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CreateImage.java

@@ -93,7 +93,7 @@ public CommandResponse call() throws Exception {
                 Utils.setInventoryLocation(inventoryPointerFile, dockerfileOptions);
                 Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir, "/oraInst.loc"), false);
             } else {
-                Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir, false);
+                Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir);
             }
 
             // Create Dockerfile

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/RebaseImage.java

@@ -150,7 +150,7 @@ public CommandResponse call() throws Exception {
                     Utils.setInventoryLocation(inventoryPointerFile, dockerfileOptions);
                     Utils.copyLocalFile(Paths.get(inventoryPointerFile), Paths.get(tmpDir,"/oraInst.loc"), false);
                 } else {
-                    Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir, false);
+                    Utils.copyResourceAsFile("/response-files/oraInst.loc", tmpDir);
                 }
             }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/HttpUtil.java

@@ -35,7 +35,6 @@
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -237,11 +236,6 @@ public static Document postCheckConflictRequest(String url, String payload, Stri
 
         CookieStore cookieStore = new BasicCookieStore();
 
-        CloseableHttpClient client =
-                HttpClientBuilder.create().setDefaultRequestConfig(config.build())
-                    .setUserAgent("Wget/1.10")
-                    .useSystemProperties().build();
-
         Executor httpExecutor = HttpUtil.getHttpExecutor(username, password);
         httpExecutor.use(cookieStore);
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

@@ -64,10 +64,9 @@ private Utils() {
      *
      * @param resourcePath resource path in the jar
      * @param destPath     local file to copy to.
-     * @param markExec     sets the executable flag if true
      * @throws IOException in case of error
      */
-    public static void copyResourceAsFile(String resourcePath, String destPath, boolean markExec) throws IOException {
+    public static void copyResourceAsFile(String resourcePath, String destPath) throws IOException {
         Objects.requireNonNull(resourcePath);
         Objects.requireNonNull(destPath);
         if (Files.isDirectory(Paths.get(destPath))) {
@@ -79,11 +78,6 @@ public static void copyResourceAsFile(String resourcePath, String destPath, bool
         }
         Files.copy(Utils.class.getResourceAsStream(resourcePath), Paths.get(destPath),
             StandardCopyOption.REPLACE_EXISTING);
-        if (markExec) {
-            if (!System.getProperty("os.name").toLowerCase().startsWith("windows")) {
-                Files.setPosixFilePermissions(Paths.get(destPath), PosixFilePermissions.fromString("r-xr-xr-x"));
-            }
-        }
     }
 
     /**
@@ -424,7 +418,7 @@ public static Properties getBaseImageProperties(String builder, String dockerIma
                                                     String contextDir) throws IOException, InterruptedException {
         logger.entering(builder, dockerImage, script, contextDir);
         final String scriptToRun = "test-env.sh";
-        Utils.copyResourceAsFile(script, contextDir + File.separator + scriptToRun, true);
+        Utils.copyResourceAsFile(script, contextDir + File.separator + scriptToRun);
         List<String> imageEnvCmd = Utils.getDockerRunCmd(builder,
             contextDir + File.separator + scriptToRun, dockerImage);
         logger.info("IMG-0097", dockerImage);

imagetool/src/main/resources/ImageTool.properties

@@ -20,7 +20,7 @@ IMG-0018=Downloading patch [[cyan: {0}]]...
 IMG-0019={0} - locating patch number for the latest PSU...
 IMG-0020={0} - the latest PSU patch number is [[cyan: {1}]]
 IMG-0021=ORACLE_HOME value must be the same in both new and old image in order to rebase the domain
-IMG-0022=NOT USED
+IMG-0022=Invalid Oracle support credentials, verify the values provided for user and password match your OTN credential
 IMG-0023=No PSU recommended for {0}, version {1}
 IMG-0024=Cached patch file {0} has an empty path
 IMG-0025=No Domain Home in source image.  Add DOMAIN_HOME environment variable to source image and try again.