add two jUnit test and CodeStyle modifications

2 files changed, 23 insertions, 1 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvp2BasicConfiguration.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvp2BasicConfiguration.java
index 3e321c21..a54eb0b8 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvp2BasicConfiguration.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvp2BasicConfiguration.java
@@ -24,6 +24,7 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
 import org.opensaml.saml.saml2.metadata.ContactPerson;
@@ -95,4 +96,14 @@ public interface IPvp2BasicConfiguration {
   @Nonnull
   Organization getIdpOrganisation() throws EaafException;
 
+  /**
+   * Get the basic {@link IConfiguration} object that was
+   * used to generate this {@link IPvp2BasicConfiguration}.
+   *
+   * @return Basic application configuration
+   */
+  @Nonnull
+  IConfiguration getBasicConfiguration();
+
+
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
index 1af8db7b..2f058af8 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvp2MetadataProvider.java
@@ -19,6 +19,9 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.api.metadata;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import org.opensaml.saml.metadata.resolver.ExtendedRefreshableMetadataResolver;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
@@ -26,6 +29,14 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 public interface IPvp2MetadataProvider extends ExtendedRefreshableMetadataResolver {
 
-  EntityDescriptor getEntityDescriptor(String entityID) throws ResolverException;
+  /**
+   * Get a SAML2 EntityDescriptor with an EntityId from metadata provider.
+   *
+   * @param entityID Unique EntityId of the application
+   * @return SAML2 {@link EntityDescriptor}
+   * @throws ResolverException In case of an internal resolver error.
+   */
+  @Nullable
+  EntityDescriptor getEntityDescriptor(@Nonnull String entityID) throws ResolverException;
 
 }