Merge pull request #245 from rdebusscher/issue218

Use MP 3.0 Health annotations. fixes #218.

Author: rdebusscher

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java

@@ -29,6 +29,7 @@
 import org.eclipse.microprofile.starter.core.exception.JessieConfigurationException;
 import org.eclipse.microprofile.starter.core.exception.JessieUnexpectedException;
 import org.eclipse.microprofile.starter.core.model.JessieModel;
+import org.eclipse.microprofile.starter.core.model.MicroProfileVersion;
 import org.eclipse.microprofile.starter.core.model.OptionValue;
 import org.eclipse.microprofile.starter.spi.MavenHelper;
 
@@ -204,7 +205,12 @@ public void createFiles(JessieModel model) {
             String healthDirectory = model.getDirectory(true) + "/" + rootJava + "/health";
             directoryCreator.createDirectory(healthDirectory);
 
-            processTemplateFile(healthDirectory, "ServiceHealthCheck.java", alternatives, variables);
+            if (alternatives.contains(MicroProfileVersion.Constants.MP3X_ALTERNATIVE)) {
+                processTemplateFile(healthDirectory, "ServiceLiveHealthCheck.java", alternatives, variables);
+                processTemplateFile(healthDirectory, "ServiceReadyHealthCheck.java", alternatives, variables);
+            } else {
+                processTemplateFile(healthDirectory, "ServiceHealthCheck.java", alternatives, variables);
+            }
         }
 
         if (microprofileSpecs.contains(MicroprofileSpec.CONFIG)) {

src/main/java/org/eclipse/microprofile/starter/core/model/MicroProfileVersion.java

@@ -22,6 +22,8 @@
  */
 package org.eclipse.microprofile.starter.core.model;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -30,7 +32,7 @@ public enum MicroProfileVersion {
     // Order is important as it determines the order in the Dropdown on the screen.
     // @formatter:off
     NONE(null, "")
-    , MP30("3.0", "MP 3.0")
+    , MP30("3.0", "MP 3.0", Collections.singletonList(Constants.MP3X_ALTERNATIVE))
     , MP22("2.2", "MP 2.2")
     , MP21("2.1", "MP 2.1")
     , MP20("2.0", "MP 2.0", "2.0.1")
@@ -51,6 +53,13 @@ public enum MicroProfileVersion {
         mavenVersion = code;
     }
 
+    MicroProfileVersion(String code, String label, Collection<String> alternatives) {
+        this.code = code;
+        this.label = label;
+        this.alternatives = new HashSet<>(alternatives);
+        mavenVersion = code;
+    }
+
     MicroProfileVersion(String code, String label, String mavenVersion) {
         this(code, label);
         this.mavenVersion = mavenVersion;
@@ -82,4 +91,8 @@ public static MicroProfileVersion valueFor(String code) {
         }
         return result;
     }
+
+    public static class Constants {
+        public static final String MP3X_ALTERNATIVE = "mp3_x";
+    }
 }

src/main/resources/files.lst

@@ -41,6 +41,8 @@ src/main/resources/files/securedURLs.ini.tpl
 src/main/resources/files/service-b/RestApplication.java.tpl
 src/main/resources/files/ServiceController.java.tpl
 src/main/resources/files/ServiceHealthCheck.java.tpl
+src/main/resources/files/mp3_x/ServiceLiveHealthCheck.java.tpl
+src/main/resources/files/mp3_x/ServiceReadyHealthCheck.java.tpl
 src/main/resources/files/Service.java.tpl
 src/main/resources/files/TestSecureController.java.tpl
 src/main/resources/files/thorntail-v2/web.xml.tpl

src/main/resources/files/mp3_x/ServiceLiveHealthCheck.java.tpl

@@ -0,0 +1,19 @@
+package [# th:text="${java_package}"/].health;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.Liveness;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@Liveness
+@ApplicationScoped
+public class ServiceLiveHealthCheck implements HealthCheck {
+
+    @Override
+    public HealthCheckResponse call() {
+
+        return HealthCheckResponse.named(ServiceLiveHealthCheck.class.getSimpleName()).withData("live",true).up().build();
+
+    }
+}

src/main/resources/files/mp3_x/ServiceReadyHealthCheck.java.tpl

@@ -0,0 +1,19 @@
+package [# th:text="${java_package}"/].health;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.Readiness;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@Readiness
+@ApplicationScoped
+public class ServiceReadyHealthCheck implements HealthCheck {
+
+    @Override
+    public HealthCheckResponse call() {
+
+        return HealthCheckResponse.named(ServiceReadyHealthCheck.class.getSimpleName()).withData("ready",true).up().build();
+
+    }
+}