Fixxes #4283 - Cleanup various bits

piranhacloud · Nov 26, 2024 · 64169dc · 64169dc
1 parent 4f31989
commit 64169dc
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 9 deletions.
diff --git a/extension/servletannotations/src/main/java/module-info.java b/extension/servletannotations/src/main/java/module-info.java
@@ -35,6 +35,6 @@
 
     exports cloud.piranha.extension.servletannotations;
     opens cloud.piranha.extension.servletannotations;
-    requires cloud.piranha.core.api;
+    requires transitive cloud.piranha.core.api;
     requires jakarta.annotation;
 }
diff --git a/extension/soteria/src/main/java/module-info.java b/extension/soteria/src/main/java/module-info.java
@@ -36,7 +36,7 @@
 
     exports cloud.piranha.extension.soteria;
     opens cloud.piranha.extension.soteria;
-    requires cloud.piranha.core.api;
+    requires transitive cloud.piranha.core.api;
     requires cloud.piranha.core.impl;
     requires jakarta.cdi;
     requires jakarta.inject;

diff --git a/extension/soteria/src/test/java/cloud/piranha/extension/soteria/TestIdentityStore.java b/extension/soteria/src/test/java/cloud/piranha/extension/soteria/TestIdentityStore.java
@@ -43,6 +43,7 @@
 @ApplicationScoped
 public class TestIdentityStore implements IdentityStore {
 
+    @SuppressWarnings("exports")
     public CredentialValidationResult validate(
             UsernamePasswordCredential usernamePasswordCredential) {
 

diff --git a/extension/tempdir/src/main/java/module-info.java b/extension/tempdir/src/main/java/module-info.java
@@ -50,5 +50,5 @@
 
     exports cloud.piranha.extension.tempdir;
     opens cloud.piranha.extension.tempdir;
-    requires cloud.piranha.core.api;
+    requires transitive cloud.piranha.core.api;
 }
diff --git a/extension/tyrus/src/main/java/module-info.java b/extension/tyrus/src/main/java/module-info.java
@@ -50,7 +50,7 @@
 
     exports cloud.piranha.extension.tyrus;
     opens cloud.piranha.extension.tyrus;
-    requires cloud.piranha.core.api;
+    requires transitive cloud.piranha.core.api;
     requires org.glassfish.tyrus.container.servlet;
     requires static cloud.piranha.extension.scinitializer;
 }
diff --git a/extension/wasp/src/main/java/module-info.java b/extension/wasp/src/main/java/module-info.java
@@ -58,7 +58,7 @@
 
     exports cloud.piranha.extension.wasp;
     opens cloud.piranha.extension.wasp;
-    requires cloud.piranha.core.impl;
+    requires transitive cloud.piranha.core.impl;
     requires jakarta.servlet.jsp;
     requires transitive org.glassfish.wasp;
 }
diff --git a/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java b/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java
@@ -29,7 +29,6 @@
 
 import cloud.piranha.core.api.WebApplication;
 import cloud.piranha.core.impl.DefaultWebApplication;
-import cloud.piranha.embedded.EmbeddedPiranha;
 import cloud.piranha.embedded.EmbeddedPiranhaBuilder;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import org.junit.jupiter.api.Test;
@@ -53,7 +52,7 @@ class JspDescriptorTest {
     @Test
     void testGetJspConfigDescriptor() throws Exception {
         WebApplication webApplication = new DefaultWebApplication();
-        EmbeddedPiranha piranha = new EmbeddedPiranhaBuilder()
+        new EmbeddedPiranhaBuilder()
                 .webApplication(webApplication)
                 .initializer(WaspInitializer.class.getName())
                 .buildAndStart();

diff --git a/extension/webprofile/src/main/java/module-info.java b/extension/webprofile/src/main/java/module-info.java
@@ -55,7 +55,7 @@
 
     exports cloud.piranha.extension.webprofile;
     opens cloud.piranha.extension.webprofile;
-    requires cloud.piranha.core.api;
+    requires transitive cloud.piranha.core.api;
     requires cloud.piranha.extension.annotationscan;
     requires cloud.piranha.extension.annotationscan.classfile;
     requires cloud.piranha.extension.fileupload;

diff --git a/...webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessor.java b/...webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessor.java
@@ -303,11 +303,13 @@ private void processFilterMappings(WebApplication webApplication, WebXml webXml)
         });
     }
 
+    @SuppressWarnings("unchecked")
     private EnumSet<DispatcherType> toEnumDispatcherTypes(List<String> dispatchers) {
         if (dispatchers == null) {
             return null;
         }
 
+        @SuppressWarnings("rawtypes")
         EnumSet enumSet = EnumSet.noneOf(DispatcherType.class);
         for (String dispatcherType : dispatchers) {
             enumSet.add(DispatcherType.valueOf(dispatcherType));

diff --git a/extension/webxml/src/main/java/module-info.java b/extension/webxml/src/main/java/module-info.java
@@ -42,7 +42,7 @@
 
     exports cloud.piranha.extension.webxml;
     opens cloud.piranha.extension.webxml;
-    requires cloud.piranha.core.api;
+    requires transitive cloud.piranha.core.api;
     requires cloud.piranha.core.impl;
     requires static java.naming;
     requires static java.sql;

diff --git a/.../core/src/test/java/org/jboss/weld/tck/piranha/PiranhaDeploymentExceptionTransformer.java b/.../core/src/test/java/org/jboss/weld/tck/piranha/PiranhaDeploymentExceptionTransformer.java
@@ -60,6 +60,7 @@ public class PiranhaDeploymentExceptionTransformer implements DeploymentExceptio
 
     @Override
     public Throwable transform(Throwable throwable) {
+        @SuppressWarnings("unchecked")
         List<Throwable> throwableList = ExceptionUtils.getThrowableList(throwable);
         if (throwableList.size() < 1)
             return throwable;