http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java index 9765c73..d4c64f0 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java @@ -28,6 +28,10 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.repository.Proxy; +/** + * Abstraction of an artifact repository. Artifact repositories can be remote, local, or even build reactor or + * IDE workspace. + */ //TODO completely separate local and remote artifact repositories public class MavenArtifactRepository implements ArtifactRepository
http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java index 35626e5..0caeeb5 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java @@ -25,6 +25,9 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.RepositoryRequest; +/** + * RepositoryMetadataManager + */ public interface RepositoryMetadataManager { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java index cd824c4..a156871 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java @@ -32,6 +32,9 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; +/** + * ResolutionNode + */ public class ResolutionNode { private Artifact artifact; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 9331710..84ad93c 100644 --- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -76,13 +76,13 @@ public class MavenRepositorySystem // DefaultProjectBuilder public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type ) { - return XcreateArtifact( groupId, artifactId, version, scope, type ); + return createArtifactX( groupId, artifactId, version, scope, type ); } // DefaultProjectBuilder public Artifact createProjectArtifact( String groupId, String artifactId, String metaVersionId ) { - return XcreateProjectArtifact( groupId, artifactId, metaVersionId ); + return createProjectArtifactX( groupId, artifactId, metaVersionId ); } // DefaultProjectBuilder @@ -104,7 +104,7 @@ public class MavenRepositorySystem } Artifact artifact = - XcreateDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), + createDependencyArtifactX( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), d.getClassifier(), d.getScope(), d.isOptional() ); if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) && d.getSystemPath() != null ) @@ -140,13 +140,13 @@ public class MavenRepositorySystem return null; } - return XcreateExtensionArtifact( groupId, artifactId, versionRange ); + return createExtensionArtifactX( groupId, artifactId, versionRange ); } // DefaultProjectBuilder public Artifact createParentArtifact( String groupId, String artifactId, String version ) { - return XcreateParentArtifact( groupId, artifactId, version ); + return createParentArtifactX( groupId, artifactId, version ); } // DefaultProjectBuilder @@ -167,7 +167,7 @@ public class MavenRepositorySystem return null; } - return XcreatePluginArtifact( plugin.getGroupId(), plugin.getArtifactId(), versionRange ); + return createPluginArtifactX( plugin.getGroupId(), plugin.getArtifactId(), versionRange ); } public void injectMirror( List<ArtifactRepository> repositories, List<Mirror> mirrors ) @@ -471,43 +471,43 @@ public class MavenRepositorySystem } // ArtifactFactory - private Artifact XcreateArtifact( String groupId, String artifactId, String version, String scope, String type ) + private Artifact createArtifactX( String groupId, String artifactId, String version, String scope, String type ) { - return XcreateArtifact( groupId, artifactId, version, scope, type, null, null ); + return createArtifactX( groupId, artifactId, version, scope, type, null, null ); } - private Artifact XcreateDependencyArtifact( String groupId, String artifactId, VersionRange versionRange, - String type, String classifier, String scope, boolean optional ) + private Artifact createDependencyArtifactX( String groupId, String artifactId, VersionRange versionRange, + String type, String classifier, String scope, boolean optional ) { - return XcreateArtifact( groupId, artifactId, versionRange, type, classifier, scope, null, optional ); + return createArtifactX( groupId, artifactId, versionRange, type, classifier, scope, null, optional ); } - private Artifact XcreateProjectArtifact( String groupId, String artifactId, String version ) + private Artifact createProjectArtifactX( String groupId, String artifactId, String version ) { - return XcreateProjectArtifact( groupId, artifactId, version, null ); + return createProjectArtifactX( groupId, artifactId, version, null ); } - private Artifact XcreateParentArtifact( String groupId, String artifactId, String version ) + private Artifact createParentArtifactX( String groupId, String artifactId, String version ) { - return XcreateProjectArtifact( groupId, artifactId, version ); + return createProjectArtifactX( groupId, artifactId, version ); } - private Artifact XcreatePluginArtifact( String groupId, String artifactId, VersionRange versionRange ) + private Artifact createPluginArtifactX( String groupId, String artifactId, VersionRange versionRange ) { - return XcreateArtifact( groupId, artifactId, versionRange, "maven-plugin", null, Artifact.SCOPE_RUNTIME, null ); + return createArtifactX( groupId, artifactId, versionRange, "maven-plugin", null, Artifact.SCOPE_RUNTIME, null ); } - private Artifact XcreateProjectArtifact( String groupId, String artifactId, String version, String scope ) + private Artifact createProjectArtifactX( String groupId, String artifactId, String version, String scope ) { - return XcreateArtifact( groupId, artifactId, version, scope, "pom" ); + return createArtifactX( groupId, artifactId, version, scope, "pom" ); } - private Artifact XcreateExtensionArtifact( String groupId, String artifactId, VersionRange versionRange ) + private Artifact createExtensionArtifactX( String groupId, String artifactId, VersionRange versionRange ) { - return XcreateArtifact( groupId, artifactId, versionRange, "jar", null, Artifact.SCOPE_RUNTIME, null ); + return createArtifactX( groupId, artifactId, versionRange, "jar", null, Artifact.SCOPE_RUNTIME, null ); } - private Artifact XcreateArtifact( String groupId, String artifactId, String version, String scope, String type, + private Artifact createArtifactX( String groupId, String artifactId, String version, String scope, String type, String classifier, String inheritedScope ) { VersionRange versionRange = null; @@ -515,16 +515,17 @@ public class MavenRepositorySystem { versionRange = VersionRange.createFromVersion( version ); } - return XcreateArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope ); + return createArtifactX( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope ); } - private Artifact XcreateArtifact( String groupId, String artifactId, VersionRange versionRange, String type, + private Artifact createArtifactX( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, String inheritedScope ) { - return XcreateArtifact( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, false ); + return createArtifactX( groupId, artifactId, versionRange, type, classifier, scope, inheritedScope, false ); } - private Artifact XcreateArtifact( String groupId, String artifactId, VersionRange versionRange, String type, + @SuppressWarnings( "checkstyle:parameternumber" ) + private Artifact createArtifactX( String groupId, String artifactId, VersionRange versionRange, String type, String classifier, String scope, String inheritedScope, boolean optional ) { String desiredScope = Artifact.SCOPE_RUNTIME; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java index 353d4f6..3a51305 100644 --- a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java +++ b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java @@ -31,7 +31,9 @@ import java.util.Map; */ public interface EventSpy { - + /** + * Context + */ interface Context { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java index 5b802ed..2a86667 100644 --- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java +++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java @@ -83,6 +83,9 @@ Plugins: // PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, // CycleDetectedInPluginGraphException; +/** + * Transform an exception into useful end-user message. + */ @Component( role = ExceptionHandler.class ) public class DefaultExceptionHandler implements ExceptionHandler http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java index ba5630e..ec9419c 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java @@ -49,6 +49,9 @@ import org.apache.maven.toolchain.model.PersistedToolchains; import org.apache.maven.toolchain.model.ToolchainModel; import org.codehaus.plexus.util.StringUtils; +/** + * Assists in populating an execution request for invocation of Maven. + */ @Named public class DefaultMavenExecutionRequestPopulator implements MavenExecutionRequestPopulator http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index d69bbba..5b56df3 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -322,6 +322,7 @@ public class MavenSession } @Deprecated + @SuppressWarnings( "checkstyle:parameternumber" ) public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository, EventDispatcher eventDispatcher, ReactorManager unused, List<String> goals, String executionRootDir, Properties executionProperties, Date startTime ) @@ -331,6 +332,7 @@ public class MavenSession } @Deprecated + @SuppressWarnings( "checkstyle:parameternumber" ) public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository, EventDispatcher eventDispatcher, ReactorManager unused, List<String> goals, String executionRootDir, Properties executionProperties, Properties userProperties, http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java index 1280837..6fa5619 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java @@ -31,6 +31,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +/** + * ReactorManager - unused + */ @Deprecated public class ReactorManager { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java index e5b6c16..168a87f 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java @@ -36,6 +36,9 @@ import com.google.inject.Provider; import com.google.inject.Scope; import com.google.inject.util.Providers; +/** + * MojoExecutionScope + */ public class MojoExecutionScope implements Scope, MojoExecutionListener { @@ -49,9 +52,9 @@ public class MojoExecutionScope private static final class ScopeState { - public final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap(); + private final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap(); - public final Map<Key<?>, Object> provided = Maps.newHashMap(); + private final Map<Key<?>, Object> provided = Maps.newHashMap(); } private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>(); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java index 8208c3c..79a18bd 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java @@ -24,6 +24,9 @@ import javax.inject.Named; import org.apache.maven.execution.MojoExecutionListener; +/** + * MojoExecutionScopeCoreModule + */ @Named public class MojoExecutionScopeCoreModule extends MojoExecutionScopeModule http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java index 229a3c5..b62b590 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java +++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java @@ -27,6 +27,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti import com.google.inject.AbstractModule; +/** + * MojoExecutionScopeModule + */ public class MojoExecutionScopeModule extends AbstractModule { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java index e7e4534..3e6f9f7 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java +++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java @@ -26,6 +26,9 @@ import javax.inject.Singleton; import org.codehaus.plexus.PlexusContainer; import org.eclipse.sisu.Nullable; +/** + * CoreExportsProvider + */ @Named @Singleton public class CoreExportsProvider http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java index ce740a9..ffac1d3 100644 --- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java +++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java @@ -78,7 +78,7 @@ public class CoreExtensionEntry return packages; } - private static final ExtensionDescriptorBuilder builder = new ExtensionDescriptorBuilder(); + private static final ExtensionDescriptorBuilder BUILDER = new ExtensionDescriptorBuilder(); public static CoreExtensionEntry discoverFrom( ClassRealm loader ) { @@ -87,13 +87,13 @@ public class CoreExtensionEntry try { - Enumeration<URL> urls = loader.getResources( builder.getExtensionDescriptorLocation() ); + Enumeration<URL> urls = loader.getResources( BUILDER.getExtensionDescriptorLocation() ); while ( urls.hasMoreElements() ) { try ( InputStream is = urls.nextElement().openStream() ) { - ExtensionDescriptor descriptor = builder.build( is ); + ExtensionDescriptor descriptor = BUILDER.build( is ); artifacts.addAll( descriptor.getExportedArtifacts() ); packages.addAll( descriptor.getExportedPackages() ); } @@ -116,7 +116,7 @@ public class CoreExtensionEntry { for ( File entry : classpath ) { - ExtensionDescriptor descriptor = builder.build( entry ); + ExtensionDescriptor descriptor = BUILDER.build( entry ); if ( descriptor != null ) { artifacts.addAll( descriptor.getExportedArtifacts() ); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java index 2cbea84..701e7c5 100644 --- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java @@ -55,6 +55,9 @@ import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.dag.CycleDetectedException; +/** + * Builds the {@link ProjectDependencyGraph inter-dependencies graph} between projects in the reactor. + */ @Component( role = GraphBuilder.class, hint = GraphBuilder.HINT ) public class DefaultGraphBuilder implements GraphBuilder http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java index e7b1a7f..aecf264 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java @@ -42,6 +42,9 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor; // from the plugin archive. //TODO this will be the class that people get in IDEs to modify +/** + * MavenExecutionPlan + */ public class MavenExecutionPlan implements Iterable<ExecutionPlanItem> { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index c2bf919..1ddee05 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -42,6 +42,11 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; +/** + * Lifecycle mapping delegate component interface. Calculates project build execution plan given {@link Lifecycle} and + * lifecycle phase. Standard lifecycles use plugin execution {@code <phase>} or mojo default lifecycle phase to + * calculate the execution plan, but custom lifecycles can use alternative mapping strategies. + */ @Component( role = LifecycleMappingDelegate.class, hint = DefaultLifecycleMappingDelegate.HINT ) public class DefaultLifecycleMappingDelegate implements LifecycleMappingDelegate http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java index 762fc72..a64da04 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java @@ -30,6 +30,9 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.MavenMetadataSource; +/** + * Default component responsible for creation of MavenProject#dependencyArtifacts instances. + */ @SuppressWarnings( "deprecation" ) @Named public class DefaultProjectArtifactFactory http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index dfc65a8..e755aa9 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java @@ -138,7 +138,7 @@ public class LifecycleDependencyResolver if ( recordArtifacts != null ) { - resolvedArtifacts = recordArtifacts.artifacts; + resolvedArtifacts = recordArtifacts.getArtifacts(); } else { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java index 52c668f..250d65d 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java @@ -19,6 +19,9 @@ package org.apache.maven.lifecycle.internal.builder; * under the License. */ +/** + * BuilderNotFoundException + */ public class BuilderNotFoundException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java index 587a847..1732896 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java @@ -71,7 +71,7 @@ public class ThreadOutputMuxer class ConsolePrinter implements Runnable { - public volatile boolean running; + private volatile boolean running; private final ProjectBuildList projectBuildList; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java index 464944f..f205b03 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java @@ -32,6 +32,11 @@ import org.apache.maven.lifecycle.internal.builder.Builder; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; +/** + * <p> + * A {@link Builder} encapsulates a strategy for building a set of Maven projects. The default strategy in Maven builds + * the the projects serially, but a {@link Builder} can employ any type of concurrency model to build the projects. + */ @Component( role = Builder.class, hint = "singlethreaded" ) public class SingleThreadedBuilder implements Builder http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java index e6845a3..e12debe 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java @@ -23,6 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +/** + * DefaultLifecycleMapping + */ public class DefaultLifecycleMapping implements LifecycleMapping { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java index e656cc9..55d5544 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java @@ -22,6 +22,9 @@ package org.apache.maven.lifecycle.mapping; import java.util.List; import java.util.Map; +/** + * LifecycleMapping + */ public interface LifecycleMapping { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java index f2af879..cd9a5b1 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java @@ -24,6 +24,9 @@ import java.util.List; import org.apache.maven.model.Dependency; import org.codehaus.plexus.util.xml.Xpp3Dom; +/** + * LifecycleMojo + */ public class LifecycleMojo { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java index 295e642..bf052c7 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java @@ -27,6 +27,9 @@ import java.util.Map; import org.codehaus.plexus.util.StringUtils; +/** + * LifecyclePhase + */ public class LifecyclePhase { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java index 1401e30..90cf8da 100644 --- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java @@ -79,6 +79,9 @@ public class DefaultLifecycleBindingsInjector } } + /** + * The domain-specific model merger for the Maven POM + */ protected static class LifecycleBindingsMerger extends MavenModelMerger { @@ -98,6 +101,7 @@ public class DefaultLifecycleBindingsInjector mergePluginContainer_Plugins( target.getBuild(), source.getBuild(), false, context ); } + @SuppressWarnings( { "checkstyle:methodname" } ) @Override protected void mergePluginContainer_Plugins( PluginContainer target, PluginContainer source, boolean sourceDominant, Map<Object, Object> context ) http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java index b4f7a4d..1a00742 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java @@ -40,6 +40,9 @@ import org.eclipse.aether.repository.RemoteRepository; // TODO the antrun plugin has its own configurator, the only plugin that does. might need to think about how that works // TODO remove the coreArtifactFilterManager +/** + * DefaultBuildPluginManager + */ @Component( role = BuildPluginManager.class ) public class DefaultBuildPluginManager implements BuildPluginManager http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java index abb4782..4391f87 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java @@ -41,7 +41,9 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable; public class DefaultExtensionRealmCache implements ExtensionRealmCache, Disposable { - + /** + * CacheKey + */ protected static class CacheKey implements Key { @@ -142,7 +144,7 @@ public class DefaultExtensionRealmCache { for ( CacheRecord record : cache.values() ) { - ClassRealm realm = record.realm; + ClassRealm realm = record.getRealm(); try { realm.getWorld().disposeRealm( realm.getId() ); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java index b49e25e..c625f37 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java @@ -46,7 +46,9 @@ import org.eclipse.aether.repository.WorkspaceRepository; public class DefaultPluginArtifactsCache implements PluginArtifactsCache { - + /** + * CacheKey + */ protected static class CacheKey implements Key { @@ -139,9 +141,9 @@ public class DefaultPluginArtifactsCache { CacheRecord cacheRecord = cache.get( key ); - if ( cacheRecord != null && cacheRecord.exception != null ) + if ( cacheRecord != null && cacheRecord.getException() != null ) { - throw cacheRecord.exception; + throw cacheRecord.getException(); } return cacheRecord; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java index 1c09d9b..b82a2b5 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java @@ -48,7 +48,9 @@ import org.eclipse.aether.repository.WorkspaceRepository; public class DefaultPluginRealmCache implements PluginRealmCache, Disposable { - + /** + * CacheKey + */ protected static class CacheKey implements Key { @@ -176,7 +178,7 @@ public class DefaultPluginRealmCache { for ( CacheRecord record : cache.values() ) { - ClassRealm realm = record.realm; + ClassRealm realm = record.getRealm(); try { realm.getWorld().disposeRealm( realm.getId() ); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java index ffae815..4d01aca 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java @@ -44,14 +44,17 @@ public interface ExtensionRealmCache // marker interface for cache keys } + /** + * CacheRecord + */ class CacheRecord { - public final ClassRealm realm; + private final ClassRealm realm; - public final ExtensionDescriptor descriptor; + private final ExtensionDescriptor descriptor; - public final List<Artifact> artifacts; + private final List<Artifact> artifacts; CacheRecord( ClassRealm realm, ExtensionDescriptor descriptor, List<Artifact> artifacts ) { @@ -60,6 +63,20 @@ public interface ExtensionRealmCache this.artifacts = artifacts; } + public ClassRealm getRealm() + { + return realm; + } + + public ExtensionDescriptor getDescriptor() + { + return descriptor; + } + + public List<Artifact> getArtifacts() + { + return artifacts; + } } Key createKey( List<Artifact> extensionArtifacts ); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java index 223ccd8..3a2e476 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java @@ -21,6 +21,9 @@ package org.apache.maven.plugin; import java.util.List; +/** + * InvalidPluginDescriptorException + */ public class InvalidPluginDescriptorException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java index 14cc7e1..ec4c511 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginValidator.java @@ -25,6 +25,9 @@ import java.util.List; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.descriptor.PluginDescriptor; +/** + * MavenPluginValidator + */ public class MavenPluginValidator { private final Artifact pluginArtifact; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java index 71ece87..fa72c18 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java @@ -27,6 +27,9 @@ import org.apache.maven.model.Plugin; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.codehaus.plexus.util.xml.Xpp3Dom; +/** + * MojoExecution + */ public class MojoExecution { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java index e24b733..11f5d70 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java @@ -47,14 +47,27 @@ public interface PluginArtifactsCache // marker interface for cache keys } + /** + * CacheRecord + */ class CacheRecord { - public final List<Artifact> artifacts; + private final List<Artifact> artifacts; + + public List<Artifact> getArtifacts() + { + return artifacts; + } + + public PluginResolutionException getException() + { + return exception; + } - public final PluginResolutionException exception; + private final PluginResolutionException exception; - CacheRecord( List<Artifact> artifacts ) + public CacheRecord( List<Artifact> artifacts ) { this.artifacts = artifacts; this.exception = null; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java index 602d2cb..a99fbbc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java @@ -23,6 +23,9 @@ import org.apache.maven.project.DuplicateArtifactAttachmentException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.StringUtils; +/** + * Exception in the plugin manager. + */ public class PluginExecutionException extends PluginManagerException { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java index 5f431e0..eaf02ec 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java @@ -29,6 +29,9 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; import org.codehaus.plexus.util.StringUtils; +/** + * PluginParameterException + */ public class PluginParameterException extends PluginConfigurationException { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index e701ec1..9d3b290 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -144,6 +144,7 @@ public class PluginParameterExpressionEvaluator } @Override + @SuppressWarnings( "checkstyle:methodlength" ) public Object evaluate( String expr, Class<?> type ) throws ExpressionEvaluationException { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java index b2c3172..78c3ae6 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java @@ -40,14 +40,26 @@ import org.eclipse.aether.repository.RemoteRepository; */ public interface PluginRealmCache { - + /** + * CacheRecord + */ class CacheRecord { - public final ClassRealm realm; + public ClassRealm getRealm() + { + return realm; + } + + public List<Artifact> getArtifacts() + { + return artifacts; + } + + private final ClassRealm realm; - public final List<Artifact> artifacts; + private final List<Artifact> artifacts; - CacheRecord( ClassRealm realm, List<Artifact> artifacts ) + public CacheRecord( ClassRealm realm, List<Artifact> artifacts ) { this.realm = realm; this.artifacts = artifacts; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 612684b..34b3b17 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -339,8 +339,8 @@ public class DefaultMavenPluginManager throw new IllegalStateException( e ); } - ClassRealm pluginRealm = extensionRecord.realm; - List<Artifact> pluginArtifacts = extensionRecord.artifacts; + ClassRealm pluginRealm = extensionRecord.getRealm(); + List<Artifact> pluginArtifacts = extensionRecord.getArtifacts(); for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() ) { @@ -362,11 +362,11 @@ public class DefaultMavenPluginManager if ( cacheRecord != null ) { - pluginDescriptor.setClassRealm( cacheRecord.realm ); - pluginDescriptor.setArtifacts( new ArrayList<>( cacheRecord.artifacts ) ); + pluginDescriptor.setClassRealm( cacheRecord.getRealm() ); + pluginDescriptor.setArtifacts( new ArrayList<>( cacheRecord.getArtifacts() ) ); for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() ) { - componentDescriptor.setRealm( cacheRecord.realm ); + componentDescriptor.setRealm( cacheRecord.getRealm() ); } } else @@ -832,7 +832,7 @@ public class DefaultMavenPluginManager } if ( recordArtifacts != null ) { - artifacts = recordArtifacts.artifacts; + artifacts = recordArtifacts.getArtifacts(); } else { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java index 3287021..6612913 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java @@ -24,6 +24,9 @@ import java.util.List; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; +/** + * NoPluginFoundForPrefixException + */ public class NoPluginFoundForPrefixException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java index b5539be..13b1fb9 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java @@ -19,6 +19,9 @@ package org.apache.maven.plugin.version; * under the License. */ +/** + * PluginVersionNotFoundException + */ public class PluginVersionNotFoundException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java index 84ec096..dd14b30 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java @@ -24,6 +24,9 @@ import java.util.List; import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.RemoteRepository; +/** + * PluginVersionResolutionException + */ public class PluginVersionResolutionException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java index 2cce9f6..1972242 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java @@ -31,6 +31,9 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; +/** + * DefaultMavenProjectHelper + */ @SuppressWarnings( "deprecation" ) @Component( role = MavenProjectHelper.class ) public class DefaultMavenProjectHelper http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java index 7fd2eca..91a875b 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java @@ -99,8 +99,8 @@ public class DefaultModelBuildingListener ProjectRealmCache.CacheRecord record = projectBuildingHelper.createProjectRealm( project, model, projectBuildingRequest ); - project.setClassRealm( record.realm ); - project.setExtensionDependencyFilter( record.extensionArtifactFilter ); + project.setClassRealm( record.getRealm() ); + project.setExtensionDependencyFilter( record.getExtensionArtifactFilter() ); } catch ( PluginResolutionException | PluginManagerException | PluginVersionResolutionException e ) { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index ac38f5d..279399a 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -74,6 +74,7 @@ import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.ArtifactResult; /** + * DefaultProjectBuilder */ @Component( role = ProjectBuilder.class ) public class DefaultProjectBuilder @@ -385,6 +386,7 @@ public class DefaultProjectBuilder return results; } + @SuppressWarnings( "checkstyle:parameternumber" ) private boolean build( List<ProjectBuildingResult> results, List<InterimResult> interimResults, Map<String, MavenProject> projectIndex, List<File> pomFiles, Set<File> aggregatorFiles, boolean isRoot, boolean recursive, InternalConfig config ) @@ -406,6 +408,7 @@ public class DefaultProjectBuilder return noErrors; } + @SuppressWarnings( "checkstyle:parameternumber" ) private boolean build( List<ProjectBuildingResult> results, List<InterimResult> interimResults, Map<String, MavenProject> projectIndex, File pomFile, Set<File> aggregatorFiles, boolean isRoot, boolean recursive, InternalConfig config ) @@ -606,6 +609,7 @@ public class DefaultProjectBuilder return noErrors; } + @SuppressWarnings( "checkstyle:methodlength" ) private void initProject( MavenProject project, Map<String, MavenProject> projects, ModelBuildingResult result, Map<File, Boolean> profilesXmls, ProjectBuildingRequest projectBuildingRequest ) { @@ -791,10 +795,9 @@ public class DefaultProjectBuilder Map<String, Artifact> map = null; if ( repositorySystem != null ) { - List<Dependency> deps; DependencyManagement dependencyManagement = project.getDependencyManagement(); - if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) - && ( deps.size() > 0 ) ) + if ( ( dependencyManagement != null ) && ( ( dependencyManagement.getDependencies() ) != null ) + && ( dependencyManagement.getDependencies().size() > 0 ) ) { map = new HashMap<>(); for ( Dependency d : dependencyManagement.getDependencies() ) @@ -924,18 +927,21 @@ public class DefaultProjectBuilder return null; } + /** + * InternalConfig + */ class InternalConfig { - public final ProjectBuildingRequest request; + private final ProjectBuildingRequest request; - public final RepositorySystemSession session; + private final RepositorySystemSession session; - public final List<RemoteRepository> repositories; + private final List<RemoteRepository> repositories; - public final ReactorModelPool modelPool; - - public final ReactorModelCache modelCache; + private final ReactorModelPool modelPool; + + private final ReactorModelCache modelCache; InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool, ReactorModelCache modelCache ) { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java index d0e3f6b..3159fac 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java @@ -196,9 +196,9 @@ public class DefaultProjectBuildingHelper ExtensionRealmCache.CacheRecord recordRealm = pluginManager.setupExtensionsRealm( project, plugin, request.getRepositorySession() ); - final ClassRealm extensionRealm = recordRealm.realm; - final ExtensionDescriptor extensionDescriptor = recordRealm.descriptor; - final List<Artifact> artifacts = recordRealm.artifacts; + final ClassRealm extensionRealm = recordRealm.getRealm(); + final ExtensionDescriptor extensionDescriptor = recordRealm.getDescriptor(); + final List<Artifact> artifacts = recordRealm.getArtifacts(); extensionRealms.add( extensionRealm ); if ( extensionDescriptor != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java index dafbefd..0451a30 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java @@ -31,6 +31,9 @@ import org.apache.maven.model.building.ModelBuildingRequest; import org.apache.maven.properties.internal.SystemProperties; import org.eclipse.aether.RepositorySystemSession; +/** + * DefaultProjectBuildingRequest + */ public class DefaultProjectBuildingRequest implements ProjectBuildingRequest { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java index 9d66eb0..a14e624 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java @@ -38,7 +38,9 @@ import org.eclipse.aether.graph.DependencyFilter; public class DefaultProjectRealmCache implements ProjectRealmCache, Disposable { - + /** + * CacheKey + */ protected static class CacheKey implements Key { @@ -118,7 +120,7 @@ public class DefaultProjectRealmCache { for ( CacheRecord record : cache.values() ) { - ClassRealm realm = record.realm; + ClassRealm realm = record.getRealm(); try { realm.getWorld().disposeRealm( realm.getId() ); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java index 5e42ee4..8080f6e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java +++ b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java @@ -23,6 +23,9 @@ import java.io.File; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; +/** + * InvalidProjectVersionException + */ public class InvalidProjectVersionException extends ProjectBuildingException { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java index d0e4afe..80523ae 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java @@ -27,6 +27,9 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Profile; import org.eclipse.aether.RepositorySystemSession; +/** + * ProjectBuildingRequest + */ public interface ProjectBuildingRequest { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java index 3400f96..28ac0d6 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java @@ -43,12 +43,25 @@ public interface ProjectRealmCache // marker interface for cache keys } + /** + * CacheRecord + */ class CacheRecord { - public final ClassRealm realm; + public ClassRealm getRealm() + { + return realm; + } + + public DependencyFilter getExtensionArtifactFilter() + { + return extensionArtifactFilter; + } + + private final ClassRealm realm; - public final DependencyFilter extensionArtifactFilter; + private final DependencyFilter extensionArtifactFilter; CacheRecord( ClassRealm realm, DependencyFilter extensionArtifactFilter ) { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java index 1ca35d8..22a466f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java @@ -38,6 +38,9 @@ import org.codehaus.plexus.util.dag.DAG; import org.codehaus.plexus.util.dag.TopologicalSorter; import org.codehaus.plexus.util.dag.Vertex; +/** + * ProjectSorter + */ public class ProjectSorter { private DAG dag; @@ -165,7 +168,7 @@ public class ProjectSorter this.sortedProjects = Collections.unmodifiableList( sortedProjects ); } - + @SuppressWarnings( "checkstyle:parameternumber" ) private void addEdge( Map<String, MavenProject> projectMap, Map<String, Map<String, Vertex>> vertexMap, MavenProject project, Vertex projectVertex, String groupId, String artifactId, String version, boolean force, boolean safe ) http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java index 6b6d2bb..64b30dd 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java +++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java @@ -96,7 +96,7 @@ class ReactorModelPool @Override public String toString() { - StringBuilder buffer = new StringBuilder( 96 ); + StringBuilder buffer = new StringBuilder( 128 ); buffer.append( groupId ).append( ':' ).append( artifactId ).append( ':' ).append( version ); return buffer.toString(); } http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java index cb06b70..a83cae6 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java @@ -23,6 +23,9 @@ import java.util.List; import org.apache.maven.model.Dependency; +/** + * ArtifactWithDependencies + */ public interface ArtifactWithDependencies { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java index f52b540..056c052 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java @@ -36,6 +36,9 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.codehaus.plexus.component.annotations.Component; +/** + * DefaultMavenMetadataCache + */ @Component( role = MavenMetadataCache.class ) public class DefaultMavenMetadataCache implements MavenMetadataCache @@ -43,6 +46,9 @@ public class DefaultMavenMetadataCache protected final Map<CacheKey, CacheRecord> cache = new ConcurrentHashMap<>(); + /** + * CacheKey + */ public static class CacheKey { private final Artifact artifact; @@ -198,6 +204,9 @@ public class DefaultMavenMetadataCache return s1 != null ? s1.equals( s2 ) : s2 == null; } + /** + * CacheRecord + */ public class CacheRecord { private Artifact pomArtifact; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java index 87d2e44..3d9d32d 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java @@ -49,7 +49,9 @@ import org.eclipse.aether.repository.WorkspaceRepository; public class DefaultProjectArtifactsCache implements ProjectArtifactsCache { - + /** + * CacheKey + */ protected static class CacheKey implements Key { @@ -186,9 +188,9 @@ public class DefaultProjectArtifactsCache { CacheRecord cacheRecord = cache.get( key ); - if ( cacheRecord != null && cacheRecord.exception != null ) + if ( cacheRecord != null && cacheRecord.getException() != null ) { - throw cacheRecord.exception; + throw cacheRecord.getException(); } return cacheRecord; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java index 036ee86..033e42a 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java @@ -25,6 +25,9 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.metadata.ResolutionGroup; +/** + * MavenMetadataCache + */ public interface MavenMetadataCache { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 42bbe45..2dc9372 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -534,7 +534,7 @@ public class MavenMetadataSource return projectBuilder; } - + @SuppressWarnings( "checkstyle:methodlength" ) private ProjectRelocation retrieveRelocatedProject( Artifact artifact, MetadataResolutionRequest repositoryRequest ) throws ArtifactMetadataRetrievalException { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java index d348d59..3b4e2ef 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java @@ -28,6 +28,9 @@ import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; +/** + * PluginArtifact + */ public class PluginArtifact extends DefaultArtifact implements ArtifactWithDependencies http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java index 924523f..8556a6a 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java @@ -28,6 +28,9 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.project.MavenProject; +/** + * ProjectArtifact + */ public class ProjectArtifact extends DefaultArtifact implements ArtifactWithDependencies http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java index cfec1d9..8d8ad79 100644 --- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java +++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java @@ -46,12 +46,25 @@ public interface ProjectArtifactsCache // marker interface for cache keys } + /** + * CacheRecord + */ class CacheRecord { - public final Set<Artifact> artifacts; + public Set<Artifact> getArtifacts() + { + return artifacts; + } + + private final Set<Artifact> artifacts; + + public LifecycleExecutionException getException() + { + return exception; + } - public final LifecycleExecutionException exception; + private final LifecycleExecutionException exception; CacheRecord( Set<Artifact> artifacts ) { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java index 296f4ea..3e72387 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java @@ -19,6 +19,9 @@ package org.apache.maven.repository; * under the License. */ +/** + * ArtifactDoesNotExistException + */ public class ArtifactDoesNotExistException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java index 9315f4c..f35de65 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java @@ -19,6 +19,9 @@ package org.apache.maven.repository; * under the License. */ +/** + * ArtifactTransferFailedException + */ public class ArtifactTransferFailedException extends Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java index 72a56cf..c6d2446 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java +++ b/maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java @@ -19,6 +19,9 @@ package org.apache.maven.repository; * under the License. */ +/** + * ArtifactTransferListener + */ public interface ArtifactTransferListener { boolean isShowChecksumEvents(); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java index e33789e..6f1c934 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java +++ b/maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java @@ -22,6 +22,9 @@ package org.apache.maven.repository; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.MavenArtifactRepository; +/** + * LocalArtifactRepository + */ public abstract class LocalArtifactRepository extends MavenArtifactRepository { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java index fcc0f77..30b4925 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -44,10 +44,13 @@ public interface RepositorySystem { String DEFAULT_LOCAL_REPO_ID = "local"; + @SuppressWarnings( "checkstyle:constantname" ) String userHome = System.getProperty( "user.home" ); + @SuppressWarnings( "checkstyle:constantname" ) File userMavenConfigurationHome = new File( userHome, ".m2" ); + @SuppressWarnings( "checkstyle:constantname" ) File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" ); String DEFAULT_REMOTE_REPO_ID = "central"; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java index e942f70..ae1019a 100644 --- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java +++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java @@ -26,6 +26,9 @@ import java.util.Set; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; +/** + * ResolutionGroup + */ public class ResolutionGroup { http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java index 7ca63ab..e57a19c 100644 --- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java +++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java @@ -20,17 +20,20 @@ package org.apache.maven.session.scope.internal; */ import java.util.Collections; +import java.util.HashMap; import java.util.LinkedList; import java.util.Map; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.inject.Key; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; import com.google.inject.Scope; import com.google.inject.util.Providers; +/** + * SessionScope + */ public class SessionScope implements Scope { @@ -55,11 +58,14 @@ public class SessionScope } }; + /** + * ScopeState + */ private static final class ScopeState { - public final Map<Key<?>, Provider<?>> seeded = Maps.newHashMap(); + private final Map<Key<?>, Provider<?>> seeded = new HashMap<>(); - public final Map<Key<?>, Object> provided = Maps.newHashMap(); + private final Map<Key<?>, Object> provided = new HashMap<>(); } private final ThreadLocal<LinkedList<ScopeState>> values = new ThreadLocal<>(); http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java index 585d683..cd88104 100644 --- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java +++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java @@ -29,6 +29,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti import com.google.inject.AbstractModule; +/** + * SessionScopeModule + */ @Named public class SessionScopeModule extends AbstractModule http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java index ca910d8..41ccf58 100644 --- a/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java +++ b/maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java @@ -71,13 +71,13 @@ public class MavenToolchainMerger } else { - mergeToolchainModel_Configuration( dominantModel, recessiveModel ); + mergeToolchainModelConfiguration( dominantModel, recessiveModel ); } } } - protected void mergeToolchainModel_Configuration( ToolchainModel target, - ToolchainModel source ) + protected void mergeToolchainModelConfiguration( ToolchainModel target, + ToolchainModel source ) { Xpp3Dom src = (Xpp3Dom) source.getConfiguration(); if ( src != null ) http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java b/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java index c919cdf..a685bc1 100644 --- a/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java +++ b/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java @@ -43,7 +43,7 @@ public class LegacyLocalRepositoryManager private final LocalRepository repository; - public LegacyLocalRepositoryManager( File basedir ) + LegacyLocalRepositoryManager( File basedir ) { this.repository = new LocalRepository( basedir.getAbsoluteFile(), "legacy" ); } http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java index 03ef00c..8b2d9b7 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java @@ -22,6 +22,9 @@ package org.apache.maven.cli; import java.util.ArrayList; import java.util.List; +/** + * CleanArgument + */ public class CleanArgument { public static String[] cleanArgs( String[] args ) http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java b/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java index 4656dd3..34937e8 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java @@ -27,6 +27,9 @@ import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; import org.codehaus.plexus.classworlds.ClassWorld; +/** + * CliRequest + */ public class CliRequest { String[] args; http://git-wip-us.apache.org/repos/asf/maven/blob/d9250817/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 77ef134..4fac2ad 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1268,6 +1268,7 @@ public class MavenCli return populateRequest( cliRequest, cliRequest.request ); } + @SuppressWarnings( "checkstyle:methodlength" ) private MavenExecutionRequest populateRequest( CliRequest cliRequest, MavenExecutionRequest request ) { CommandLine commandLine = cliRequest.commandLine; @@ -1681,8 +1682,7 @@ public class MavenCli static class ExitException extends Exception { - @SuppressWarnings( "checkstyle:visibilitymodifier" ) - public int exitCode; + int exitCode; ExitException( int exitCode ) {
