[java-idp-plugin-duo] branch master updated: IDP-1595 Move to new class locations

[Phil Smart]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  74687da   IDP-1595 Move to new class locations
74687da is described below

commit 74687da23f0c68d94df1bdc64883e2cbbabc9ca1
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Jul 16 16:22:14 2020 +0100

    IDP-1595 Move to new class locations
    
    fix service plugin description filename.
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
---
 .gitignore                                                     |  3 ++-
 .../idp/plugin/authn/duo/impl/DuoOIDCDescription.java          | 10 +++++++---
 ...Description => net.shibboleth.idp.plugin.PluginDescription} |  0
 idp-duo-native-client-impl/.gitignore                          |  3 ---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 56fdedf..ba0726f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,9 +25,10 @@
 .project/
 .classpath
 .project
+.factorypath
 classpath:
 /.checkstyle
 /.DS_Store
 target/
 bin/
-test-output/
\ No newline at end of file
+test-output/
diff --git a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCDescription.java b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCDescription.java
index 2bce271..0643a4a 100644
--- a/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCDescription.java
+++ b/idp-duo-impl/src/main/java/net/shibboleth/idp/plugin/authn/duo/impl/DuoOIDCDescription.java
@@ -22,7 +22,11 @@ import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.idp.plugin.AbstractPluginDescription;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 /**
  * Details about the Duo OIDC 2FA plugin.
@@ -30,12 +34,12 @@ import net.shibboleth.idp.plugin.AbstractPluginDescription;
 public class DuoOIDCDescription extends AbstractPluginDescription{
 
     @Override
-    public String getPluginId() {
+    @Nonnull @NotEmpty public String getPluginId() {
         return "net.shibboleth.plugin.idp.authn.duo";
     }
     
     @Override
-    public List<String> getAdditionalPropertyFiles(){
+    @Nonnull @NonnullElements public List<String> getAdditionalPropertyFiles(){
         return List.of("/conf/authn/idp-duo-oidc.properties");
     }
 
@@ -56,7 +60,7 @@ public class DuoOIDCDescription extends AbstractPluginDescription{
     }
 
     @Override
-    public List<URL> getUpdateURLs() throws IOException {
+    @Nonnull @NonnullElements public List<URL> getUpdateURLs() throws IOException {
         return Collections.emptyList();
     }
 
diff --git a/idp-duo-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription b/idp-duo-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
similarity index 100%
rename from idp-duo-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription
rename to idp-duo-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
diff --git a/idp-duo-native-client-impl/.gitignore b/idp-duo-native-client-impl/.gitignore
deleted file mode 100644
index 87c484d..0000000
--- a/idp-duo-native-client-impl/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/test-output
-/.checkstyle

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