Merge branch 'master' into mpSupportReviewComments

ajm01 · web-flow · commit 22a952459e96 · 2019-01-03T17:09:39.000-05:00
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/config/JDBCBoosterPackConfigurator.java b/boost-common/src/main/java/io/openliberty/boost/common/config/JDBCBoosterPackConfigurator.java
@@ -33,8 +33,8 @@ public JDBCBoosterPackConfigurator(BoosterDependencyInfo depInfo, LibertyServerC
     private final String DEPENDENCY_ARTIFACT = "org.apache.derby:derby:10.14.2.0";
 
     /**
-     * writes out jdbc default config data when selected by the presence of a
-     * jdbc boost dependency
+     * writes out jdbc default config data when selected by the presence of a jdbc
+     * boost dependency
      */
 	@Override
     public void addServerConfig(Document doc) {
@@ -90,4 +90,4 @@ public String getDependencyToCopy() {
 
         return DEPENDENCY_ARTIFACT;
     }
-}
+}
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/config/LibertyServerConfigGenerator.java b/boost-common/src/main/java/io/openliberty/boost/common/config/LibertyServerConfigGenerator.java
@@ -170,8 +170,7 @@ public void addFeatures(List<String> features) {
     }
 
     /**
-     * Write the server.xml and bootstrap.properties to the server config
-     * directory
+     * Write the server.xml and bootstrap.properties to the server config directory
      *
      * @throws TransformerException
      * @throws IOException
@@ -223,4 +222,4 @@ public void addApplication(String appName) {
         serverRoot.appendChild(appCfg);
 
     }
-}
+}
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/docker/AbstractDockerI.java b/boost-common/src/main/java/io/openliberty/boost/common/docker/AbstractDockerI.java
@@ -21,13 +21,13 @@
 import io.openliberty.boost.common.BoostLoggerI;
 
 public interface AbstractDockerI {
-    
+
     public void execute(DockerClient dockerClient) throws BoostException;
-    
+
     public RegistryAuthSupplier createRegistryAuthSupplier() throws BoostException;
-    
+
     // Default methods
-    
+
     default public String getImageName(String repository, String tag) {
         return repository + ":" + tag;
     }
@@ -45,7 +45,7 @@ default public boolean isRepositoryValid(String repository) {
 
         return Pattern.matches(repositoryRegExp, repository);
     }
-    
+
     default public DockerClient getDockerClient(boolean useProxy) throws BoostException {
         final RegistryAuthSupplier authSupplier = createRegistryAuthSupplier();
         try {
@@ -55,7 +55,8 @@ default public DockerClient getDockerClient(boolean useProxy) throws BoostExcept
         }
     }
 
-    default public boolean isValidDockerConfig(BoostLoggerI log, String repository, String tag, String artifactId) throws BoostException {
+    default public boolean isValidDockerConfig(BoostLoggerI log, String repository, String tag, String artifactId)
+            throws BoostException {
         if (repository.equals(artifactId) && !repository.equals(repository.toLowerCase())) {
             repository = artifactId.toLowerCase();
             log.debug(
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/docker/DockerPushI.java b/boost-common/src/main/java/io/openliberty/boost/common/docker/DockerPushI.java
@@ -19,8 +19,9 @@
 import io.openliberty.boost.common.BoostLoggerI;
 
 public interface DockerPushI extends AbstractDockerI {
-    
-    default public void dockerPush(DockerClient dockerClient, String artifactId, String repository, String tag, BoostLoggerI log) throws BoostException {
+
+    default public void dockerPush(DockerClient dockerClient, String artifactId, String repository, String tag,
+            BoostLoggerI log) throws BoostException {
         final DockerLoggingProgressHandler progressHandler = new DockerLoggingProgressHandler(log);
         final String currentImage = getImageName(repository, tag);
         String newImage = null;
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/Dockerizer.java b/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/Dockerizer.java
@@ -146,4 +146,4 @@ private boolean isFileGeneratedByPlugin(File file) throws IOException {
         return false;
     }
 
-}
+}
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/spring/DockerizeSpringBootClasspath.java b/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/spring/DockerizeSpringBootClasspath.java
@@ -21,7 +21,7 @@
 import io.openliberty.boost.common.docker.DockerParameters;
 
 public class DockerizeSpringBootClasspath extends SpringDockerizer {
-    
+
     public DockerizeSpringBootClasspath(File projectDirectory, File outputDirectory, File appArchive,
             String springBootVersion, DockerParameters params, BoostLoggerI log) {
         super(projectDirectory, outputDirectory, appArchive, springBootVersion, params, log);
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/spring/DockerizeSpringBootJar.java b/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/spring/DockerizeSpringBootJar.java
@@ -29,7 +29,7 @@ public DockerizeSpringBootJar(File projectDirectory, File outputDirectory, File
 
     public Map<String, String> getBuildArgs() {
         Map<String, String> buildArgs = new HashMap<String, String>();
-        buildArgs.put("JAR_FILE", getAppPathString() + "/"  + appArchive.getName());
+        buildArgs.put("JAR_FILE", getAppPathString() + "/" + appArchive.getName());
         return buildArgs;
     }
 
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/spring/SpringDockerizer.java b/boost-common/src/main/java/io/openliberty/boost/common/docker/dockerizer/spring/SpringDockerizer.java
@@ -28,11 +28,12 @@
 import net.wasdev.wlp.common.plugins.util.SpringBootUtil;
 
 public abstract class SpringDockerizer extends Dockerizer {
-    
+
     public final String SPRING_BOOT_VERSION;
     public final DockerParameters params;
 
-    public SpringDockerizer(File projectDirectory, File outputDirectory, File appArchive, String springBootVersion, DockerParameters params, BoostLoggerI log) {
+    public SpringDockerizer(File projectDirectory, File outputDirectory, File appArchive, String springBootVersion,
+            DockerParameters params, BoostLoggerI log) {
         super(projectDirectory, outputDirectory, appArchive, log);
         this.SPRING_BOOT_VERSION = springBootVersion;
         this.params = params;
@@ -62,7 +63,7 @@ public void createDockerFile() throws BoostException {
             throw new BoostException("Unable to create a Dockerfile because application type is not supported");
         }
     }
-    
+
     protected String getAppPathString() {
 
         Path projPath = projectDirectory.toPath();
@@ -82,12 +83,10 @@ protected String getSpringStartClass() throws BoostException {
                 Attributes attributes = manifest.getMainAttributes();
                 return attributes.getValue("Start-Class");
             } else {
-                throw new BoostException(
-                        "Could not get Spring Boot start class due to error getting app manifest.");
+                throw new BoostException("Could not get Spring Boot start class due to error getting app manifest.");
             }
         } catch (IOException e) {
-            throw new BoostException("Could not get Spring Boot start class due to error opening app archive.",
-                    e);
+            throw new BoostException("Could not get Spring Boot start class due to error opening app archive.", e);
         }
     }
 
@@ -113,4 +112,4 @@ private void writeSpringBootDockerFile(File dockerFile, String startClass) throw
         }
     }
 
-}
+}
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/utils/LibertyBoosterUtil.java b/boost-common/src/main/java/io/openliberty/boost/common/utils/LibertyBoosterUtil.java
@@ -63,8 +63,8 @@ public LibertyBoosterUtil(String libertyServerPath, List<BoosterDependencyInfo>
     }
 
     /**
-     * take a list of pom boost dependency strings and map to liberty features
-     * for config. return a list of feature configuration objects for each found
+     * take a list of pom boost dependency strings and map to liberty features for
+     * config. return a list of feature configuration objects for each found
      * dependency.
      * 
      * @param dependencies
diff --git a/boost-common/src/main/java/io/openliberty/boost/common/utils/SpringBootUtil.java b/boost-common/src/main/java/io/openliberty/boost/common/utils/SpringBootUtil.java
@@ -64,10 +64,9 @@ public class SpringBootUtil {
     private static final String SPRING_WEBSOCKET = "spring-websocket";
 
     /**
-     * Get the expected path of the Spring Boot Uber JAR (with .spring
-     * extension) that was preserved during the Boost packaging process. No
-     * guarantee that the path exists or the artifact is indeed a Spring Boot
-     * Uber JAR.
+     * Get the expected path of the Spring Boot Uber JAR (with .spring extension)
+     * that was preserved during the Boost packaging process. No guarantee that the
+     * path exists or the artifact is indeed a Spring Boot Uber JAR.
      * 
      * @param artifact
      * @return the canonical path
@@ -115,8 +114,8 @@ public static File copySpringBootUberJar(File artifact, BoostLoggerI logger) thr
     }
 
     /**
-     * Add the Spring Boot Version property to the Manifest file in the Liberty
-     * Uber JAR. This is to trick Spring Boot into not repackaging it.
+     * Add the Spring Boot Version property to the Manifest file in the Liberty Uber
+     * JAR. This is to trick Spring Boot into not repackaging it.
      * 
      * @param artifact
      * @param springBootVersion
diff --git a/boost-common/src/test/java/io/openliberty/boost/common/config/LibertyServerConfigGeneratorTest.java b/boost-common/src/test/java/io/openliberty/boost/common/config/LibertyServerConfigGeneratorTest.java
@@ -70,4 +70,4 @@ public void testZeroFeaturesInDefaultServerConfig()
         assertEquals("Didn't find empty list of features", 0, featureList.size());
     }
 
-}
+}
diff --git a/boost-gradle/src/test/resources/jaxrsTestApp/src/main/java/com/example/HelloResource.java b/boost-gradle/src/test/resources/jaxrsTestApp/src/main/java/com/example/HelloResource.java
@@ -22,4 +22,4 @@ public class HelloResource {
     public String getInformation() throws Exception, IOException {
         return "Hello World From Your Friends at Liberty Boost EE!";
     }
-}
+}
diff --git a/boost-gradle/src/test/resources/springApp/src/main/java/hello/HelloController.java b/boost-gradle/src/test/resources/springApp/src/main/java/hello/HelloController.java
@@ -5,10 +5,10 @@
 
 @RestController
 public class HelloController {
-    
+
     @RequestMapping("/")
     public String index() {
         return "Greetings from Spring Boot!";
     }
-    
+
 }
diff --git a/boost-gradle/src/test/resources/test-spring-boot-ssl/src/main/java/hello/HelloController.java b/boost-gradle/src/test/resources/test-spring-boot-ssl/src/main/java/hello/HelloController.java
@@ -5,10 +5,10 @@
 
 @RestController
 public class HelloController {
-    
+
     @RequestMapping("/")
     public String index() {
         return "Greetings from Spring Boot!";
     }
-    
+
 }
diff --git a/boost-maven/boost-maven-plugin/src/it/pom.xml b/boost-maven/boost-maven-plugin/src/it/pom.xml
@@ -25,7 +25,7 @@
         <module>test-spring-boot-ssl</module>
         <module>test-jaxrs-2.0</module>
         <module>test-jaxrs-2.1</module>
-        <module>test-context</module>
+        <module>test-dynamic-update</module>
     </modules>
     
 </project>
diff --git a/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/pom.xml b/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>io.openliberty.boost</groupId>
-	<artifactId>test-context</artifactId>
+	<artifactId>test-dynamic-update</artifactId>
 	<packaging>war</packaging>
 	<version>1.0-SNAPSHOT</version>
 
diff --git a/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/java/com/example/HelloResource.java b/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/java/com/example/HelloResource.java
@@ -11,16 +11,15 @@
 //import com.ibm.json.java.JSONArray;
 //import com.ibm.json.java.JSONObject;
 
-
 // This class define the RESTful API to fetch the database service information
 // <basepath>/api/hello
 
 @Path("/hello")
 public class HelloResource {
 
-	@GET
-	@Produces("text/plain")
-	public String getInformation() throws Exception, IOException {
-        return "Hello World From Your Friends at Liberty Boost EE! - pass 1";        
-	}
-}
+    @GET
+    @Produces("text/plain")
+    public String getInformation() throws Exception, IOException {
+        return "Hello World From Your Friends at Liberty Boost EE! - pass 1";
+    }
+}
diff --git a/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/webapp/META-INF/MANIFEST.MF b/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/webapp/WEB-INF/web.xml b/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/webapp/WEB-INF/web.xml
diff --git a/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/webapp/index.html b/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/main/webapp/index.html
diff --git a/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/test/java/it/EndpointIT.java b/boost-maven/boost-maven-plugin/src/it/test-dynamic-update/src/test/java/it/EndpointIT.java
diff --git a/boost-maven/boost-maven-plugin/src/it/test-jaxrs-2.0/src/main/java/com/example/HelloResource.java b/boost-maven/boost-maven-plugin/src/it/test-jaxrs-2.0/src/main/java/com/example/HelloResource.java
@@ -22,4 +22,4 @@ public class HelloResource {
     public String getInformation() throws Exception, IOException {
         return "Hello World From Your Friends at Liberty Boost EE!";
     }
-}
+}
diff --git a/boost-maven/boost-maven-plugin/src/it/test-jaxrs-2.1/src/main/java/com/example/HelloResource.java b/boost-maven/boost-maven-plugin/src/it/test-jaxrs-2.1/src/main/java/com/example/HelloResource.java
@@ -22,4 +22,4 @@ public class HelloResource {
     public String getInformation() throws Exception, IOException {
         return "Hello World From Your Friends at Liberty Boost EE!";
     }
-}
+}
diff --git a/boost-maven/boost-maven-plugin/src/it/test-spring-boot-docker/src/main/java/application/Application.java b/boost-maven/boost-maven-plugin/src/it/test-spring-boot-docker/src/main/java/application/Application.java
@@ -28,4 +28,4 @@ public String hello() {
         return "Greetings from Spring Boot!";
     }
 
-}
+}
diff --git a/boost-maven/boost-maven-plugin/src/it/test-spring-boot-docker/src/test/java/application/DockerBuildIT.java b/boost-maven/boost-maven-plugin/src/it/test-spring-boot-docker/src/test/java/application/DockerBuildIT.java
@@ -156,7 +156,7 @@ public void testDockerContainerRunning() throws Exception {
     }
 
     public void testAppRunningOnEndpoint() throws Exception {
-        URL requestUrl = new URL("http://" + getTestDockerHost() + ":" + port + "/spring/");
+        URL requestUrl = new URL("http://" + getTestDockerHost() + ":" + port + "/spring");
         HttpURLConnection conn = (HttpURLConnection) requestUrl.openConnection();
 
         if (conn != null) {
@@ -185,4 +185,4 @@ private static String getTestDockerHost() {
         }
     }
 
-}
+}
diff --git a/boost-maven/boost-maven-plugin/src/it/test-spring-boot-docker/src/test/java/application/DockerPushIT.java b/boost-maven/boost-maven-plugin/src/it/test-spring-boot-docker/src/test/java/application/DockerPushIT.java
@@ -84,4 +84,4 @@ private void removeImage(String imageName) throws Exception {
         Image removedImage = getImage(imageName);
         assertNull(imageName + " was not removed.", removedImage);
     }
-}
+}
diff --git a/boost-maven/boost-maven-plugin/src/it/test-spring-boot-ssl/src/test/java/it/EndpointIT.java b/boost-maven/boost-maven-plugin/src/it/test-spring-boot-ssl/src/test/java/it/EndpointIT.java
@@ -39,22 +39,20 @@ public static void init() {
 
     @Test
     public void testServlet() throws Exception {
- 
-        SSLContext sslContext = new SSLContextBuilder()
-                .loadTrustMaterial(null, (certificate, authType) -> true).build();
-           
-        CloseableHttpClient client = HttpClients.custom()
-                        .setSSLContext(sslContext)
-                        .setSSLHostnameVerifier(new NoopHostnameVerifier())
-                        .build();
-        
+
+        SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, (certificate, authType) -> true)
+                .build();
+
+        CloseableHttpClient client = HttpClients.custom().setSSLContext(sslContext)
+                .setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+
         HttpGet httpGet = new HttpGet(URL);
         httpGet.setHeader("Accept", "application/xml");
-            
+
         HttpResponse response = client.execute(httpGet);
-        
+
         assertEquals("HTTP GET failed", HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
-        
+
         ResponseHandler<String> handler = new BasicResponseHandler();
         String body = handler.handleResponse(response);
 
diff --git a/boost-maven/boost-maven-plugin/src/it/test-spring-boot-websocket/src/main/java/hello/WebSocketConfig.java b/boost-maven/boost-maven-plugin/src/it/test-spring-boot-websocket/src/main/java/hello/WebSocketConfig.java
@@ -21,4 +21,4 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/gs-guide-websocket").withSockJS();
     }
 
-}
+}
diff --git a/boost-maven/boost-maven-plugin/src/main/java/io/openliberty/boost/maven/docker/AbstractDockerMojo.java b/boost-maven/boost-maven-plugin/src/main/java/io/openliberty/boost/maven/docker/AbstractDockerMojo.java
@@ -69,7 +69,7 @@ public abstract class AbstractDockerMojo extends AbstractMojo implements Abstrac
     @Override
     public void execute() throws MojoExecutionException {
         try {
-            if(isValidDockerConfig(BoostLogger.getInstance(), repository, tag, project.getArtifactId())) {
+            if (isValidDockerConfig(BoostLogger.getInstance(), repository, tag, project.getArtifactId())) {
                 execute(getDockerClient(useProxy));
             }
         } catch (BoostException e) {
diff --git a/boost-maven/boost-maven-plugin/src/main/java/io/openliberty/boost/maven/liberty/LibertyPackageMojo.java b/boost-maven/boost-maven-plugin/src/main/java/io/openliberty/boost/maven/liberty/LibertyPackageMojo.java
diff --git a/boost-maven/boost-maven-plugin/src/main/java/io/openliberty/boost/maven/utils/MavenProjectUtil.java b/boost-maven/boost-maven-plugin/src/main/java/io/openliberty/boost/maven/utils/MavenProjectUtil.java
diff --git a/pre-commit.template b/pre-commit.template

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,7 @@ public void addFeatures(List<String> features) {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`/**`
`173`		`- * Write the server.xml and bootstrap.properties to the server config`
`174`		`- * directory`
	`173`	`+ * Write the server.xml and bootstrap.properties to the server config directory`
`175`	`174`	`*`
`176`	`175`	`* @throws TransformerException`
`177`	`176`	`* @throws IOException`
`@@ -223,4 +222,4 @@ public void addApplication(String appName) {`
`223`	`222`	`serverRoot.appendChild(appCfg);`
`224`	`223`
`225`	`224`	`}`
`226`		`-}`
	`225`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -146,4 +146,4 @@ private boolean isFileGeneratedByPlugin(File file) throws IOException {`
`146`	`146`	`return false;`
`147`	`147`	`}`
`148`	`148`
`149`		`-}`
	`149`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public DockerizeSpringBootJar(File projectDirectory, File outputDirectory, File`
`29`	`29`
`30`	`30`	`public Map<String, String> getBuildArgs() {`
`31`	`31`	`Map<String, String> buildArgs = new HashMap<String, String>();`
`32`		`- buildArgs.put("JAR_FILE", getAppPathString() + "/" + appArchive.getName());`
	`32`	`+ buildArgs.put("JAR_FILE", getAppPathString() + "/" + appArchive.getName());`
`33`	`33`	`return buildArgs;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,12 @@`
`28`	`28`	`import net.wasdev.wlp.common.plugins.util.SpringBootUtil;`
`29`	`29`
`30`	`30`	`public abstract class SpringDockerizer extends Dockerizer {`
`31`		`-`
	`31`	`+`
`32`	`32`	`public final String SPRING_BOOT_VERSION;`
`33`	`33`	`public final DockerParameters params;`
`34`	`34`
`35`		`- public SpringDockerizer(File projectDirectory, File outputDirectory, File appArchive, String springBootVersion, DockerParameters params, BoostLoggerI log) {`
	`35`	`+ public SpringDockerizer(File projectDirectory, File outputDirectory, File appArchive, String springBootVersion,`
	`36`	`+ DockerParameters params, BoostLoggerI log) {`
`36`	`37`	`super(projectDirectory, outputDirectory, appArchive, log);`
`37`	`38`	`this.SPRING_BOOT_VERSION = springBootVersion;`
`38`	`39`	`this.params = params;`
`@@ -62,7 +63,7 @@ public void createDockerFile() throws BoostException {`
`62`	`63`	`throw new BoostException("Unable to create a Dockerfile because application type is not supported");`
`63`	`64`	`}`
`64`	`65`	`}`
`65`		`-`
	`66`	`+`
`66`	`67`	`protected String getAppPathString() {`
`67`	`68`
`68`	`69`	`Path projPath = projectDirectory.toPath();`
`@@ -82,12 +83,10 @@ protected String getSpringStartClass() throws BoostException {`
`82`	`83`	`Attributes attributes = manifest.getMainAttributes();`
`83`	`84`	`return attributes.getValue("Start-Class");`
`84`	`85`	`} else {`
`85`		`- throw new BoostException(`
`86`		`- "Could not get Spring Boot start class due to error getting app manifest.");`
	`86`	`+ throw new BoostException("Could not get Spring Boot start class due to error getting app manifest.");`
`87`	`87`	`}`
`88`	`88`	`} catch (IOException e) {`
`89`		`- throw new BoostException("Could not get Spring Boot start class due to error opening app archive.",`
`90`		`- e);`
	`89`	`+ throw new BoostException("Could not get Spring Boot start class due to error opening app archive.", e);`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`
`@@ -113,4 +112,4 @@ private void writeSpringBootDockerFile(File dockerFile, String startClass) throw`
`113`	`112`	`}`
`114`	`113`	`}`
`115`	`114`
`116`		`-}`
	`115`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ public LibertyBoosterUtil(String libertyServerPath, List<BoosterDependencyInfo>`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * take a list of pom boost dependency strings and map to liberty features`
`67`		`- * for config. return a list of feature configuration objects for each found`
	`66`	`+ * take a list of pom boost dependency strings and map to liberty features for`
	`67`	`+ * config. return a list of feature configuration objects for each found`
`68`	`68`	`* dependency.`
`69`	`69`	`*`
`70`	`70`	`* @param dependencies`