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 2011/09/16 09:11:00 UTC
svn commit: r1171404 -
/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
Author: olamy
Date: Fri Sep 16 07:10:59 2011
New Revision: 1171404
URL: http://svn.apache.org/viewvc?rev=1171404&view=rev
Log:
[MRM-1520] remove duplicate beans : no more need of BeanReplicator in some places
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java?rev=1171404&r1=1171403&r2=1171404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java Fri Sep 16 07:10:59 2011
@@ -18,7 +18,6 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import net.sf.beanlib.provider.replicator.BeanReplicator;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.admin.ArchivaAdministration;
import org.apache.archiva.admin.model.beans.FileType;
@@ -50,13 +49,7 @@ public class DefaultArchivaAdministratio
{
try
{
- List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<LegacyArtifactPath>();
- for ( org.apache.archiva.admin.model.beans.LegacyArtifactPath legacyArtifactPath : archivaAdministration.getLegacyArtifactPaths() )
- {
- legacyArtifactPaths.add(
- new BeanReplicator().replicateBean( legacyArtifactPath, LegacyArtifactPath.class ) );
- }
- return legacyArtifactPaths;
+ return archivaAdministration.getLegacyArtifactPaths();
}
catch ( RepositoryAdminException e )
{
@@ -69,9 +62,7 @@ public class DefaultArchivaAdministratio
{
try
{
- archivaAdministration.addLegacyArtifactPath( new BeanReplicator().replicateBean( legacyArtifactPath,
- org.apache.archiva.admin.model.beans.LegacyArtifactPath.class ),
- getAuditInformation() );
+ archivaAdministration.addLegacyArtifactPath( legacyArtifactPath, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -127,12 +118,7 @@ public class DefaultArchivaAdministratio
{
try
{
- org.apache.archiva.admin.model.beans.FileType fileType = archivaAdministration.getFileType( fileTypeId );
- if ( fileType == null )
- {
- return null;
- }
- return new BeanReplicator().replicateBean( fileType, FileType.class );
+ return archivaAdministration.getFileType( fileTypeId );
}
catch ( RepositoryAdminException e )
{
@@ -145,9 +131,7 @@ public class DefaultArchivaAdministratio
{
try
{
- archivaAdministration.addFileType(
- new BeanReplicator().replicateBean( fileType, org.apache.archiva.admin.model.beans.FileType.class ),
- getAuditInformation() );
+ archivaAdministration.addFileType( fileType, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -256,17 +240,12 @@ public class DefaultArchivaAdministratio
{
try
{
- List<org.apache.archiva.admin.model.beans.FileType> modelfileTypes = archivaAdministration.getFileTypes();
+ List<FileType> modelfileTypes = archivaAdministration.getFileTypes();
if ( modelfileTypes == null || modelfileTypes.isEmpty() )
{
return Collections.emptyList();
}
- List<FileType> fileTypes = new ArrayList<FileType>( modelfileTypes.size() );
- for ( org.apache.archiva.admin.model.beans.FileType fileType : modelfileTypes )
- {
- fileTypes.add( new BeanReplicator().replicateBean( fileType, FileType.class ) );
- }
- return fileTypes;
+ return modelfileTypes;
}
catch ( RepositoryAdminException e )
{
@@ -305,12 +284,7 @@ public class DefaultArchivaAdministratio
{
try
{
- org.apache.archiva.admin.model.beans.OrganisationInformation organisationInformation =
- archivaAdministration.getOrganisationInformation();
-
- return organisationInformation == null
- ? null
- : new BeanReplicator().replicateBean( organisationInformation, OrganisationInformation.class );
+ return archivaAdministration.getOrganisationInformation();
}
catch ( RepositoryAdminException e )
{
@@ -329,9 +303,7 @@ public class DefaultArchivaAdministratio
}
else
{
- archivaAdministration.setOrganisationInformation(
- new BeanReplicator().replicateBean( organisationInformation,
- org.apache.archiva.admin.model.beans.OrganisationInformation.class ) );
+ archivaAdministration.setOrganisationInformation( organisationInformation );
}
}
catch ( RepositoryAdminException e )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java?rev=1171404&r1=1171403&r2=1171404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java Fri Sep 16 07:10:59 2011
@@ -28,7 +28,7 @@ import org.apache.commons.lang.StringUti
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -55,24 +55,7 @@ public class DefaultManagedRepositoriesS
{
List<org.apache.archiva.admin.model.beans.ManagedRepository> repos =
managedRepositoryAdmin.getManagedRepositories();
-
- List<ManagedRepository> managedRepos = new ArrayList<ManagedRepository>( repos.size() );
-
- for ( org.apache.archiva.admin.model.beans.ManagedRepository repoConfig : repos )
- {
- // TODO staging repo too
- ManagedRepository repo =
- new ManagedRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getLocation(),
- repoConfig.getLayout(), repoConfig.isSnapshots(), repoConfig.isReleases(),
- repoConfig.isBlockRedeployments(), repoConfig.getCronExpression(),
- repoConfig.getIndexDirectory(), repoConfig.isScanned(),
- repoConfig.getDaysOlder(), repoConfig.getRetentionCount(),
- repoConfig.isDeleteReleasedSnapshots(), repoConfig.isStageRepoNeeded() );
-
- managedRepos.add( repo );
- }
-
- return managedRepos;
+ return repos == null ? Collections.<ManagedRepository>emptyList() : repos;
}
catch ( RepositoryAdminException e )
{
@@ -113,23 +96,11 @@ public class DefaultManagedRepositoriesS
public Boolean addManagedRepository( ManagedRepository managedRepository )
throws ArchivaRestServiceException
{
- org.apache.archiva.admin.model.beans.ManagedRepository repo =
- new org.apache.archiva.admin.model.beans.ManagedRepository();
- repo.setLocation( managedRepository.getLocation() );
- repo.setBlockRedeployments( managedRepository.isBlockRedeployments() );
- repo.setCronExpression( managedRepository.getCronExpression() );
- repo.setId( managedRepository.getId() );
- repo.setLayout( managedRepository.getLayout() );
- repo.setName( managedRepository.getName() );
- repo.setReleases( managedRepository.isReleases() );
- repo.setSnapshots( managedRepository.isSnapshots() );
- repo.setIndexDirectory( managedRepository.getIndexDirectory() );
- repo.setDaysOlder( managedRepository.getDaysOlder() );
- repo.setDeleteReleasedSnapshots( managedRepository.isDeleteReleasedSnapshots() );
- repo.setRetentionCount( managedRepository.getRetentionCount() );
+
try
{
- return managedRepositoryAdmin.addManagedRepository( repo, managedRepository.isStageRepoNeeded(),
+ return managedRepositoryAdmin.addManagedRepository( managedRepository,
+ managedRepository.isStageRepoNeeded(),
getAuditInformation() );
}
catch ( RepositoryAdminException e )
@@ -142,19 +113,11 @@ public class DefaultManagedRepositoriesS
public Boolean updateManagedRepository( ManagedRepository managedRepository )
throws ArchivaRestServiceException
{
- org.apache.archiva.admin.model.beans.ManagedRepository repo =
- new org.apache.archiva.admin.model.beans.ManagedRepository();
- repo.setLocation( managedRepository.getLocation() );
- repo.setBlockRedeployments( managedRepository.isBlockRedeployments() );
- repo.setCronExpression( managedRepository.getCronExpression() );
- repo.setId( managedRepository.getId() );
- repo.setLayout( managedRepository.getLayout() );
- repo.setName( managedRepository.getName() );
- repo.setReleases( managedRepository.isReleases() );
- repo.setSnapshots( managedRepository.isSnapshots() );
+
try
{
- return managedRepositoryAdmin.updateManagedRepository( repo, managedRepository.isStageRepoNeeded(),
+ return managedRepositoryAdmin.updateManagedRepository( managedRepository,
+ managedRepository.isStageRepoNeeded(),
getAuditInformation(),
managedRepository.isResetStats() );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java?rev=1171404&r1=1171403&r2=1171404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultNetworkProxyService.java Fri Sep 16 07:10:59 2011
@@ -18,7 +18,6 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import net.sf.beanlib.provider.replicator.BeanReplicator;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.NetworkProxy;
import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
@@ -27,7 +26,7 @@ import org.apache.archiva.rest.api.servi
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -46,12 +45,8 @@ public class DefaultNetworkProxyService
{
try
{
- List<NetworkProxy> networkProxies = new ArrayList<NetworkProxy>();
- for ( org.apache.archiva.admin.model.beans.NetworkProxy networkProxy : networkProxyAdmin.getNetworkProxies() )
- {
- networkProxies.add( new BeanReplicator().replicateBean( networkProxy, NetworkProxy.class ) );
- }
- return networkProxies;
+ List<NetworkProxy> networkProxies = networkProxyAdmin.getNetworkProxies();
+ return networkProxies == null ? Collections.<NetworkProxy>emptyList() : networkProxies;
}
catch ( RepositoryAdminException e )
{
@@ -64,9 +59,7 @@ public class DefaultNetworkProxyService
{
try
{
- org.apache.archiva.admin.model.beans.NetworkProxy networkProxy =
- networkProxyAdmin.getNetworkProxy( networkProxyId );
- return networkProxy == null ? null : new BeanReplicator().replicateBean( networkProxy, NetworkProxy.class );
+ return networkProxyAdmin.getNetworkProxy( networkProxyId );
}
catch ( RepositoryAdminException e )
{
@@ -83,9 +76,7 @@ public class DefaultNetworkProxyService
{
return;
}
- getNetworkProxyAdmin().addNetworkProxy( new BeanReplicator().replicateBean( networkProxy,
- org.apache.archiva.admin.model.beans.NetworkProxy.class ),
- getAuditInformation() );
+ getNetworkProxyAdmin().addNetworkProxy( networkProxy, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -102,9 +93,7 @@ public class DefaultNetworkProxyService
}
try
{
- getNetworkProxyAdmin().updateNetworkProxy( new BeanReplicator().replicateBean( networkProxy,
- org.apache.archiva.admin.model.beans.NetworkProxy.class ),
- getAuditInformation() );
+ getNetworkProxyAdmin().updateNetworkProxy( networkProxy, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java?rev=1171404&r1=1171403&r2=1171404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java Fri Sep 16 07:10:59 2011
@@ -18,7 +18,6 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import net.sf.beanlib.provider.replicator.BeanReplicator;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ProxyConnector;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
@@ -27,7 +26,7 @@ import org.apache.archiva.rest.api.servi
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -46,12 +45,8 @@ public class DefaultProxyConnectorServic
{
try
{
- List<ProxyConnector> proxyConnectors = new ArrayList<ProxyConnector>();
- for ( org.apache.archiva.admin.model.beans.ProxyConnector proxyConnector : proxyConnectorAdmin.getProxyConnectors() )
- {
- proxyConnectors.add( new BeanReplicator().replicateBean( proxyConnector, ProxyConnector.class ) );
- }
- return proxyConnectors;
+ List<ProxyConnector> proxyConnectors = proxyConnectorAdmin.getProxyConnectors();
+ return proxyConnectors == null ? Collections.<ProxyConnector>emptyList() : proxyConnectors;
}
catch ( RepositoryAdminException e )
{
@@ -64,11 +59,7 @@ public class DefaultProxyConnectorServic
{
try
{
- org.apache.archiva.admin.model.beans.ProxyConnector proxyConnector =
- proxyConnectorAdmin.getProxyConnector( sourceRepoId, targetRepoId );
- return proxyConnector == null
- ? null
- : new BeanReplicator().replicateBean( proxyConnector, ProxyConnector.class );
+ return proxyConnectorAdmin.getProxyConnector( sourceRepoId, targetRepoId );
}
catch ( RepositoryAdminException e )
{
@@ -85,9 +76,7 @@ public class DefaultProxyConnectorServic
}
try
{
- return proxyConnectorAdmin.addProxyConnector( new BeanReplicator().replicateBean( proxyConnector,
- org.apache.archiva.admin.model.beans.ProxyConnector.class ),
- getAuditInformation() );
+ return proxyConnectorAdmin.addProxyConnector( proxyConnector, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -104,9 +93,7 @@ public class DefaultProxyConnectorServic
}
try
{
- return proxyConnectorAdmin.deleteProxyConnector( new BeanReplicator().replicateBean( proxyConnector,
- org.apache.archiva.admin.model.beans.ProxyConnector.class ),
- getAuditInformation() );
+ return proxyConnectorAdmin.deleteProxyConnector( proxyConnector, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
@@ -123,9 +110,7 @@ public class DefaultProxyConnectorServic
}
try
{
- return proxyConnectorAdmin.updateProxyConnector( new BeanReplicator().replicateBean( proxyConnector,
- org.apache.archiva.admin.model.beans.ProxyConnector.class ),
- getAuditInformation() );
+ return proxyConnectorAdmin.updateProxyConnector( proxyConnector, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java?rev=1171404&r1=1171403&r2=1171404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java Fri Sep 16 07:10:59 2011
@@ -27,7 +27,7 @@ import org.apache.commons.lang.StringUti
import org.springframework.stereotype.Service;
import javax.inject.Inject;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -48,17 +48,8 @@ public class DefaultRemoteRepositoriesSe
{
try
{
- List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>();
- for ( org.apache.archiva.admin.model.beans.RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() )
- {
- RemoteRepository repo = new RemoteRepository( remoteRepository.getId(), remoteRepository.getName(),
- remoteRepository.getUrl(), remoteRepository.getLayout(),
- remoteRepository.getUserName(),
- remoteRepository.getPassword(),
- remoteRepository.getTimeout() );
- remoteRepositories.add( repo );
- }
- return remoteRepositories;
+ List<RemoteRepository> remoteRepositories = remoteRepositoryAdmin.getRemoteRepositories();
+ return remoteRepositories == null ? Collections.<RemoteRepository>emptyList() : remoteRepositories;
}
catch ( RepositoryAdminException e )
{
@@ -89,26 +80,14 @@ public class DefaultRemoteRepositoriesSe
public Boolean addRemoteRepository( RemoteRepository remoteRepository )
throws Exception
{
- return remoteRepositoryAdmin.addRemoteRepository( getModelRemoteRepository( remoteRepository ),
- getAuditInformation() );
+ return remoteRepositoryAdmin.addRemoteRepository( remoteRepository, getAuditInformation() );
}
public Boolean updateRemoteRepository( RemoteRepository remoteRepository )
throws Exception
{
- return remoteRepositoryAdmin.updateRemoteRepository( getModelRemoteRepository( remoteRepository ),
- getAuditInformation() );
+ return remoteRepositoryAdmin.updateRemoteRepository( remoteRepository, getAuditInformation() );
}
- private org.apache.archiva.admin.model.beans.RemoteRepository getModelRemoteRepository(
- RemoteRepository remoteRepository )
- {
- return new org.apache.archiva.admin.model.beans.RemoteRepository( remoteRepository.getId(),
- remoteRepository.getName(),
- remoteRepository.getUrl(),
- remoteRepository.getLayout(),
- remoteRepository.getUserName(),
- remoteRepository.getPassword(),
- remoteRepository.getTimeout() );
- }
+
}