[MRM-1506] api to configure RemoteRepository : move common attributes in an AbstractRepository class

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

archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/AbstractRepository.java

@@ -0,0 +1,116 @@
+package org.apache.archiva.admin.repository;
+/*
+ * 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 java.io.Serializable;
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4
+ */
+public class AbstractRepository
+    implements Serializable
+{
+
+    private String id;
+
+    private String name;
+
+    private String layout = "default";
+
+    public AbstractRepository()
+    {
+        // no op
+    }
+
+    public AbstractRepository( String id, String name, String layout )
+    {
+        this.id = id;
+        this.name = name;
+        this.layout = layout;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+
+    public String getLayout()
+    {
+        return layout;
+    }
+
+    public void setLayout( String layout )
+    {
+        this.layout = layout;
+    }
+
+
+    public int hashCode()
+    {
+        int result = 17;
+        result = 37 * result + ( id != null ? id.hashCode() : 0 );
+        return result;
+    }
+
+    public boolean equals( Object other )
+    {
+        if ( this == other )
+        {
+            return true;
+        }
+
+        if ( !( other instanceof AbstractRepository ) )
+        {
+            return false;
+        }
+
+        AbstractRepository that = (AbstractRepository) other;
+        boolean result = true;
+        result = result && ( getId() == null ? that.getId() == null : getId().equals( that.getId() ) );
+        return result;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder();
+        sb.append( "AbstractRepository" );
+        sb.append( "{id='" ).append( id ).append( '\'' );
+        sb.append( ", name='" ).append( name ).append( '\'' );
+        sb.append( ", layout='" ).append( layout ).append( '\'' );
+        sb.append( '}' );
+        return sb.toString();
+    }
+}

archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/managed/ManagedRepository.java

@@ -19,22 +19,21 @@ package org.apache.archiva.admin.repository.managed;
  * under the License.
  */
 
+import org.apache.archiva.admin.repository.AbstractRepository;
+
 import java.io.Serializable;
 
 /**
+ * @author Olivier Lamy
  * @since 1.4
  */
 public class ManagedRepository
+    extends AbstractRepository
     implements Serializable
 {
-    private String id;
-
-    private String name;
 
     private String location;
 
-    private String layout = "default";
-
     private boolean snapshots = false;
 
     private boolean releases = true;
@@ -77,10 +76,9 @@ public class ManagedRepository
                               boolean releases, boolean blockRedeployments, String cronExpression, String indexDir,
                               boolean scanned, int daysOlder, int retentionCount, boolean deleteReleasedSnapshots )
     {
-        this.id = id;
+        super(id, name, layout);
-        this.name = name;
+
         this.location = location;
-        this.layout = layout;
         this.snapshots = snapshots;
         this.releases = releases;
         this.blockRedeployments = blockRedeployments;
@@ -92,21 +90,6 @@ public class ManagedRepository
         this.deleteReleasedSnapshots = deleteReleasedSnapshots;
     }
 
-    public String getId()
-    {
-        return this.id;
-    }
-
-    public String getLayout()
-    {
-        return this.layout;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
     public String getLocation()
     {
         return this.location;
@@ -126,20 +109,6 @@ public class ManagedRepository
         return this.snapshots;
     }
 
-    public void setId( String id )
-    {
-        this.id = id;
-    }
-
-    public void setLayout( String layout )
-    {
-        this.layout = layout;
-    }
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
 
     public void setReleases( boolean releases )
     {
@@ -237,40 +206,13 @@ public class ManagedRepository
         this.deleteReleasedSnapshots = deleteReleasedSnapshots;
     }
 
-    public int hashCode()
-    {
-        int result = 17;
-        result = 37 * result + ( id != null ? id.hashCode() : 0 );
-        return result;
-    }
-
-    public boolean equals( Object other )
-    {
-        if ( this == other )
-        {
-            return true;
-        }
-
-        if ( !( other instanceof ManagedRepository ) )
-        {
-            return false;
-        }
-
-        ManagedRepository that = (ManagedRepository) other;
-        boolean result = true;
-        result = result && ( getId() == null ? that.getId() == null : getId().equals( that.getId() ) );
-        return result;
-    }
 
     @Override
     public String toString()
     {
         final StringBuilder sb = new StringBuilder();
         sb.append( "ManagedRepository" );
-        sb.append( "{id='" ).append( id ).append( '\'' );
+        sb.append( "{location='" ).append( location ).append( '\'' );
-        sb.append( ", name='" ).append( name ).append( '\'' );
-        sb.append( ", location='" ).append( location ).append( '\'' );
-        sb.append( ", layout='" ).append( layout ).append( '\'' );
         sb.append( ", snapshots=" ).append( snapshots );
         sb.append( ", releases=" ).append( releases );
         sb.append( ", blockRedeployments=" ).append( blockRedeployments );
@@ -278,7 +220,11 @@ public class ManagedRepository
         sb.append( ", stagingRepository=" ).append( stagingRepository );
         sb.append( ", scanned=" ).append( scanned );
         sb.append( ", indexDirectory='" ).append( indexDirectory ).append( '\'' );
+        sb.append( ", daysOlder=" ).append( daysOlder );
+        sb.append( ", retentionCount=" ).append( retentionCount );
+        sb.append( ", deleteReleasedSnapshots=" ).append( deleteReleasedSnapshots );
         sb.append( '}' );
+        sb.append( super.toString() );
         return sb.toString();
     }
 

archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/remote/RemoteRepository.java

@@ -19,105 +19,41 @@ package org.apache.archiva.admin.repository.remote;
  * under the License.
  */
 
+import org.apache.archiva.admin.repository.AbstractRepository;
+
 import java.io.Serializable;
 
-
+/**
+ * @author Olivier Lamy
+ * @since 1.4
+ */
 public class RemoteRepository
+    extends AbstractRepository
     implements Serializable
 {
-    private String id;
 
-    private String name;
+    private String location;
-
-    private String url;
-
-    private String layout;
 
     public RemoteRepository()
     {
         // no op
     }
 
-    public RemoteRepository( String id, String name, String url, String layout )
+    public RemoteRepository( String id, String name, String location, String layout )
     {
-        this.id = id;
+        super( id, name, layout );
-        this.name = name;
+        this.location = location;
-        this.url = url;
-        this.layout = layout;
     }
 
 
-    public String getId()
-    {
-        return this.id;
-    }
-
-    public String getLayout()
-    {
-        return this.layout;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
-    public String getUrl()
-    {
-        return this.url;
-    }
-
-
-    public void setId( String id )
-    {
-        this.id = id;
-    }
-
-    public void setLayout( String layout )
-    {
-        this.layout = layout;
-    }
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    public void setUrl( String url )
-    {
-        this.url = url;
-    }
-
-
-    public int hashCode()
-    {
-        int result = 17;
-        result = 37 * result + ( id != null ? id.hashCode() : 0 );
-        return result;
-    }
-
-    public boolean equals( Object other )
-    {
-        if ( this == other )
-        {
-            return true;
-        }
-
-        if ( !( other instanceof RemoteRepository ) )
-        {
-            return false;
-        }
-
-        RemoteRepository that = (RemoteRepository) other;
-        boolean result = true;
-        result = result && ( getId() == null ? that.getId() == null : getId().equals( that.getId() ) );
-        return result;
-    }
-
     @Override
     public String toString()
     {
-        return "RemoteRepository{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", url='" + url + '\''
+        final StringBuilder sb = new StringBuilder();
-            + ", layout='" + layout + '\'' + '}';
+        sb.append( "RemoteRepository" );
+        sb.append( "{location='" ).append( location ).append( '\'' );
+        sb.append( '}' );
+        sb.append( super.toString() );
+        return sb.toString();
     }
 }