[java-idp-plugin-duo] branch main updated: Fix annotations

[Phil Smart]

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

philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=26af0e99f2e246a7c1d2b90cb744e0c6eb398f90

The following commit(s) were added to refs/heads/main by this push:
       new  26af0e9   Fix annotations
26af0e9 is described below

commit 26af0e99f2e246a7c1d2b90cb744e0c6eb398f90
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Mar 5 17:26:08 2021 +0000

    Fix annotations
---
 .../idp/plugin/authn/duo/nimbus/impl/NimbusClientFactory.java        | 4 ++--
 .../idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java           | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactory.java b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactory.java
index 8c4d564..7d89ae1 100644
--- a/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactory.java
+++ b/idp-duo-nimbus-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/nimbus/impl/NimbusClientFactory.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.plugin.authn.duo.nimbus.impl;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.ThreadSafe;
 
 import org.apache.http.client.HttpClient;
 import org.opensaml.security.httpclient.HttpClientSecurityParameters;
@@ -31,7 +32,6 @@ import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClient;
 import net.shibboleth.idp.plugin.authn.duo.DuoOIDCClientFactory;
 import net.shibboleth.idp.plugin.authn.duo.DuoOIDCIntegration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
-import net.shibboleth.utilities.java.support.annotation.constraint.ThreadSafeAfterInit;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -46,7 +46,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
  * Each client instance shares the same, thread-safe, http client and object mapper.
  * </p>
  */
- at ThreadSafeAfterInit
+ at ThreadSafe
 public class NimbusClientFactory extends AbstractInitializableComponent implements DuoOIDCClientFactory {
 
     /** HttpClient for contacting Duo. */
diff --git a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
index 8ae345d..1db2a56 100644
--- a/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
+++ b/idp-duo-sdk-client-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/sdk/impl/DuoSDKClientFactory.java
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.plugin.authn.duo.sdk.impl;
 
+import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -71,8 +72,8 @@ public class DuoSDKClientFactory extends AbstractInitializableComponent implemen
      * 
      * @return the caCerts.
      */
-    private synchronized List<String> getCaCerts(){
-        return caCerts;
+    @Nullable @NonnullElements @Unmodifiable private synchronized List<String> getCaCerts(){
+        return Collections.unmodifiableList(caCerts);
     }
 
     @Override

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