Renamed ResolvedComponentArtifactsResult -> ComponentArtifactsResult

subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy

@@ -142,7 +142,7 @@ task $taskName << {
     // Check generic component result
     def componentResult = result.components.iterator().next()
     assert componentResult.id.displayName == "${id.displayName}"
-    assert componentResult instanceof ResolvedComponentArtifactsResult
+    assert componentResult instanceof ComponentArtifactsResult
 
     ${checkComponentResultArtifacts("componentResult", "sources", expectedSources, expectedSourceFailure)}
     ${checkComponentResultArtifacts("componentResult", "javadoc", expectedJavadoc, expectedJavadocFailure)}

subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQuery.java

@@ -21,8 +21,8 @@
 import org.gradle.api.artifacts.query.ArtifactResolutionQuery;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.artifacts.result.ArtifactResolutionResult;
+import org.gradle.api.artifacts.result.ComponentArtifactsResult;
 import org.gradle.api.artifacts.result.ComponentResult;
-import org.gradle.api.artifacts.result.ResolvedComponentArtifactsResult;
 import org.gradle.api.component.Artifact;
 import org.gradle.api.component.Component;
 import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
@@ -120,18 +120,18 @@ public ArtifactResolutionResult create() {
         });
     }
 
-    private ResolvedComponentArtifactsResult buildComponentResult(ModuleComponentIdentifier moduleComponentId, RepositoryChain repositoryChain, ArtifactResolver artifactResolver) {
+    private ComponentArtifactsResult buildComponentResult(ModuleComponentIdentifier moduleComponentId, RepositoryChain repositoryChain, ArtifactResolver artifactResolver) {
         BuildableComponentResolveResult moduleResolveResult = new DefaultBuildableComponentResolveResult();
         repositoryChain.getDependencyResolver().resolve(new DefaultDependencyMetaData(moduleComponentId, true), moduleResolveResult);
         ComponentMetaData component = moduleResolveResult.getMetaData();
-        DefaultResolvedComponentArtifactsResult componentResult = new DefaultResolvedComponentArtifactsResult(component.getComponentId());
+        DefaultComponentArtifactsResult componentResult = new DefaultComponentArtifactsResult(component.getComponentId());
         for (Class<? extends Artifact> artifactType : artifactTypes) {
             addArtifacts(componentResult, artifactType, component, artifactResolver);
         }
         return componentResult;
     }
 
-    private <T extends Artifact> void addArtifacts(DefaultResolvedComponentArtifactsResult artifacts, Class<T> type, ComponentMetaData component, ArtifactResolver artifactResolver) {
+    private <T extends Artifact> void addArtifacts(DefaultComponentArtifactsResult artifacts, Class<T> type, ComponentMetaData component, ArtifactResolver artifactResolver) {
         BuildableArtifactSetResolveResult artifactSetResolveResult = new DefaultBuildableArtifactSetResolveResult();
         artifactResolver.resolveModuleArtifacts(component, convertType(type), artifactSetResolveResult);
 

subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultArtifactResolutionResult.java

@@ -17,8 +17,8 @@
 
 import com.google.common.collect.Sets;
 import org.gradle.api.artifacts.result.ArtifactResolutionResult;
+import org.gradle.api.artifacts.result.ComponentArtifactsResult;
 import org.gradle.api.artifacts.result.ComponentResult;
-import org.gradle.api.artifacts.result.ResolvedComponentArtifactsResult;
 
 import java.util.Set;
 
@@ -34,11 +34,11 @@ public Set<ComponentResult> getComponents() {
         return componentResults;
     }
 
-    public Set<ResolvedComponentArtifactsResult> getResolvedComponents() {
-        Set<ResolvedComponentArtifactsResult> resolvedComponentResults = Sets.newLinkedHashSet();
+    public Set<ComponentArtifactsResult> getResolvedComponents() {
+        Set<ComponentArtifactsResult> resolvedComponentResults = Sets.newLinkedHashSet();
         for (ComponentResult componentResult : componentResults) {
-            if (componentResult instanceof ResolvedComponentArtifactsResult) {
-                resolvedComponentResults.add((ResolvedComponentArtifactsResult) componentResult);
+            if (componentResult instanceof ComponentArtifactsResult) {
+                resolvedComponentResults.add((ComponentArtifactsResult) componentResult);
             }
         }
         return resolvedComponentResults;

subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResult.java → subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultComponentArtifactsResult.java

@@ -17,17 +17,17 @@
 
 import com.google.common.collect.Sets;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.result.ComponentArtifactsResult;
 import org.gradle.api.component.Artifact;
 import org.gradle.api.artifacts.result.ArtifactResult;
-import org.gradle.api.artifacts.result.ResolvedComponentArtifactsResult;
 
 import java.util.Set;
 
-public class DefaultResolvedComponentArtifactsResult implements ResolvedComponentArtifactsResult {
+public class DefaultComponentArtifactsResult implements ComponentArtifactsResult {
     private final ComponentIdentifier componentIdentifier;
     private final Set<ArtifactResult> artifactResults = Sets.newHashSet();
 
-    public DefaultResolvedComponentArtifactsResult(ComponentIdentifier componentIdentifier) {
+    public DefaultComponentArtifactsResult(ComponentIdentifier componentIdentifier) {
         this.componentIdentifier = componentIdentifier;
     }
 

subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResultTest.groovy → subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultComponentArtifactsResultTest.groovy

@@ -20,9 +20,9 @@ import org.gradle.api.artifacts.result.ArtifactResult
 import org.gradle.api.component.Artifact
 import spock.lang.Specification
 
-class DefaultResolvedComponentArtifactsResultTest extends Specification {
+class DefaultComponentArtifactsResultTest extends Specification {
     def id = Mock(ComponentIdentifier)
-    def result = new DefaultResolvedComponentArtifactsResult(id)
+    def result = new DefaultComponentArtifactsResult(id)
 
     def "returns artifacts matching type"() {
         given:

subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResolutionResult.java

@@ -33,7 +33,7 @@ public interface ArtifactResolutionResult {
      *    However each element in the result will also implement one of the following interfaces:</p>
      *
      * <ul>
-     *     <li>{@link org.gradle.api.artifacts.result.ResolvedComponentArtifactsResult} for any component whose ID could be resolved in the set of repositories.</li>
+     *     <li>{@link ComponentArtifactsResult} for any component whose ID could be resolved in the set of repositories.</li>
      *     <li>{@link org.gradle.api.artifacts.result.UnresolvedComponentResult} for any component whose ID could not be resolved from the set of repositories.</li>
      * </ul>
      * @return the set of results for all requested components
@@ -43,8 +43,8 @@ public interface ArtifactResolutionResult {
     /**
      * <p>Return a set of ComponentResults representing all successfully resolved components.
      *
-     * <p>Calling this method is the same as calling {@link #getComponents()} and filtering the resulting set for elements of type {@link ResolvedComponentArtifactsResult}.
+     * <p>Calling this method is the same as calling {@link #getComponents()} and filtering the resulting set for elements of type {@link ComponentArtifactsResult}.
      * @return the set of all successfully resolved components
      */
-    Set<ResolvedComponentArtifactsResult> getResolvedComponents();
+    Set<ComponentArtifactsResult> getResolvedComponents();
 }

subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedComponentArtifactsResult.java → subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentArtifactsResult.java

@@ -26,8 +26,7 @@
  * @since 2.0
  */
 @Incubating
-// TODO:DAZ Rename to ComponentArtifactsResult
-public interface ResolvedComponentArtifactsResult extends ComponentResult {
+public interface ComponentArtifactsResult extends ComponentResult {
     /**
      * <p>Returns the component artifacts of the specified type. Includes resolved and unresolved artifacts (if any).
      *