Fix Checkstyle warnings

Signed-off-by: Thiago Henrique Hüpner <[email protected]>

Author: Thihup

appserver/microprofile/health-glassfish/src/main/java/org/glassfish/microprofile/health/service/CollectHealthChecksExtension.java

@@ -24,6 +24,7 @@
 import jakarta.enterprise.inject.spi.Extension;
 import jakarta.enterprise.inject.spi.ProcessBean;
 
+import java.lang.ref.Cleaner;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,6 +45,8 @@
 
 public class CollectHealthChecksExtension implements Extension {
 
+    private static final Cleaner CLEANER = Cleaner.create();
+
     private final HealthReporter service;
     private final Set<HealthCheckBeanAndKind> healthChecks = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private final InvocationManager invocationManager;
@@ -86,10 +89,13 @@ public <T> void processBeans(@Observes ProcessBean<T> beans) {
     }
 
     public void afterDeploymentValidation(@Observes AfterDeploymentValidation adv, BeanManager beanManager) {
-        healthChecks.forEach(bean -> {
-            CreationalContext<HealthCheck> creationalContext = beanManager.createCreationalContext(bean.bean());
+        healthChecks.forEach(healthCheckBeanAndKind -> {
+            Bean<HealthCheck> bean = healthCheckBeanAndKind.bean();
+            CreationalContext<HealthCheck> creationalContext = beanManager.createCreationalContext(bean);
+            HealthCheck healthCheck = bean.create(creationalContext);
+
             service.addHealthCheck(invocationManager.getCurrentInvocation().getAppName(),
-                    new HealthCheckInfo(bean.bean().create(creationalContext), bean.kind()));
+                    new HealthCheckInfo(healthCheck, healthCheckBeanAndKind.kind()));
         });
     }
 }

appserver/microprofile/health-glassfish/src/main/java/org/glassfish/microprofile/health/service/HealthService.java

@@ -1,6 +1,20 @@
+/*
+ * 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.service;
 
-
 import jakarta.inject.Inject;
 
 import org.glassfish.api.StartupRunLevel;

appserver/microprofile/health-glassfish/src/main/java/org/glassfish/microprofile/health/service/package-info.java

@@ -0,0 +1,16 @@
+/*
+ * 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.service;

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

@@ -15,6 +15,7 @@
  */
 package org.glassfish.microprofile.health;
 
+import jakarta.enterprise.inject.spi.CDI;
 import jakarta.inject.Singleton;
 
 import java.util.Collection;
@@ -112,6 +113,8 @@ public void addHealthCheck(String contextName, HealthCheckInfo healthCheck) {
     }
 
     public void removeAllHealthChecksFrom(String contextName) {
+        List<HealthCheckInfo> healthCheckInfos = applicationHealthChecks.get(contextName);
+        healthCheckInfos.forEach(healthCheck -> CDI.current().destroy(healthCheck));
         applicationHealthChecks.remove(contextName);
     }
 

appserver/microprofile/health/src/main/java/org/glassfish/microprofile/health/package-info.java

@@ -0,0 +1,16 @@
+/*
+ * 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;

appserver/tests/tck/microprofile/health/src/main/java/org/glassfish/microprofile/health/tck/HealthArquillianExtension.java

@@ -15,7 +15,6 @@
  */
 package org.glassfish.microprofile.health.tck;
 
-import java.net.URI;
 import java.util.logging.Logger;
 
 import org.glassfish.microprofile.health.tck.client.BeansXmlTransformer;

appserver/tests/tck/microprofile/health/src/main/java/org/glassfish/microprofile/health/tck/client/BeansXmlTransformer.java

@@ -15,6 +15,11 @@
  */
 package org.glassfish.microprofile.health.tck.client;
 
+import java.net.URL;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
+
 import org.jboss.arquillian.container.spi.event.container.BeforeDeploy;
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.core.api.annotation.Observes;
@@ -25,11 +30,6 @@
 import org.jboss.shrinkwrap.api.asset.ArchiveAsset;
 import org.jboss.shrinkwrap.api.asset.UrlAsset;
 
-import java.net.URL;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.logging.Logger;
-
 import static java.lang.String.format;
 
 /**

appserver/tests/tck/microprofile/health/src/main/java/org/glassfish/microprofile/health/tck/client/RootResourceProvider.java

@@ -1,12 +1,27 @@
+/*
+ * 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.tck.client;
 
-import org.jboss.arquillian.container.test.impl.enricher.resource.URIResourceProvider;
-import org.jboss.arquillian.test.api.ArquillianResource;
-
 import java.lang.annotation.Annotation;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.jboss.arquillian.container.test.impl.enricher.resource.URIResourceProvider;
+import org.jboss.arquillian.test.api.ArquillianResource;
+
 public class RootResourceProvider extends URIResourceProvider {
 
     @Override

appserver/tests/tck/microprofile/health/src/main/java/org/glassfish/microprofile/health/tck/client/package-info.java

@@ -0,0 +1,16 @@
+/*
+ * 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.tck.client;

appserver/tests/tck/microprofile/health/src/main/java/org/glassfish/microprofile/health/tck/package-info.java

@@ -0,0 +1,16 @@
+/*
+ * 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.tck;