Add Microprofile Health

appserver/distributions/glassfish/pom.xml

@@ -141,6 +141,10 @@
                                     basedir="${patches}/microprofile-rest-client-api" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/microprofile-rest-client-api.jar"
                                 />
+                                <jarupdate if:set="java17orGreater"
+                                           basedir="${patches}/microprofile-health-api" includes="META-INF/MANIFEST.MF"
+                                           destfile="${glassfish.modules}/microprofile-health-api.jar"
+                                />
                                 <jarupdate
                                     basedir="${patches}/tyrus-client" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/tyrus-client.jar"

appserver/distributions/glassfish/src/main/patches/microprofile-health-api/META-INF/MANIFEST.MF

@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-Description: MicroProfile Health :: API
+Bundle-License: Apache License, Version 2.0
+Bundle-SymbolicName: org.eclipse.microprofile.health
+Bnd-LastModified: 1664892780713
+Bundle-ManifestVersion: 2
+Bundle-DocURL: https://microprofile.io/project/eclipse/microprofile-he
+ alth/microprofile-health-api
+Bundle-Vendor: Eclipse Foundation
+Import-Package: jakarta.enterprise.util;version="[3.0,5)",jakarta.inje
+ ct;version="[2.0,4)",org.eclipse.microprofile.health;version="[3.0,5)
+ ",org.eclipse.microprofile.health.spi;version="[1.1,2)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+Tool: Bnd-5.2.0.202010142003
+Export-Package: org.eclipse.microprofile.health;version="3.0";uses:="j
+ akarta.enterprise.util,jakarta.inject,org.eclipse.microprofile.health
+ .spi",org.eclipse.microprofile.health.spi;version="1.1";uses:="org.ec
+ lipse.microprofile.health"
+Bundle-Name: MicroProfile Health Check Bundle
+Bundle-Version: 4.0.1
+Bundle-SCM: url="https://github.com/eclipse/microprofile-health/microp
+ rofile-health-api",connection="scm:git:https://github.com/eclipse/mic
+ roprofile-health.git/microprofile-health-api",developer-connection="s
+ cm:git:[email protected]:eclipse/microprofile-health.git/microprofile-he
+ alth-api",tag="4.0.1"
+Build-Jdk-Spec: 1.8
+Created-By: 1.8.0_292 (AdoptOpenJDK)
+

appserver/featuresets/glassfish/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2022, 2023 Contributors to Eclipse Foundation.
+    Copyright (c) 2022, 2024 Contributors to Eclipse Foundation.
     Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -840,6 +840,29 @@
                     </exclusions>
                 </dependency>
 
+                <!-- MicroProfile Health -->
+                <dependency>
+                    <groupId>org.eclipse.microprofile.health</groupId>
+                    <artifactId>microprofile-health-api</artifactId>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.glassfish.main.microprofile</groupId>
+                    <artifactId>microprofile-health</artifactId>
+                    <version>${project.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
                 <!-- MicroProfile JWT -->
                 <dependency>
                     <groupId>org.eclipse.microprofile.jwt</groupId>

appserver/microprofile/health/pom.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Contributors to Eclipse Foundation.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.glassfish.main.microprofile</groupId>
+        <artifactId>microprofile-parent</artifactId>
+        <version>7.0.20-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>microprofile-health</artifactId>
+    <packaging>glassfish-jar</packaging>
+
+    <name>GlassFish MicroProfile Health</name>
+
+    <dependencies>
+        <!-- APIs -->
+        <dependency>
+            <groupId>org.eclipse.microprofile.health</groupId>
+            <artifactId>microprofile-health-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.microprofile</groupId>
+            <artifactId>microprofile-config</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json.bind</groupId>
+            <artifactId>jakarta.json.bind-api</artifactId>
+        </dependency>
+
+        <!-- Internal Dependencies -->
+        <dependency>
+            <groupId>org.glassfish.main.common</groupId>
+            <artifactId>glassfish-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.common</groupId>
+            <artifactId>internal-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.web</groupId>
+            <artifactId>weld-integration</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>17</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <supportedProjectTypes>
+                        <supportedProjectType>glassfish-jar</supportedProjectType>
+                    </supportedProjectTypes>
+                    <instructions>
+                        <!-- A list of packages that are exposed to classes outside the bundle -->
+                        <Export-Package>
+                            org.glassfish.microprofile.health;
+                        </Export-Package>
+                        <Import-Package>
+                            org.eclipse.microprofile.config;
+                            org.eclipse.microprofile.health.spi;
+                            org.eclipse.microprofile.health;
+                            jakarta.enterprise.util;
+                            jakarta.enterprise.inject;
+                            jakarta.enterprise.inject.spi;
+                            jakarta.servlet.http;
+                            jakarta.servlet;
+                            jakarta.json.bind;
+                            jakarta.inject;
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>osgi-bundle</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

appserver/microprofile/health/src/main/java/org/glassfish/microprofile/health/HealthCheckResponseBuilderImpl.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024 Contributors to Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package org.glassfish.microprofile.health;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
+
+public class HealthCheckResponseBuilderImpl extends HealthCheckResponseBuilder {
+
+    private final Map<String, Object> data = new HashMap<>();
+    private String name;
+    private HealthCheckResponse.Status status;
+
+    @Override
+    public HealthCheckResponseBuilder name(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public HealthCheckResponseBuilder withData(String key, String value) {
+        data.put(key, value);
+        return this;
+    }
+
+    @Override
+    public HealthCheckResponseBuilder withData(String key, long value) {
+        data.put(key, value);
+        return this;
+    }
+
+    @Override
+    public HealthCheckResponseBuilder withData(String key, boolean value) {
+        data.put(key, value);
+        return this;
+    }
+
+    @Override
+    public HealthCheckResponseBuilder up() {
+        return status(true);
+    }
+
+    @Override
+    public HealthCheckResponseBuilder down() {
+        return status(false);
+    }
+
+    @Override
+    public HealthCheckResponseBuilder status(boolean up) {
+        status = up ? HealthCheckResponse.Status.UP : HealthCheckResponse.Status.DOWN;
+        return this;
+    }
+
+    @Override
+    public HealthCheckResponse build() {
+        return new HealthCheckResponse(name, status, data.isEmpty() ? null : Optional.of(data));
+    }
+}

appserver/microprofile/health/src/main/java/org/glassfish/microprofile/health/HealthCheckResponseProviderImpl.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024 Contributors to Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package org.glassfish.microprofile.health;
+
+import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
+import org.eclipse.microprofile.health.spi.HealthCheckResponseProvider;
+
+public class HealthCheckResponseProviderImpl implements HealthCheckResponseProvider {
+    @Override
+    public HealthCheckResponseBuilder createResponseBuilder() {
+        return new HealthCheckResponseBuilderImpl();
+    }
+}