]> source.dussan.org Git - archiva.git/commitdiff
fix ugly method name
authorOlivier Lamy <olamy@apache.org>
Wed, 19 Dec 2012 22:39:03 +0000 (22:39 +0000)
committerOlivier Lamy <olamy@apache.org>
Wed, 19 Dec 2012 22:39:03 +0000 (22:39 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1424188 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRuntimeConfigurationService.java
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaRuntimeConfigurationServiceTest.java
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java

index 68779f5edfcff91ff00ce05e9ca0fac375e6e989..5a97f04a87e3a1abe413eac88586c5fb5ed7c123 100644 (file)
@@ -44,7 +44,7 @@ public interface ArchivaRuntimeConfigurationService
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @RedbackAuthorization(permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION)
-    RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin()
+    RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
         throws ArchivaRestServiceException;
 
     @Path("redbackRuntimeConfiguration")
index e949e02819e7b723d979a3e7993f54e29cac5815..b62d59b35fcbbc86edd3b2841bac4b9710450043 100644 (file)
@@ -71,7 +71,7 @@ public class DefaultArchivaRuntimeConfigurationService
     @Named(value = "ldapConnectionFactory#configurable")
     private LdapConnectionFactory ldapConnectionFactory;
 
-    public RedbackRuntimeConfiguration getRedbackRuntimeConfigurationAdmin()
+    public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
         throws ArchivaRestServiceException
     {
         try
index a170ed57e4d955c502937f0469e0e43d8faa9196..12034c7cc90a552caaa04b5292d4ed3b670c39b7 100644 (file)
@@ -38,7 +38,7 @@ public class ArchivaRuntimeConfigurationServiceTest
         throws Exception
     {
         RedbackRuntimeConfiguration redbackRuntimeConfiguration =
-            getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
+            getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration();
         assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
     }
 
@@ -47,14 +47,14 @@ public class ArchivaRuntimeConfigurationServiceTest
         throws Exception
     {
         RedbackRuntimeConfiguration redbackRuntimeConfiguration =
-            getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
+            getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration();
         assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
 
         redbackRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" ) );
 
         getArchivaRuntimeConfigurationService().updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration );
 
-        redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getRedbackRuntimeConfigurationAdmin();
+        redbackRuntimeConfiguration = getArchivaRuntimeConfigurationService().getRedbackRuntimeConfiguration();
         assertEquals( "foo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) );
 
     }
index e61297b772cf40aeb6d8416636cb91f3f2436f8a..5ea7b915f77acc8497f706b935b24393ced3ca64 100644 (file)
@@ -72,7 +72,7 @@ public class DefaultRuntimeInfoService
         applicationRuntimeInfo.setTimestampStr( sfd.format( new Date( archivaRuntimeInfo.getTimestamp() ) ) );
 
         applicationRuntimeInfo.setRedbackRuntimeConfiguration(
-            archivaRuntimeConfigurationService.getRedbackRuntimeConfigurationAdmin() );
+            archivaRuntimeConfigurationService.getRedbackRuntimeConfiguration() );
 
         return applicationRuntimeInfo;
     }