Skip to content

UnnecessaryFullyQualifiedName #2348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ default String key() {
* Determines whether this artifact uses a snapshot version.
*
* @return {@code true} if the artifact is a snapshot, {@code false} otherwise
* @see org.apache.maven.api.Session#isVersionSnapshot(String)
* @see Session#isVersionSnapshot(String)
*/
boolean isSnapshot();

/**
* {@return coordinates with the same identifiers as this artifact}
* This is a shortcut for {@code session.createArtifactCoordinates(artifact)}.
*
* @see org.apache.maven.api.Session#createArtifactCoordinates(Artifact)
* @see Session#createArtifactCoordinates(Artifact)
*/
@Nonnull
ArtifactCoordinates toCoordinates();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.Session#requirePackaging(String)
* @see org.apache.maven.api.Project#getPackaging()
* @see Session#requirePackaging(String)
* @see Project#getPackaging()
* @see org.apache.maven.api.model.Model#getPackaging()
* @since 4.0.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ Map<PathType, List<Path>> resolveDependencies(
*
* @param artifact the artifact for which to resolve the version
* @return resolved version of the given artifact
* @throws org.apache.maven.api.services.VersionResolverException if the resolution failed
* @throws VersionResolverException if the resolution failed
*
* @see org.apache.maven.api.services.VersionResolver#resolve(Session, ArtifactCoordinates) (String)
*/
Expand Down Expand Up @@ -839,7 +839,7 @@ Optional<Version> resolveHighestVersion(@Nonnull ArtifactCoordinates artifact, L
* @return the scope for the given identifier (never null)
* @throws IllegalArgumentException if the given identifier is not a known scope
*
* @see org.apache.maven.api.DependencyScope#forId(String)
* @see DependencyScope#forId(String)
*/
@Nonnull
DependencyScope requireDependencyScope(@Nonnull String id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*
* @since 4.0.0
* @see org.apache.maven.api.services.VersionParser#parseVersion(String)
* @see org.apache.maven.api.Session#parseVersion(String)
* @see Session#parseVersion(String)
* @see VersionConstraint
* @see VersionRange
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* @see Version
* @see VersionRange
* @see org.apache.maven.api.services.VersionParser#parseVersionConstraint(String)
* @see org.apache.maven.api.Session#parseVersionConstraint(String)
* @see Session#parseVersionConstraint(String)
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* @see Version
* @see VersionConstraint
* @see org.apache.maven.api.services.VersionParser#parseVersionRange(String)
* @see org.apache.maven.api.Session#parseVersionRange(String)
* @see Session#parseVersionRange(String)
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public interface DependencyResolverResult extends Result<DependencyResolverReque
* Returns the file paths of all dependencies and their assignments to different paths.
* The {@link PathType} keys identify, for example, {@code --class-path} or {@code --module-path} options.
* In the case of Java tools, the map may also contain {@code --patch-module} options, which are
* {@linkplain org.apache.maven.api.JavaPathType#patchModule(String) handled in a special way}.
* {@linkplain JavaPathType#patchModule(String) handled in a special way}.
*
* <h4>Design note</h4>
* All types of path are determined together because they are sometime mutually exclusive.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
public interface ProblemCollector<P extends BuilderProblem> {
/**
* Returns {@code true} if there is at least one problem collected with severity equal or more severe than
* {@link org.apache.maven.api.services.BuilderProblem.Severity#WARNING}. This check is logically equivalent
* {@link BuilderProblem.Severity#WARNING}. This check is logically equivalent
* to "is there any problem reported?", given warning is the lowest severity.
*/
default boolean hasWarningProblems() {
Expand All @@ -55,15 +55,15 @@ default boolean hasWarningProblems() {

/**
* Returns {@code true} if there is at least one problem collected with severity equal or more severe than
* {@link org.apache.maven.api.services.BuilderProblem.Severity#ERROR}.
* {@link BuilderProblem.Severity#ERROR}.
*/
default boolean hasErrorProblems() {
return hasProblemsFor(BuilderProblem.Severity.ERROR);
}

/**
* Returns {@code true} if there is at least one problem collected with severity equal or more severe than
* {@link org.apache.maven.api.services.BuilderProblem.Severity#FATAL}.
* {@link BuilderProblem.Severity#FATAL}.
*/
default boolean hasFatalProblems() {
return hasProblemsFor(BuilderProblem.Severity.FATAL);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* during parallel builds.
*
* @since 4.0.0
* @see org.apache.maven.api.services.ProjectBuilder
* @see ProjectBuilder
* @see Project
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.settings.Profile;
import org.apache.maven.api.settings.Settings;

/**
Expand Down Expand Up @@ -125,11 +126,11 @@ default ProblemCollector<BuilderProblem> validate(@Nonnull Settings settings) {
* Convert a model profile to a settings profile.
*/
@Nonnull
org.apache.maven.api.settings.Profile convert(@Nonnull org.apache.maven.api.model.Profile profile);
Profile convert(@Nonnull org.apache.maven.api.model.Profile profile);

/**
* Convert a settings profile to a model profile.
*/
@Nonnull
org.apache.maven.api.model.Profile convert(@Nonnull org.apache.maven.api.settings.Profile profile);
org.apache.maven.api.model.Profile convert(@Nonnull Profile profile);
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* </ul>
*
* @since 4.0.0
* @see org.apache.maven.api.services.ProjectBuilder#build(Session, Source)
* @see ProjectBuilder#build(Session, Source)
*/
@Experimental
public interface Source {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.Language
* @see org.apache.maven.api.spi.ExtensibleEnumProvider
* @see Language
* @see ExtensibleEnumProvider
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.Lifecycle
* @see org.apache.maven.api.spi.ExtensibleEnumProvider
* @see Lifecycle
* @see ExtensibleEnumProvider
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.Packaging
* @see org.apache.maven.api.spi.ExtensibleEnumProvider
* @see Packaging
* @see ExtensibleEnumProvider
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.PathScope
* @see org.apache.maven.api.spi.ExtensibleEnumProvider
* @see PathScope
* @see ExtensibleEnumProvider
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.ProjectScope
* @see org.apache.maven.api.spi.ExtensibleEnumProvider
* @see ProjectScope
* @see ExtensibleEnumProvider
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
* }
* </pre>
*
* @see org.apache.maven.api.Type
* @see org.apache.maven.api.spi.ExtensibleEnumProvider
* @see Type
* @see ExtensibleEnumProvider
* @since 4.0.0
*/
@Experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class DefaultProblem implements Problem {
*
* @param message The message describing the problem, may be {@code null}.
* @param severity The severity level of the problem, may be {@code null} to default to
* {@link org.apache.maven.building.Problem.Severity#ERROR}.
* {@link Problem.Severity#ERROR}.
* @param source A hint about the source of the problem like a file path, may be {@code null}.
* @param lineNumber The one-based index of the line containing the problem or {@code -1} if unknown.
* @param columnNumber The one-based index of the column containing the problem or {@code -1} if unknown.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private synchronized Set<String> getExcludedArtifacts() {
/**
* Returns the artifact filter for the core + extension artifacts.
*
* @see org.apache.maven.ArtifactFilterManager#getArtifactFilter()
* @see ArtifactFilterManager#getArtifactFilter()
*/
public ArtifactFilter getArtifactFilter() {
Set<String> excludes = new LinkedHashSet<>(getExcludedArtifacts());
Expand All @@ -75,7 +75,7 @@ public ArtifactFilter getArtifactFilter() {
/**
* Returns the artifact filter for the standard core artifacts.
*
* @see org.apache.maven.ArtifactFilterManager#getCoreArtifactFilter()
* @see ArtifactFilterManager#getCoreArtifactFilter()
*/
public ArtifactFilter getCoreArtifactFilter() {
return new ExclusionSetFilter(getCoreArtifactExcludes());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*/
@Deprecated
public abstract class AbstractArtifactMetadata
extends org.apache.maven.repository.legacy.metadata.AbstractArtifactMetadata
implements org.apache.maven.artifact.metadata.ArtifactMetadata {
extends org.apache.maven.repository.legacy.metadata.AbstractArtifactMetadata implements ArtifactMetadata {
protected AbstractArtifactMetadata(Artifact artifact) {
super(artifact);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.maven.artifact.repository.metadata;

import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;

Expand All @@ -27,7 +28,7 @@
* TODO not happy about the store method - they use "this"
*/
@Deprecated
public interface RepositoryMetadata extends org.apache.maven.artifact.metadata.ArtifactMetadata {
public interface RepositoryMetadata extends ArtifactMetadata {

int RELEASE = 1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector;

/**
* Artifact collector - takes a set of original artifacts and resolves the best versions to use
* along with their metadata. No artifacts are downloaded.
*/
@Deprecated
public interface ArtifactCollector extends org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector {
public interface ArtifactCollector extends LegacyArtifactCollector {

@Deprecated
ArtifactResolutionResult collect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector;

/**
* Artifact collector - takes a set of original artifacts and resolves the best versions to use
* along with their metadata. No artifacts are downloaded.
*/
@Deprecated
@Named
@Singleton
public class DefaultArtifactCollector extends org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector
implements ArtifactCollector {}
public class DefaultArtifactCollector extends DefaultLegacyArtifactCollector implements ArtifactCollector {}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Repository;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.eclipse.aether.RepositorySystemSession;

Expand Down Expand Up @@ -125,7 +126,7 @@ ArtifactRepository createArtifactRepository(
* @param repositories The repositories into which to inject the proxy information, may be {@code null}.
* @param proxies The available proxies, may be {@code null}.
*/
void injectProxy(List<ArtifactRepository> repositories, List<org.apache.maven.settings.Proxy> proxies);
void injectProxy(List<ArtifactRepository> repositories, List<Proxy> proxies);

/**
* Injects the authentication information into the specified repositories. For each repository that is matched by a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;

Expand Down Expand Up @@ -692,7 +693,7 @@ public Wagon getWagon(String protocol) throws UnsupportedProtocolException {
throw new UnsupportedProtocolException("Unspecified protocol");
}

String hint = protocol.toLowerCase(java.util.Locale.ENGLISH);
String hint = protocol.toLowerCase(Locale.ENGLISH);

Wagon wagon;
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
import org.apache.maven.settings.crypto.SettingsDecryptionResult;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.proxy.ProxyUtils;
import org.codehaus.plexus.PlexusContainer;
Expand Down Expand Up @@ -642,9 +644,9 @@ public void retrieve(
TransferListenerAdapter.newAdapter(transferListener),
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN,
true);
} catch (org.apache.maven.wagon.TransferFailedException e) {
} catch (TransferFailedException e) {
throw new ArtifactTransferFailedException(getMessage(e, "Error transferring artifact."), e);
} catch (org.apache.maven.wagon.ResourceDoesNotExistException e) {
} catch (ResourceDoesNotExistException e) {
throw new ArtifactDoesNotExistException(getMessage(e, "Requested artifact does not exist."), e);
}
}
Expand All @@ -655,7 +657,7 @@ public void publish(
try {
wagonManager.putRemoteFile(
repository, source, remotePath, TransferListenerAdapter.newAdapter(transferListener));
} catch (org.apache.maven.wagon.TransferFailedException e) {
} catch (TransferFailedException e) {
throw new ArtifactTransferFailedException(getMessage(e, "Error transferring artifact."), e);
}
}
Expand Down
Loading