[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupN...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat May 31 01:38:24 2014
New Revision: 3902

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3902&view=rev
Log:
Rename EntitiesDescriptorGroupName -> EntityGroupName, to decouple it from the specific notion on an EntitiesDescriptor.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java
      - copied, changed from r3901, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupName.java
    trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntityGroupNameTest.java
      - copied, changed from r3901, trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupName.java
    trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java

Copied: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java (from r3901, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupName.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java?p2=trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java&p1=trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupName.java&r1=3901&r2=3902&rev=3902&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupName.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/EntityGroupName.java Sat May 31 01:38:24 2014
@@ -27,11 +27,11 @@
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
 /**
- * A bean class which is used to represent an entities descriptor group to which an 
+ * A bean class which is used to represent an entity group to which an 
  * {@link EntityDescriptor} belongs.  It will typically be attached to an entity descriptor
  * via its {@link XMLObject#getObjectMetadata()}.
  */
-public class EntitiesDescriptorGroupName {
+public class EntityGroupName {
     
     /** The entities descriptor group name. */
     private String name;
@@ -39,17 +39,17 @@
     /**
      * Constructor.
      *
-     * @param newName the entities descriptor group name
+     * @param newName the entity group name
      */
-    public EntitiesDescriptorGroupName(@Nonnull @NotEmpty final String newName) {
+    public EntityGroupName(@Nonnull @NotEmpty final String newName) {
         name = Constraint.isNotNull(StringSupport.trimOrNull(newName), 
-                "EntitiesDescriptor group name may not be null or empty");
+                "Entity group name may not be null or empty");
     }
     
     /**
-     * Get the entities descriptor group name.
+     * Get the entity group name.
      * 
-     * @return the entities descriptor group name
+     * @return the entity group name
      */
     @Nonnull @NotEmpty public String getName() {
         return name;
@@ -66,8 +66,8 @@
             return true;
         }
         
-        if (obj instanceof EntitiesDescriptorGroupName) {
-            return name.equals(((EntitiesDescriptorGroupName)obj).getName());
+        if (obj instanceof EntityGroupName) {
+            return name.equals(((EntityGroupName)obj).getName());
         } else {
             return false;
         }

Copied: trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntityGroupNameTest.java (from r3901, trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntityGroupNameTest.java?p2=trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntityGroupNameTest.java&p1=trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java&r1=3901&r2=3902&rev=3902&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java (original)
+++ trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntityGroupNameTest.java Sat May 31 01:38:24 2014
@@ -24,32 +24,32 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class EntitiesDescriptorGroupNameTest {
+public class EntityGroupNameTest {
     
     @Test
     public void testConstructor() {
-        EntitiesDescriptorGroupName groupName = new EntitiesDescriptorGroupName("foo");
+        EntityGroupName groupName = new EntityGroupName("foo");

[... 126 lines stripped ...]