You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/10 00:08:28 UTC
svn commit: r1242597 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model:
AbstractRepositoryConnector.java beans/PropertyEntry.java
Author: olamy
Date: Thu Feb 9 23:08:27 2012
New Revision: 1242597
URL: http://svn.apache.org/viewvc?rev=1242597&view=rev
Log:
add convenient getter/setter to ease json mapping for Map fields.
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java (with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java?rev=1242597&r1=1242596&r2=1242597&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java Thu Feb 9 23:08:27 2012
@@ -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;
@@ -62,11 +64,25 @@ public abstract class AbstractRepository
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
*/
private boolean disabled = false;
@@ -347,6 +363,42 @@ public abstract class AbstractRepository
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 )
{
Added: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java?rev=1242597&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java Thu Feb 9 23:08:27 2012
@@ -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();
+ }
+}
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/PropertyEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision