[java-idp-integration-tests] 02/02: Cleanup Checkstyle warnings

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=a52c87d8cc40ec96951ca25715f607ec2f5abe37

commit a52c87d8cc40ec96951ca25715f607ec2f5abe37
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Aug 29 23:07:50 2022 -0500

    Cleanup Checkstyle warnings
---
 pom.xml                                                           | 4 +---
 .../shibboleth/idp/integration/tests/AbstractServerProcess.java   | 5 -----
 .../net/shibboleth/idp/integration/tests/BaseIntegrationTest.java | 8 ++++----
 .../idp/integration/tests/clientstorage/ClientStorageTest.java    | 2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67ad7bb..b57eb78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,7 @@
         <testbed.version>5.0.0-SNAPSHOT</testbed.version>
         <testbed.classifier>classes</testbed.classifier>
 
-        <!-- OpenSAML and Java support -->
-        <java-support.version>9.0.0-SNAPSHOT</java-support.version>
+        <!-- OpenSAML -->
         <opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
 
         <selenium.version>4.3.0</selenium.version>
@@ -123,7 +122,6 @@
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
-            <version>${java-support.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java b/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java
index a5bde2f..d82bae3 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/AbstractServerProcess.java
@@ -52,7 +52,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterI
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -228,7 +227,6 @@ public class AbstractServerProcess extends AbstractInitializableComponent implem
      */
     @Nonnull
     public AbstractServerProcess setAdditionalCommands(@Nullable final List<String> commands) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         if (commands != null) {
             additionalCommands = commands;
         }
@@ -243,7 +241,6 @@ public class AbstractServerProcess extends AbstractInitializableComponent implem
      */
     @Nonnull
     public AbstractServerProcess setServletContainerBasePath(@Nonnull final Path containerBasePath) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         pathToContainerBase = Constraint.isNotNull(containerBasePath, "Path to Servlet container base cannot be null");
         return this;
     }
@@ -256,7 +253,6 @@ public class AbstractServerProcess extends AbstractInitializableComponent implem
      */
     @Nonnull
     public AbstractServerProcess setServletContainerHomePath(@Nonnull final Path containerHomePath) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         pathToContainerHome = Constraint.isNotNull(containerHomePath, "Path to Servlet container home cannot be null");
         return this;
     }
@@ -269,7 +265,6 @@ public class AbstractServerProcess extends AbstractInitializableComponent implem
      */
     @Nonnull
     public AbstractServerProcess setStatusPageURL(@Nonnull @NotEmpty final String URL) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         statusPageURL = Constraint.isNotNull(StringSupport.trimOrNull(URL), "Status page URL cannot be null nor empty");
         return this;
     }
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
index 5d37655..7a652f8 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -297,7 +297,7 @@ public abstract class BaseIntegrationTest {
     @Nonnull protected boolean useSecureBaseURL = true;
 
     /** Client IP range to allow access from. Defaults to "127.0.0.1/32". */
-    @Nonnull protected Set<String> clientIPRanges = new LinkedHashSet(Arrays.asList("127.0.0.1/32"));
+    @Nonnull protected Set<String> clientIPRanges = new LinkedHashSet<String>(Arrays.asList("127.0.0.1/32"));
 
     /** Path to idp.home. */
     @NonnullAfterInit protected Path pathToIdPHome;
@@ -438,7 +438,7 @@ public abstract class BaseIntegrationTest {
         final ProcessBuilder installerBuilder = new ProcessBuilder();
         installerBuilder.directory(pathToIdPDist.toFile());
         installerBuilder.redirectErrorStream();
-        final List<String> installerCommands = new ArrayList();
+        final List<String> installerCommands = new ArrayList<String>();
         if (isWindows()) {
             final Path pathToInstallBat = pathToIdPDist.resolve(Paths.get("bin", "install.bat"));
             Assert.assertTrue(pathToInstallBat.toFile().exists());
@@ -1452,7 +1452,7 @@ public abstract class BaseIntegrationTest {
         replacement.append(serviceDefintiion);
 
         // Add public server addresses if not localhost
-        final Set<String> addresses = new LinkedHashSet();
+        final Set<String> addresses = new LinkedHashSet<String>();
         addresses.add(address);
         addresses.add(secureAddress);
         addresses.add(privateAddress);
@@ -1487,7 +1487,7 @@ public abstract class BaseIntegrationTest {
         replacement.append(requesterRegex);
 
         // Add public server addresses if not localhost
-        final Set<String> addresses = new LinkedHashSet();
+        final Set<String> addresses = new LinkedHashSet<String>();
         addresses.add(address);
         addresses.add(secureAddress);
         addresses.add(privateAddress);
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/clientstorage/ClientStorageTest.java b/src/test/java/net/shibboleth/idp/integration/tests/clientstorage/ClientStorageTest.java
index b5e8d64..2e4e20c 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/clientstorage/ClientStorageTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/clientstorage/ClientStorageTest.java
@@ -176,7 +176,7 @@ public class ClientStorageTest extends BaseIntegrationTest {
 
         submitReadForm(DEFAULT_STORAGE_SERIVCE_ID, "context", "key");
 
-        final StorageRecord deserialized = serializer.deserialize("context", "key", getPageSource());
+        final StorageRecord<?> deserialized = serializer.deserialize("context", "key", getPageSource());
 
         Assert.assertEquals(deserialized.getValue(), "value");
         Assert.assertEquals(deserialized.getVersion(), 1);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.