svn commit: r1728666 - in /tomcat/trunk: java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java

[ma...@apache.org]

Author: markt
Date: Fri Feb  5 13:44:17 2016
New Revision: 1728666

URL: http://svn.apache.org/viewvc?rev=1728666&view=rev
Log:
Simplify

Modified:
    tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
    tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java?rev=1728666&r1=1728665&r2=1728666&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java Fri Feb  5 13:44:17 2016
@@ -21,7 +21,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.tomcat.util.digester.Digester;
 import org.xml.sax.SAXException;
@@ -88,7 +90,7 @@ final class PersistentProviderRegistrati
         private String layer;
         private String appContext;
         private String description;
-        private final List<Property> properties = new ArrayList<>();
+        private final Map<String,String> properties = new HashMap<>();
 
 
         public String getClassName() {
@@ -124,9 +126,9 @@ final class PersistentProviderRegistrati
 
 
         public void addProperty(Property property) {
-            properties.add(property);
+            properties.put(property.getName(), property.getValue());
         }
-        public List<Property> getProperties() {
+        public Map<String,String> getProperties() {
             return properties;
         }
     }

Modified: tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java?rev=1728666&r1=1728665&r2=1728666&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java (original)
+++ tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java Fri Feb  5 13:44:17 2016
@@ -21,7 +21,6 @@ import java.io.File;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Property;
 import org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Provider;
 import org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Providers;
 
@@ -47,12 +46,7 @@ public class TestPersistentProviderRegis
         Assert.assertEquals("d", p.getDescription());
 
         Assert.assertEquals(2,  p.getProperties().size());
-        Property prop1 = p.getProperties().get(0);
-        Assert.assertEquals("e", prop1.getName());
-        Assert.assertEquals("f", prop1.getValue());
-        Property prop2 = p.getProperties().get(1);
-        Assert.assertEquals("g", prop2.getName());
-        Assert.assertEquals("h", prop2.getValue());
+        Assert.assertEquals("f", p.getProperties().get("e"));
+        Assert.assertEquals("h", p.getProperties().get("g"));
     }
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org