Author: olamy
Date: Wed Sep 7 21:49:33 2011
New Revision: 1166428
URL: http://svn.apache.org/viewvc?rev=1166428&view=rev
Log:
[MRM-1490] REST services : proxyconnector service : add simple unit test
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ProxyConnectorServiceTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.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/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java?rev=1166428&r1=1166427&r2=1166428&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
Wed Sep 7 21:49:33 2011
@@ -31,7 +31,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import java.util.List;
-import java.util.Map;
/**
* <b>No update method for changing source and target here as id is :
sourceRepoId and targetRepoId, use delete then add.</b>
@@ -53,7 +52,8 @@ public interface ProxyConnectorService
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
- ProxyConnector getProxyConnector( @QueryParam( "sourceRepoId" ) String
sourceRepoId, @QueryParam( "targetRepoId" ) String targetRepoId )
+ ProxyConnector getProxyConnector( @QueryParam( "sourceRepoId" ) String
sourceRepoId,
+ @QueryParam( "targetRepoId" ) String
targetRepoId )
throws RepositoryAdminException;
@Path( "addProxyConnector" )
@@ -89,11 +89,4 @@ public interface ProxyConnectorService
throws RepositoryAdminException;
- @Path( "getProxyConnectorAsMap" )
- @GET
- @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
- @RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
- Map<String, List<ProxyConnector>> getProxyConnectorAsMap()
- throws RepositoryAdminException;
-
}
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=1166428&r1=1166427&r2=1166428&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
Wed Sep 7 21:49:33 2011
@@ -100,29 +100,6 @@ public class DefaultProxyConnectorServic
getAuditInformation()
);
}
- public Map<String, List<ProxyConnector>> getProxyConnectorAsMap()
- throws RepositoryAdminException
- {
- Map<String,
List<org.apache.archiva.admin.repository.proxyconnector.ProxyConnector>>
modelMap =
- proxyConnectorAdmin.getProxyConnectorAsMap();
- if ( modelMap == null || modelMap.isEmpty() )
- {
- return Collections.emptyMap();
- }
- Map<String, List<ProxyConnector>> map = new HashMap<String,
List<ProxyConnector>>( modelMap.size() );
- for ( Map.Entry<String,
List<org.apache.archiva.admin.repository.proxyconnector.ProxyConnector>> entry
: modelMap.entrySet() )
- {
- List<ProxyConnector> proxyConnectors = new
ArrayList<ProxyConnector>( entry.getValue().size() );
- for (
org.apache.archiva.admin.repository.proxyconnector.ProxyConnector
proxyConnector : entry.getValue() )
- {
- proxyConnectors.add( new BeanReplicator().replicateBean(
proxyConnector, ProxyConnector.class ) );
- }
- map.put( entry.getKey(), proxyConnectors );
- }
- return map;
- }
-
-
public ProxyConnectorAdmin getProxyConnectorAdmin()
{
return proxyConnectorAdmin;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1166428&r1=1166427&r2=1166428&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Wed Sep 7 21:49:33 2011
@@ -22,10 +22,12 @@ package org.apache.archiva.rest.services
import org.apache.archiva.rest.api.model.ManagedRepository;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
import org.apache.archiva.rest.api.services.PingService;
+import org.apache.archiva.rest.api.services.ProxyConnectorService;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
import org.apache.archiva.rest.api.services.RepositoriesService;
import org.apache.archiva.rest.api.services.RepositoryGroupService;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.maven.archiva.common.utils.FileUtil;
import org.codehaus.redback.rest.services.AbstractRestServicesTest;
@@ -80,6 +82,17 @@ public abstract class AbstractArchivaRes
RepositoryGroupService.class );
}
+ protected ProxyConnectorService getProxyConnectorService()
+ {
+ ProxyConnectorService service =
+ JAXRSClientFactory.create( "http://localhost:"; + port +
"/services/archivaServices/",
+ ProxyConnectorService.class );
+
+ WebClient.client( service ).header( "Authorization",
authorizationHeader );
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
+ return service;
+ }
+
protected ManagedRepository getTestManagedRepository()
{
String location = new File( FileUtil.getBasedir(), "target/test-repo"
).getAbsolutePath();
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ProxyConnectorServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ProxyConnectorServiceTest.java?rev=1166428&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ProxyConnectorServiceTest.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ProxyConnectorServiceTest.java
Wed Sep 7 21:49:33 2011
@@ -0,0 +1,39 @@
+package org.apache.archiva.rest.services;
+/*
+ * 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 org.junit.Test;
+
+/**
+ * @author Olivier Lamy
+ */
+public class ProxyConnectorServiceTest
+ extends AbstractArchivaRestTest
+{
+
+ @Test
+ public void getAllproxyConnectors()
+ throws Exception
+ {
+ assertTrue( getProxyConnectorService().getProxyConnectors() != null );
+ assertTrue( getProxyConnectorService().getProxyConnectors().size() > 0
);
+
+ }
+
+}
