Use constants

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
sonatype · Oct 30, 2012 · b9ffa50 · b9ffa50
1 parent d98a61d
commit b9ffa50
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 19 deletions.
diff --git a/...onatype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyGroupRepository.java b/...onatype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyGroupRepository.java
@@ -27,6 +27,10 @@ public class JerseyGroupRepository<T extends GroupRepository>
     implements GroupRepository<T>
 {
 
+    static final String REPO_TYPE = "group";
+
+    static final String PROVIDER_ROLE = "org.sonatype.nexus.proxy.repository.GroupRepository";
+
     public JerseyGroupRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -42,8 +46,8 @@ protected RepositoryGroupResource createSettings()
     {
         final RepositoryGroupResource settings = new RepositoryGroupResource();
 
-        settings.setRepoType( "group" );
-        settings.setProviderRole( "org.sonatype.nexus.proxy.repository.GroupRepository" );
+        settings.setRepoType( REPO_TYPE );
+        settings.setProviderRole( PROVIDER_ROLE );
         settings.setExposed( true );
 
         return settings;

diff --git a/.../nexus/client/internal/rest/jersey/subsystem/repository/JerseyGroupRepositoryFactory.java b/.../nexus/client/internal/rest/jersey/subsystem/repository/JerseyGroupRepositoryFactory.java
@@ -39,6 +39,10 @@ public int canAdapt( final RepositoryBaseResource resource )
         {
             score++;
         }
+        if ( JerseyGroupRepository.REPO_TYPE.equals( resource.getRepoType() ) )
+        {
+            score++;
+        }
         return score;
     }
 

diff --git a/...natype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyHostedRepository.java b/...natype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyHostedRepository.java
@@ -25,6 +25,10 @@ public class JerseyHostedRepository<T extends HostedRepository>
     implements HostedRepository<T>
 {
 
+    static final String REPO_TYPE = "hosted";
+
+    static final String PROVIDER_ROLE = "org.sonatype.nexus.proxy.repository.Repository";
+
     public JerseyHostedRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -40,8 +44,8 @@ protected RepositoryResource createSettings()
     {
         final RepositoryResource settings = new RepositoryResource();
 
-        settings.setRepoType( "hosted" );
-        settings.setProviderRole( "org.sonatype.nexus.proxy.repository.Repository" );
+        settings.setRepoType( REPO_TYPE );
+        settings.setProviderRole( PROVIDER_ROLE );
         settings.setExposed( true );
         settings.setWritePolicy( "ALLOW_WRITE_ONCE" );
         settings.setBrowseable( true );

diff --git a/...nexus/client/internal/rest/jersey/subsystem/repository/JerseyHostedRepositoryFactory.java b/...nexus/client/internal/rest/jersey/subsystem/repository/JerseyHostedRepositoryFactory.java
@@ -39,7 +39,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         {
             score++;
         }
-        if ( "hosted".equals( resource.getRepoType() ) )
+        if ( JerseyHostedRepository.REPO_TYPE.equals( resource.getRepoType() ) )
         {
             score++;
         }

diff --git a/...onatype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyProxyRepository.java b/...onatype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyProxyRepository.java
@@ -27,6 +27,10 @@ public class JerseyProxyRepository<T extends ProxyRepository>
     implements ProxyRepository<T>
 {
 
+    static final String REPO_TYPE = "proxy";
+
+    static final String PROVIDER_ROLE = "org.sonatype.nexus.proxy.repository.Repository";
+
     public JerseyProxyRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -42,8 +46,8 @@ protected RepositoryProxyResource createSettings()
     {
         final RepositoryProxyResource settings = new RepositoryProxyResource();
 
-        settings.setRepoType( "proxy" );
-        settings.setProviderRole( "org.sonatype.nexus.proxy.repository.Repository" );
+        settings.setRepoType( REPO_TYPE );
+        settings.setProviderRole( PROVIDER_ROLE );
         settings.setExposed( true );
         settings.setWritePolicy( "READ_ONLY" );
         settings.setBrowseable( true );

diff --git a/.../nexus/client/internal/rest/jersey/subsystem/repository/JerseyProxyRepositoryFactory.java b/.../nexus/client/internal/rest/jersey/subsystem/repository/JerseyProxyRepositoryFactory.java
@@ -39,7 +39,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         {
             score++;
         }
-        if ( "proxy".equals( resource.getRepoType() ) )
+        if ( JerseyProxyRepository.REPO_TYPE.equals( resource.getRepoType() ) )
         {
             score++;
         }

diff --git a/...natype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyShadowRepository.java b/...natype/nexus/client/internal/rest/jersey/subsystem/repository/JerseyShadowRepository.java
@@ -25,6 +25,10 @@ public class JerseyShadowRepository<T extends ShadowRepository>
     implements ShadowRepository<T>
 {
 
+    static final String REPO_TYPE = "virtual";
+
+    static final String PROVIDER_ROLE = "org.sonatype.nexus.proxy.repository.ShadowRepository";
+
     public JerseyShadowRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -40,8 +44,8 @@ protected RepositoryShadowResource createSettings()
     {
         final RepositoryShadowResource settings = new RepositoryShadowResource();
 
-        settings.setRepoType( "virtual" );
-        settings.setProviderRole( "org.sonatype.nexus.proxy.repository.ShadowRepository" );
+        settings.setRepoType( REPO_TYPE );
+        settings.setProviderRole( PROVIDER_ROLE );
         settings.setExposed( true );
 
         return settings;

diff --git a/...nexus/client/internal/rest/jersey/subsystem/repository/JerseyShadowRepositoryFactory.java b/...nexus/client/internal/rest/jersey/subsystem/repository/JerseyShadowRepositoryFactory.java
@@ -39,7 +39,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         {
             score++;
         }
-        if ( "virtual".equals( resource.getRepoType() ) )
+        if ( JerseyShadowRepository.REPO_TYPE.equals( resource.getRepoType() ) )
         {
             score++;
         }

diff --git a/...us/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenGroupRepository.java b/...us/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenGroupRepository.java
@@ -22,6 +22,8 @@ public class JerseyMavenGroupRepository
     implements MavenGroupRepository
 {
 
+    static final String PROVIDER = "maven2";
+
     public JerseyMavenGroupRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -37,7 +39,7 @@ protected RepositoryGroupResource createSettings()
     {
         final RepositoryGroupResource settings = super.createSettings();
 
-        settings.setProvider( "maven2" );
+        settings.setProvider( PROVIDER );
 
         return settings;
     }

diff --git a/...nt/internal/rest/jersey/subsystem/repository/maven/JerseyMavenGroupRepositoryFactory.java b/...nt/internal/rest/jersey/subsystem/repository/maven/JerseyMavenGroupRepositoryFactory.java
@@ -34,7 +34,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         int score = super.canAdapt( resource );
         if ( score > 0 )
         {
-            if ( "maven2".equals( resource.getProvider() ) )
+            if ( JerseyMavenGroupRepository.PROVIDER.equals( resource.getProvider() ) )
             {
                 score++;
             }

diff --git a/...s/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenHostedRepository.java b/...s/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenHostedRepository.java
@@ -22,6 +22,8 @@ public class JerseyMavenHostedRepository
     implements MavenHostedRepository
 {
 
+    static final String PROVIDER = "maven2";
+
     public JerseyMavenHostedRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -37,7 +39,7 @@ protected RepositoryResource createSettings()
     {
         final RepositoryResource settings = super.createSettings();
 
-        settings.setProvider( "maven2" );
+        settings.setProvider( PROVIDER );
         settings.setIndexable( true );
         settings.setRepoPolicy( "RELEASE" );
 

diff --git a/...t/internal/rest/jersey/subsystem/repository/maven/JerseyMavenHostedRepositoryFactory.java b/...t/internal/rest/jersey/subsystem/repository/maven/JerseyMavenHostedRepositoryFactory.java
@@ -34,7 +34,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         int score = super.canAdapt( resource );
         if ( score > 0 )
         {
-            if ( "maven2".equals( resource.getProvider() ) )
+            if ( JerseyMavenHostedRepository.PROVIDER.equals( resource.getProvider() ) )
             {
                 score++;
             }

diff --git a/...us/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenProxyRepository.java b/...us/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenProxyRepository.java
@@ -22,6 +22,8 @@ public class JerseyMavenProxyRepository
     implements MavenProxyRepository
 {
 
+    static final String PROVIDER = "maven2";
+
     public JerseyMavenProxyRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -37,7 +39,7 @@ protected RepositoryProxyResource createSettings()
     {
         final RepositoryProxyResource settings = super.createSettings();
 
-        settings.setProvider( "maven2" );
+        settings.setProvider( PROVIDER );
         settings.setIndexable( true );
         settings.setRepoPolicy( "RELEASE" );
 

diff --git a/...nt/internal/rest/jersey/subsystem/repository/maven/JerseyMavenProxyRepositoryFactory.java b/...nt/internal/rest/jersey/subsystem/repository/maven/JerseyMavenProxyRepositoryFactory.java
@@ -34,7 +34,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         int score = super.canAdapt( resource );
         if ( score > 0 )
         {
-            if ( "maven2".equals( resource.getProvider() ) )
+            if ( JerseyMavenProxyRepository.PROVIDER.equals( resource.getProvider() ) )
             {
                 score++;
             }

diff --git a/...s/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenShadowRepository.java b/...s/client/internal/rest/jersey/subsystem/repository/maven/JerseyMavenShadowRepository.java
@@ -22,6 +22,8 @@ public class JerseyMavenShadowRepository
     implements MavenShadowRepository
 {
 
+    static final String PROVIDER = "m2-m1-shadow";
+
     public JerseyMavenShadowRepository( final JerseyNexusClient nexusClient, final String id )
     {
         super( nexusClient, id );
@@ -37,7 +39,7 @@ protected RepositoryShadowResource createSettings()
     {
         final RepositoryShadowResource settings = super.createSettings();
 
-        settings.setProvider( "m2-m1-shadow" );
+        settings.setProvider( PROVIDER );
 
         return settings;
     }

diff --git a/...t/internal/rest/jersey/subsystem/repository/maven/JerseyMavenShadowRepositoryFactory.java b/...t/internal/rest/jersey/subsystem/repository/maven/JerseyMavenShadowRepositoryFactory.java
@@ -34,7 +34,7 @@ public int canAdapt( final RepositoryBaseResource resource )
         int score = super.canAdapt( resource );
         if ( score > 0 )
         {
-            if ( "m2-m1-shadow".equals( resource.getProvider() ) )
+            if ( JerseyMavenShadowRepository.PROVIDER.equals( resource.getProvider() ) )
             {
                 score++;
             }