Enables /mvn clean package liberty:run -Pliberty

microprofile · Jun 14, 2022 · c7b9b94 · c7b9b94
1 parent 8d6bdfd
commit c7b9b94
Show file tree

Hide file tree

Showing 13 changed files with 383 additions and 114 deletions.
diff --git a/Container/README.md b/Container/README.md
@@ -4,6 +4,18 @@ Building an image and running a container
 Development workflow
 ====================
 
+Locally without Docker, with Liberty
+------------------------------------
+
+```
+./mvn clean package liberty:run -Pliberty
+```
+
+Open: http://localhost:9080/starter/index.xhtml
+
+Note that the test suite requires Quarkus runtime, so it is
+not supported to run tests with Liberty.
+
 Locally without Docker, with Quarkus
 ------------------------------------
 

diff --git a/pom.xml b/pom.xml
diff --git a/src/main/java/org/eclipse/microprofile/starter/Version.java b/src/main/java/org/eclipse/microprofile/starter/Version.java
@@ -24,9 +24,9 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
+import java.util.Objects;
 import java.util.Scanner;
 
-
 /**
  * @author Michal Karm Babacek <[email protected]>
  */
@@ -38,8 +38,8 @@ public class Version {
 
     @PostConstruct
     public void init() {
-        try (Scanner s = new Scanner(FilesLocator.class.getClassLoader()
-                .getResourceAsStream("/version.txt")).useDelimiter("\\A")) {
+        try (Scanner s = new Scanner(Objects.requireNonNull(
+                FilesLocator.class.getClassLoader().getResourceAsStream("/version.txt"))).useDelimiter("\\A")) {
             git = s.hasNext() ? s.next() : "";
         } catch (Exception e) {
             LOG.error(e.getMessage());

diff --git a/src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java b/src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java
@@ -22,14 +22,14 @@
  */
 package org.eclipse.microprofile.starter.core.files;
 
-import com.google.common.io.ByteStreams;
 import org.eclipse.microprofile.starter.core.exception.TechnicalException;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -49,16 +49,15 @@ public byte[] processFile(String file, Set<String> alternatives) {
             throw new FileResolutionException(file, alternatives);
         }
 
-        String sourceFile = "/" + filesLocator.getTemplateFile(fileIndication);
+        final String sourceFile = "/" + filesLocator.getTemplateFile(fileIndication);
+        final ByteArrayOutputStream result = new ByteArrayOutputStream();
 
-        InputStream resource = FileCopyEngine.class.getResourceAsStream(sourceFile);
-        ByteArrayOutputStream result = new ByteArrayOutputStream();
-
-        try {
-            ByteStreams.copy(resource, result);
+        try (InputStream resource = FileCopyEngine.class.getResourceAsStream(sourceFile)) {
+            Objects.requireNonNull(resource).transferTo(result);
         } catch (IOException e) {
             throw new TechnicalException(e);
         }
+
         return result.toByteArray();
     }
 

diff --git a/src/main/java/org/eclipse/microprofile/starter/log/AppContext.java b/src/main/java/org/eclipse/microprofile/starter/log/AppContext.java
@@ -0,0 +1,13 @@
+package org.eclipse.microprofile.starter.log;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+public @interface AppContext {
+}
diff --git a/src/main/java/org/eclipse/microprofile/starter/log/ManagedExecutorProducer.java b/src/main/java/org/eclipse/microprofile/starter/log/ManagedExecutorProducer.java
@@ -0,0 +1,21 @@
+package org.eclipse.microprofile.starter.log;
+
+import org.eclipse.microprofile.context.ManagedExecutor;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+
+@ApplicationScoped
+public class ManagedExecutorProducer {
+
+    @Produces
+    @AppContext
+    ManagedExecutor createExecutor() {
+        return ManagedExecutor.builder().build();
+    }
+
+    void disposeExecutor(@Disposes @AppContext ManagedExecutor exec) {
+        exec.shutdownNow();
+    }
+}
diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIService.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIService.java
@@ -40,6 +40,7 @@
 import org.eclipse.microprofile.starter.core.model.ModelManager;
 import org.eclipse.microprofile.starter.core.model.OptionValue;
 import org.eclipse.microprofile.starter.core.validation.PackageNameValidator;
+import org.eclipse.microprofile.starter.log.AppContext;
 import org.eclipse.microprofile.starter.log.ErrorLogger;
 import org.eclipse.microprofile.starter.log.LoggingTask;
 import org.eclipse.microprofile.starter.rest.model.MPOptionsAvailable;
@@ -204,7 +205,8 @@ private List<StandaloneMPSpec> defineStandaloneSpecs(MicroProfileVersion version
     ZipFileCreator zipFileCreator;
 
     @Inject
-    ManagedExecutor executor;
+    @AppContext
+    transient ManagedExecutor executor;
 
     public Response readme(String ifNoneMatch) {
         if (ifNoneMatch != null) {

diff --git a/src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java b/src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java
@@ -42,6 +42,7 @@
 import org.eclipse.microprofile.starter.core.model.MicroProfileVersion;
 import org.eclipse.microprofile.starter.core.model.ModelManager;
 import org.eclipse.microprofile.starter.core.model.OptionValue;
+import org.eclipse.microprofile.starter.log.AppContext;
 import org.eclipse.microprofile.starter.log.ErrorLogger;
 import org.eclipse.microprofile.starter.log.LoggingTask;
 
@@ -89,7 +90,8 @@ public class GeneratorDataBean implements Serializable {
     ErrorLogger errorLogger;
 
     @Inject
-    ManagedExecutor executor;
+    @AppContext
+    transient ManagedExecutor executor;
 
     private EngineData engineData;
 

diff --git a/src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java b/src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java
@@ -41,8 +41,19 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         servletResponse.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains");
         servletResponse.setHeader("X-Content-Type-Options", "nosniff");
         servletResponse.setHeader("X-Frame-Options", "DENY");
-        servletResponse.setHeader("Content-Security-Policy", "default-src: https: font-src 'https://fonts.googleapis.com';" +
-                "img-src 'self' https://microprofile.io; style-src 'self'; frame-ancestors 'none';");
+        servletResponse.setHeader("Content-Security-Policy", ""
+                + "default-src 'self'; "
+                + "script-src 'self' 'unsafe-inline' 'unsafe-eval' "
+                + "     https://use.fontawesome.com "
+                + "     https://kit.fontsawesome.com; "
+                + "style-src 'self' 'unsafe-inline' "
+                + "     fonts.gstatic.com "
+                + "     fonts.googleapis.com "
+                + "     *.fontawesome.com; "
+                + "img-src 'self' fonts.gstatic.com microprofile.io; "
+                + "font-src 'self' fonts.gstatic.com fonts.googleapis.com *.fontsawesome.com; "
+                + "connect-src 'self' fonts.gstatic.com fonts.googleapis.com *.fontsawesome.com; "
+        );
         chain.doFilter(request, response);
     }
 

diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="${project.name}">
+<featureManager>
+    <feature>microProfile-4.1</feature>
+    <feature>webprofile-8.0</feature>
+    <feature>mpContextPropagation-1.2</feature>
+</featureManager>
+<httpEndpoint id="defaultHttpEndpoint"
+              httpPort="9080"
+              httpsPort="9443"/>
+<webApplication location="${project.name}.war" contextRoot="${app.context.root}">
+    <classloader apiTypeVisibility="+third-party" />
+</webApplication>
+</server>
diff --git a/src/main/resources/META-INF/resources/resources/css/starter-1.4.css b/src/main/resources/META-INF/resources/resources/css/starter-1.4.css
@@ -276,7 +276,6 @@ span.ui-icon.ui-icon-triangle-1-s.ui-c::before {
     padding: 9px 15px;
 }
 
-
 .ui-inputfield, .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all {
     border-radius: 5px;
     /* max-width: 280px; */
@@ -434,4 +433,4 @@ span.ui-chkbox-icon.ui-icon.ui-c.ui-icon-check {
 
 .social i.fa:hover {
      color: rgb(253, 183, 28);
- }
+}
diff --git a/src/test/java/org/eclipse/microprofile/starter/utils/Commands.java b/src/test/java/org/eclipse/microprofile/starter/utils/Commands.java
@@ -74,14 +74,18 @@ public static String getWorkspaceDir() {
     public static File unzip(String location, String artifactId) throws InterruptedException, IOException {
         ProcessBuilder pb;
         if (IS_THIS_WINDOWS) {
-            pb = new ProcessBuilder("powershell", "-c", "Expand-Archive", "-Path", location, "-DestinationPath", WORKSPACE_DIR, "-Force");
+            pb = new ProcessBuilder(
+                    "powershell", "-c", "Expand-Archive", "-Path", location, "-DestinationPath", WORKSPACE_DIR, "-Force");
         } else {
             pb = new ProcessBuilder("unzip", "-o", location, "-d", WORKSPACE_DIR);
         }
         Map<String, String> env = pb.environment();
         env.put("PATH", System.getenv("PATH"));
         pb.directory(new File(WORKSPACE_DIR));
         File unzipLog = new File(WORKSPACE_DIR + File.separator + artifactId + "-unzip.log");
+        if (unzipLog.exists()) {
+            unzipLog.delete();
+        }
         pb.redirectErrorStream(true);
         pb.redirectOutput(ProcessBuilder.Redirect.to(unzipLog));
         Process p = pb.start();
@@ -106,7 +110,8 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
                 try {
                     Files.delete(dir);
                 } catch (DirectoryNotEmptyException e) {
-                    LOGGER.error(dir.toAbsolutePath() + " is not empty. That means someone is still writing to it. Stray Gradle daemon? Server?");
+                    LOGGER.error(dir.toAbsolutePath()
+                            + " is not empty. That means someone is still writing to it. Stray Gradle daemon? Server?");
                 }
                 return FileVisitResult.CONTINUE;
             }

diff --git a/src/test/java/org/eclipse/microprofile/starter/utils/Logs.java b/src/test/java/org/eclipse/microprofile/starter/utils/Logs.java
@@ -27,6 +27,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -110,10 +111,9 @@ public static void archiveLog(String testClass, String testMethod, File log) thr
         if (StringUtils.isBlank(testMethod)) {
             throw new IllegalArgumentException("testMethod must not be blank");
         }
-        Path destDir = Path.of(System.getProperties().get("basedir").toString(), "target", "archived-logs", testClass, testMethod);
+        final Path destDir = Path.of(System.getProperties().get("basedir").toString(), "target", "archived-logs", testClass, testMethod);
         Files.createDirectories(destDir);
-        String filename = log.getName();
-        Files.copy(log.toPath(), Paths.get(destDir.toString(), filename));
+        Files.copy(log.toPath(), Paths.get(destDir.toString(), log.getName()), StandardCopyOption.REPLACE_EXISTING);
     }
 
 }