add convenient getter/setter to ease json mapping for Map fields.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1242597 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
index 4f29d15409856e0d99eab4f318a7448c343a2f25..4efc1a818f330a622c09c431110e5ea33ef0ff78 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
@@ -18,6 +18,8 @@ package org.apache.archiva.admin.model;
  * under the License.
  */
 
+import org.apache.archiva.admin.model.beans.PropertyEntry;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -61,11 +63,25 @@ public abstract class AbstractRepositoryConnector
      */
     private Map<String, String> policies;
 
+    /**
+     * field to ease json mapping wrapper on <code>policies</code> field
+     *
+     * @since 1.4-M3
+     */
+    private List<PropertyEntry> policiesEntries;
+
     /**
      * Field properties.
      */
     private Map<String, String> properties;
 
+    /**
+     * field to ease json mapping wrapper on <code>properties</code> field
+     *
+     * @since 1.4-M3
+     */
+    private List<PropertyEntry> propertiesEntries;
+
     /**
      * If the the repository proxy connector is disabled or not
      */
@@ -347,6 +363,42 @@ public abstract class AbstractRepositoryConnector
         return value;
     }
 
+    public List<PropertyEntry> getPoliciesEntries()
+    {
+        policiesEntries = new ArrayList<PropertyEntry>( getPolicies().size() );
+        for ( Map.Entry<String, String> entry : getPolicies().entrySet() )
+        {
+            policiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
+        }
+        return policiesEntries;
+    }
+
+    public void setPoliciesEntries( List<PropertyEntry> policiesEntries )
+    {
+        for ( PropertyEntry propertyEntry : policiesEntries )
+        {
+            addPolicy( propertyEntry.getKey(), propertyEntry.getValue() );
+        }
+    }
+
+    public List<PropertyEntry> getPropertiesEntries()
+    {
+        propertiesEntries = new ArrayList<PropertyEntry>( getProperties().size() );
+        for ( Map.Entry<String, String> entry : getProperties().entrySet() )
+        {
+            propertiesEntries.add( new PropertyEntry( entry.getKey(), entry.getValue() ) );
+        }
+        return propertiesEntries;
+    }
+
+    public void setPropertiesEntries( List<PropertyEntry> propertiesEntries )
+    {
+        for ( PropertyEntry propertyEntry : policiesEntries )
+        {
+            addProperty( propertyEntry.getKey(), propertyEntry.getValue() );
+        }
+    }
+
     @Override
     public boolean equals( Object o )
     {

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
new file mode 100644 (file)
index 0000000..e218d6d
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
@@ -0,0 +1,79 @@
+package org.apache.archiva.admin.model.beans;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+/**
+ * Bean to expose Map entries as Json
+ *
+ * @author Olivier Lamy
+ * @since 1.4-M3
+ */
+@XmlRootElement( name = "propertyEntry" )
+public class PropertyEntry
+    implements Serializable
+{
+    private String key;
+    
+    private String value;
+
+    public PropertyEntry()
+    {
+        // no op
+    }
+
+    public PropertyEntry( String key, String value )
+    {
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey()
+    {
+        return key;
+    }
+
+    public void setKey( String key )
+    {
+        this.key = key;
+    }
+
+    public String getValue()
+    {
+        return value;
+    }
+
+    public void setValue( String value )
+    {
+        this.value = value;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder();
+        sb.append( "PropertyEntry" );
+        sb.append( "{key='" ).append( key ).append( '\'' );
+        sb.append( ", value='" ).append( value ).append( '\'' );
+        sb.append( '}' );
+        return sb.toString();
+    }
+}