NCL-6600 Remove unused endpoint code. Refactor to prepare sharing sam…

…e task split code for endpoints.
release-engineering · Jun 15, 2021 · d0072cc · d0072cc
1 parent 77a378b
commit d0072cc
Show file tree

Hide file tree

Showing 10 changed files with 210 additions and 442 deletions.
diff --git a/core/src/main/java/org/commonjava/maven/ext/core/impl/RESTCollector.java b/core/src/main/java/org/commonjava/maven/ext/core/impl/RESTCollector.java
@@ -84,7 +84,7 @@ private void collect( final List<Project> projects )
             return;
         }
 
-        final ArrayList<ProjectVersionRef> restLookupProjectVersionParamList = new ArrayList<>();
+        final List<ProjectVersionRef> restLookupProjectVersionParamList = new ArrayList<>();
         final String override = vs.getOverride();
 
         for ( final Project project : projects )
@@ -105,7 +105,6 @@ else if ( project.isExecutionRoot() )
             }
         }
 
-        // TODO: ### Remove newProjectKeys from initial rest call
         final List<ProjectVersionRef> restLookupVersionsParamList = new ArrayList<>();
         final Set<ArtifactRef> localDeps = establishAllDependencies( session, projects, null );
 
@@ -116,11 +115,6 @@ else if ( project.isExecutionRoot() )
             restLookupVersionsParamList.add( p.asProjectVersionRef() );
         }
 
-        // TODO: ### : test to see if this is affecting the tests.
-        //   For Monday: yes, so it means AddSuffixJettyHandler must be expecting the project types to do checks on what to return for deps.
-        //   Solution: depends on how many occurrences .... adapt `setSuffix` to set mixed/custom as desired ?
-        // restLookupVersionsParamList.addAll( restLookupProjectVersionParamList );
-
         // Call the REST to populate the result.
         logger.debug ("Passing {} GAVs into the REST client api {} ", restLookupVersionsParamList.size(), restLookupVersionsParamList);
         Map<ProjectVersionRef, String> vRestResult = state.getVersionTranslator().lookupVersions( restLookupVersionsParamList );
@@ -135,8 +129,6 @@ else if ( project.isExecutionRoot() )
             versions.add( value );
         } );
         vs.setRESTMetadata( versionStates );
-        // TODO: ### parseVersions pulls out project refs from prior rest call.
-        // vs.setRESTMetadata (parseVersions(session, projects, state, restLookupProjectVersionParamList, pvResultResult));
 
         final Map<ArtifactRef, String> overrides = new HashMap<>();
 

diff --git a/integration-test/src/it/rest-blacklist/invoker.properties b/integration-test/src/it/rest-blacklist/invoker.properties
diff --git a/integration-test/src/it/rest-blacklist/pom.xml b/integration-test/src/it/rest-blacklist/pom.xml
diff --git a/integration-test/src/it/rest-blacklist/test.properties b/integration-test/src/it/rest-blacklist/test.properties
diff --git a/integration-test/src/it/rest-blacklist/verify.groovy b/integration-test/src/it/rest-blacklist/verify.groovy
diff --git a/integration-test/src/it/rest-version-manip-only/verify.groovy b/integration-test/src/it/rest-version-manip-only/verify.groovy
@@ -44,5 +44,5 @@ pom.properties.each {
 }
 assert (passed == true)
 
-//def buildLog = new File( basedir, 'build.log' )
-//assert buildLog.getText().contains( 'Passing 6 GAVs' )
+def buildLog = new File( basedir, 'build.log' )
+assert buildLog.getText().contains( 'Passing 6 GAVs' )
diff --git a/...tion-test/src/test/java/org/commonjava/maven/ext/integrationtest/RESTIntegrationTest.java b/...tion-test/src/test/java/org/commonjava/maven/ext/integrationtest/RESTIntegrationTest.java
@@ -15,7 +15,6 @@
  */
 package org.commonjava.maven.ext.integrationtest;
 
-import org.commonjava.maven.ext.common.ManipulationException;
 import org.commonjava.maven.ext.io.rest.handler.AddSuffixJettyHandler;
 import org.commonjava.maven.ext.io.rest.rule.MockServer;
 import org.junit.Before;
@@ -200,35 +199,6 @@ public void testRESTVersionManipRelocate() throws Exception
         runLikeInvoker( test, mockServer.getUrl() );
     }
 
-    @Test(expected = ManipulationException.class)
-    public void testRESTBlacklist() throws Exception
-    {
-        try
-        {
-            handler.setBlacklistVersion( "1.0");
-            String test = getDefaultTestLocation( "rest-blacklist" );
-            runLikeInvoker( test, mockServer.getUrl() );
-        }
-        finally
-        {
-            handler.setBlacklistVersion( null);
-        }
-    }
-
-    @Test
-    public void testRESTBlacklist2() throws Exception
-    {
-        try
-        {
-            handler.setBlacklistVersion( "1.0.redhat-3");
-            String test = getDefaultTestLocation( "rest-blacklist" );
-            runLikeInvoker( test, mockServer.getUrl() );
-        }
-        finally
-        {
-            handler.setBlacklistVersion( null);
-        }
-    }
 
     @Test
     public void testRESTHeaders() throws Exception