Skip to content

Commit b41eed3

Browse files
committed
[SHRINKRES-340] fix typos, grammar, errors and add missing descriptions in javadoc
1 parent 4454724 commit b41eed3

File tree

94 files changed

+212
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+212
-204
lines changed

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ConfigurableResolverSystem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ CONFIGUREDRESOLVERSYSTEMTYPE fromClassloaderResource(String path) throws Illegal
7575
* @param loader The classloader
7676
* @return This configured {@link ResolverSystem}
7777
* @throws IllegalArgumentException
78-
* If the either argument is not specified or if the path can not be found
78+
* If either argument is not specified or if the path can not be found
7979
* @throws InvalidConfigurationFileException
8080
* If the file is not in correct format
8181
*/

api/src/main/java/org/jboss/shrinkwrap/resolver/api/Invokable.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Invokable {
5656
*
5757
* @param cl classloader to be used
5858
* @param classTypeName fully qualified class name
59-
* @return
59+
* @return the loaded {@code Class} object
6060
* @throws InvocationException if class was not found in classloader
6161
*/
6262
static Class<?> loadClass(ClassLoader cl, String classTypeName) throws InvocationException {
@@ -72,7 +72,7 @@ static Class<?> loadClass(ClassLoader cl, String classTypeName) throws Invocatio
7272
*
7373
* @param cl classloader to be used
7474
* @param classType class object
75-
* @return
75+
* @return the loaded {@code Class} object
7676
* @throws InvocationException if class was not found in classloader
7777
*/
7878
static Class<?> reloadClass(ClassLoader cl, Class<?> classType) throws InvocationException {
@@ -91,7 +91,7 @@ static Class<?> reloadClass(ClassLoader cl, Class<?> classType) throws Invocatio
9191
* @param parameterTypes parameter types of the method
9292
* @param instance instance on which method is called, {@code null} for static methods
9393
* @param parameters parameters for method invocation
94-
* @return
94+
* @return the result of the method invocation
9595
* @throws InvocationException if method was not found or could not be invoked
9696
*/
9797
Object invokeMethod(String name, Class<?>[] parameterTypes, Object instance, Object[] parameters)

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ResolutionFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
/**
2020
* Contract for an exclusion-based filter applied during resolution of a {@link Coordinate}. Applies a selective
21-
* passthrough mechanism. May be chained alongside other {@link ResolutionFilter}s to comprise a
21+
* pass through mechanism. May be chained alongside other {@link ResolutionFilter}s to comprise a
2222
* {@link ResolutionStrategy}.
2323
*
2424
* @author <a href="mailto:[email protected]">Andrew Lee Rubinger</a>

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ResolutionStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
/**
2020
* Encapsulates rules defining the logic of resolution (for instance transitivity, exclusions, conditional selection,
21-
* etc). Subtypes are expected to define the contract specifying exactly what form this may take; this type is provided
21+
* etc.). Subtypes are expected to define the contract specifying exactly what form this may take; this type is provided
2222
* as a base for type safety (ie marker interface).
2323
*
2424
* @author <a href="mailto:[email protected]">Andrew Lee Rubinger</a>

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ResolveStage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ STRATEGYSTAGETYPE resolve(String... canonicalForms) throws IllegalArgumentExcept
7878
* next {@link StrategyStage} for the user to define the {@link ResolutionStrategy}. Previously-added dependencies
7979
* will be included in resolution.
8080
*
81-
* @param canonicalForms A {@link Collection} of the canonical forms a of the desired dependencies.
81+
* @param canonicalForms A {@link Collection} of the canonical forms of the desired dependencies.
8282
* @return The next {@link StrategyStage} for the user to define the {@link ResolutionStrategy}.
8383
* @throws IllegalArgumentException
8484
* If no coordinates are supplied

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ResolveWithRangeSupportStage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public interface ResolveWithRangeSupportStage<
4141
*
4242
* @param coordinate coordinate in canonical form containing version range:
4343
* <a href="http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html">Maven doc</a>}
44-
* @return A info about available versions.StrategyStage
44+
* @return Info about available versions.StrategyStage
4545
* @throws IllegalArgumentException If no coordinate is supplied
4646
*/
4747
VERSIONRANGERESULTTYPE resolveVersionRange(String coordinate) throws IllegalArgumentException;

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ResolvedArtifact.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public interface ResolvedArtifact<RESOLVEDTYPE extends ResolvedArtifact<RESOLVEDTYPE>> {
3030

3131
/**
32-
* Returns resolved artifact, optionally casted to the sub type of {@link ResolvedArtifact}
32+
* Returns resolved artifact, optionally cast to the subtype of {@link ResolvedArtifact}
3333
*
3434
* @return The resolved artifact.
3535
*/
@@ -43,16 +43,16 @@ public interface ResolvedArtifact<RESOLVEDTYPE extends ResolvedArtifact<RESOLVED
4343
File asFile();
4444

4545
/**
46-
* Returns resolved artifact as an @{link {@link InputStream}. It is a responsibility of the caller to close stream
46+
* Returns resolved artifact as an {@link InputStream}. It is a responsibility of the caller to close stream
4747
* afterwards.
4848
*
49-
* @return The resolved artifact as an @{link {@link InputStream}.
49+
* @return The resolved artifact as an {@link InputStream}.
5050
*/
5151
InputStream asInputStream();
5252

5353
/**
5454
* Returns resolved artifact formatted to {@code returnTypeClass}.
55-
*
55+
* <p>
5656
* See {@code FormatProcessor} to register additional format.
5757
*
5858
* @param <RETURNTYPE> The return type

api/src/main/java/org/jboss/shrinkwrap/resolver/api/ResolverSystemFactory.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ private ResolverSystemFactory() {
4040
/**
4141
* Creates a new {@link ResolverSystem} instance of the specified user view type using the {@link Thread} Context
4242
* {@link ClassLoader}. Will consult a configuration file visible to the {@link Thread} Context {@link ClassLoader} named
43-
* "META-INF/services/$fullyQualfiedClassName" which should contain a key=value format with the key
44-
* {@link ResolverSystemFactory#KEY_IMPL_CLASS_NAME}. The implementation class name must have a no-arg constructor.
43+
* "META-INF/services/$fullyQualifiedClassName" which should contain a key=value format with a key representing the fully
44+
* qualified class name of the implementation class. The implementation class name must have a no-arg constructor.
4545
*
4646
* @param userViewClass The user view type
4747
* @return The new {@link ResolverSystem} instance of the specified user view type created by using the {@link Thread}
@@ -55,11 +55,10 @@ static <RESOLVERSYSTEMTYPE extends ResolverSystem> RESOLVERSYSTEMTYPE createFrom
5555
}
5656

5757
/**
58-
* Creates a new {@link ResolverSystem} instance of the specified user view type using the specified {@link ClassLoader}.
59-
* Will consult a configuration file visible to the specified {@link ClassLoader} named
60-
* "META-INF/services/$fullyQualfiedClassName" which should contain a key=value format with the key
61-
* {@link ResolverSystemFactory#KEY_IMPL_CLASS_NAME}. The implementation class name must have a no-arg constructor.
62-
*
58+
* Creates a new {@link ResolverSystem} instance of the specified user view type using the {@link Thread} Context
59+
* {@link ClassLoader}. Will consult a configuration file visible to the {@link Thread} Context {@link ClassLoader} named
60+
* "META-INF/services/$fullyQualifiedClassName" which should contain a key=value format with a key representing the fully
61+
* qualified class name of the implementation class. The implementation class name must have a no-arg constructor.
6362
*
6463
* @param userViewClass The user view type
6564
* @param cl The {@link ClassLoader}

gradle/api-gradle-embedded-archive/src/main/java/org/jboss/shrinkwrap/api/gradle/archive/importer/embedded/ConfigurationStage.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ public interface ConfigurationStage extends BuildStage {
2727
ConfigurationStage useGradleUserHomeDir(File gradleUserHomeDir);
2828

2929
/**
30-
* Set tasks which will be executed during build. By default: [build].
30+
* Set tasks which will be executed during build. Default: [build].
3131
*
3232
* @param tasks
3333
* List of tasks to be executed.
3434
*/
3535
ConfigurationStage forTasks(String... tasks);
3636

3737
/**
38-
* Sets argument which will be used during build. By default: "--exclude-task test".
38+
* Sets argument which will be used during build. Default: "--exclude-task test".
3939
*
4040
* @param arguments
4141
* Arguments to be used

maven/api-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/archive/importer/MavenImporter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ ConfiguredMavenImporter configureFromFile(String pathToFile) throws IllegalArgum
6464
*
6565
* @param path A {@link ClassLoader} path to a settings.xml file this {@link MavenImporter} should be configured from.
6666
* @return This configured {@link MavenImporter}
67-
* @throws IllegalArgumentException If the either argument is not specified or if the path can not be found
67+
* @throws IllegalArgumentException If any of the arguments is not specified or if the path can not be found
6868
* @throws UnsupportedOperationException If this {@link ConfigurableResolverSystem} does not support configuration by
6969
* {@link ClassLoader} resource
7070
* @throws InvalidConfigurationFileException If the configuration file contents are not in appropriate format
@@ -79,7 +79,7 @@ ConfiguredMavenImporter configureFromClassloaderResource(String path) throws Ill
7979
* @param path A {@link ClassLoader} path to a settings.xml file this {@link MavenImporter} should be configured from.
8080
* @param cl A {@link ClassLoader}
8181
* @return This configured {@link MavenImporter}
82-
* @throws IllegalArgumentException If the either argument is not specified or if the path can not be found
82+
* @throws IllegalArgumentException If any of the arguments is not specified or if the path can not be found
8383
* @throws UnsupportedOperationException If this {@link ConfigurableResolverSystem} does not support configuration by
8484
* {@link ClassLoader} resource
8585
* @throws InvalidConfigurationFileException If the configuration file contents are not in appropriate format

maven/api-maven-archive/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/archive/importer/PomlessMavenImporter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ PomEquippedMavenImporter loadPomFromFile(String pathToPomFile, String... profile
8181
* Configures the Maven Importer from Project Object Model contained in the POM file located at the specified
8282
* {@link ClassLoader} resource path, loaded by the current {@link Thread#getContextClassLoader()}.
8383
*
84-
* @param pathToPomResource A {@link ClassLoader} resource path to a POM filee the maven Importer should be configured from.
84+
* @param pathToPomResource A {@link ClassLoader} resource path to a POM file the maven Importer should be configured from.
8585
* @return The configured Maven Importer from the given Project Object Model.
8686
* @throws IllegalArgumentException If no path was specified, or if the resource could not be found at the specified path
8787
* @throws InvalidConfigurationFileException If the configuration file contents are not in appropriate format
@@ -93,7 +93,7 @@ PomEquippedMavenImporter loadPomFromClassLoaderResource(String pathToPomResource
9393
* Configures the Maven Importer from Project Object Model contained in the POM file located at the specified
9494
* {@link ClassLoader} resource path, loaded by the specified {@link ClassLoader}.
9595
*
96-
* @param pathToPomResource A {@link ClassLoader} resource path to a POM filee the maven Importer should be configured from.
96+
* @param pathToPomResource A {@link ClassLoader} resource path to a POM file the maven Importer should be configured from.
9797
* @param cl A {@link ClassLoader}
9898
* @return The configured Maven Importer from the given Project Object Model.
9999
* @throws IllegalArgumentException If no path was specified, no ClassLoader was specified, or if the resource could not be
@@ -107,7 +107,7 @@ PomEquippedMavenImporter loadPomFromClassLoaderResource(String pathToPomResource
107107
* Configures the Maven Importer from Project Object Model contained in the POM file located at the specified
108108
* {@link ClassLoader} resource path, loaded by the specified {@link ClassLoader}.
109109
*
110-
* @param pathToPomResource A {@link ClassLoader} resource path to a POM filee the maven Importer should be configured from.
110+
* @param pathToPomResource A {@link ClassLoader} resource path to a POM file the maven Importer should be configured from.
111111
* @param cl A {@link ClassLoader}
112112
* @param profiles Active/inactive profiles
113113
* @return The configured Maven Importer from the given Project Object Model.
@@ -119,7 +119,7 @@ PomEquippedMavenImporter loadPomFromClassLoaderResource(String pathToPomResource
119119
throws IllegalArgumentException, InvalidConfigurationFileException;
120120

121121
/**
122-
* <i>Optional operation</i>. Sets whether resolution should be done in "offline" (ie. not connected to Internet) mode.
122+
* <i>Optional operation</i>. Sets whether resolution should be done in "offline" (i.e. not connected to Internet) mode.
123123
* By default, resolution is done in online mode
124124
*
125125
* @param offline Whether resolution should be done in "offline". By default, resolution is done in online mode.
@@ -129,7 +129,7 @@ PomEquippedMavenImporter loadPomFromClassLoaderResource(String pathToPomResource
129129
PomlessMavenImporter offline(boolean offline);
130130

131131
/**
132-
* <i>Optional operation</i>. Sets that resolution should be done in "offline" (ie. not connected to Internet) mode. Alias to
132+
* <i>Optional operation</i>. Sets that resolution should be done in "offline" (i.e. not connected to Internet) mode. Alias to
133133
* {@link ConfiguredMavenImporter#offline(boolean)}, passing <code>true</code> as a parameter.
134134
*
135135
* @return Modified {@link PomlessMavenImporter} instance

maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public interface DistributionStage<NEXT_STEP extends BuildStage<DAEMON_TRIGGER_T
5858
NEXT_STEP useInstallation(File mavenHome);
5959

6060
/**
61-
* Use default Maven distribution with version {@link DEFAULT_MAVEN_VERSION}.
61+
* Use default Maven distribution with version {@value DEFAULT_MAVEN_VERSION}.
6262
*
6363
* @return Modified EmbeddedMaven instance
6464
*/

maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/pom/equipped/ConfigurationStage.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public interface ConfigurationStage<DIST_OR_CONFIG extends ConfigurationStage<Co
7979
* Sets the failure mode of the Maven invocation. Equivalent of {@code -ff} and {@code --fail-fast}, {@code -fae}
8080
* and {@code --fail-at-end}, {@code -fn} and {@code --fail-never}
8181
*
82-
* @param failureBehavior The failure mode, must be one of {@link InvocationRequest.ReactorFailureBehavior#FailFast},
82+
* @param reactorFailureBehavior The failure mode, must be one of {@link InvocationRequest.ReactorFailureBehavior#FailFast},
8383
* {@link InvocationRequest.ReactorFailureBehavior#FailAtEnd} and {@link InvocationRequest.ReactorFailureBehavior#FailNever}.
8484
* @return Modified instance of EmbeddedMaven
8585
*/
@@ -259,7 +259,7 @@ public interface ConfigurationStage<DIST_OR_CONFIG extends ConfigurationStage<Co
259259
/**
260260
* Sets the recursion behavior of a reactor invocation. Inverse equivalent of -N and --non-recursive
261261
*
262-
* @param recursive true if sub modules should be build, false otherwise.
262+
* @param recursive true if submodules should be built, false otherwise.
263263
* @return Modified instance of EmbeddedMaven
264264
*/
265265
DIST_OR_CONFIG setRecursive(boolean recursive);
@@ -292,7 +292,7 @@ public interface ConfigurationStage<DIST_OR_CONFIG extends ConfigurationStage<Co
292292
/**
293293
* Thread count, for instance 2.0C where C is core multiplied Equivalent of -T or --threads
294294
*
295-
* @param threads the threadcount
295+
* @param threads the thread count
296296
* @return Modified instance of EmbeddedMaven
297297
*/
298298
DIST_OR_CONFIG setThreads(String threads);
@@ -338,7 +338,7 @@ public interface ConfigurationStage<DIST_OR_CONFIG extends ConfigurationStage<Co
338338
DIST_OR_CONFIG setResumeFrom(String resumeFrom);
339339

340340
/**
341-
* Sets if the build output shold be in the quiet mode or not.
341+
* Sets if the build output should be in the quiet mode or not.
342342
* It means that the output will not be printed on standard output, but it will be accessible via the
343343
* {@link BuiltProject#getMavenLog()}. Default is false
344344
*

maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/ConfigurableMavenResolverSystemBase.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public interface ConfigurableMavenResolverSystemBase<UNCONFIGURABLERESOLVERSYSTE
6161
*
6262
* @param name a unique arbitrary ID such as "codehaus"
6363
* @param url the repository URL, such as "http://snapshots.maven.codehaus.org/maven2"
64-
* @param layout the repository layout. Should always be "default" (may be reused one day by Maven with other values).
64+
* @param layout the repository layout. Should always be "default" (maybe reused one day by Maven with other values).
6565
* @return Modified instance of {@code PARTIALLYCONFIGUREDRESOLVERSYSTEMTYPE}
6666
* @throws IllegalArgumentException if name or layout are null or if layout is not "default", or if no url protocol is
6767
* specified, or an unknown url protocol is found, or url is null
@@ -73,7 +73,7 @@ public interface ConfigurableMavenResolverSystemBase<UNCONFIGURABLERESOLVERSYSTE
7373
*
7474
* @param name a unique arbitrary ID such as "codehaus"
7575
* @param url the repository URL, such as "http://snapshots.maven.codehaus.org/maven2"
76-
* @param layout the repository layout. Should always be "default" (may be reused one day by Maven with other values).
76+
* @param layout the repository layout. Should always be "default" (maybe reused one day by Maven with other values).
7777
* @return Modified instance of {@code PARTIALLYCONFIGUREDRESOLVERSYSTEMTYPE}
7878
*/
7979
PARTIALLYCONFIGUREDRESOLVERSYSTEMTYPE withRemoteRepo(String name, URL url, String layout);
@@ -115,8 +115,8 @@ public interface ConfigurableMavenResolverSystemBase<UNCONFIGURABLERESOLVERSYSTE
115115
* Sets whether to consult artifact metadata in local repository and track origin of artifacts there;
116116
* ignores origin of artifacts in local repository. Note that offline repository has the same behavior.
117117
*
118-
* @param useLegacyLocalReposity Whether to ignore origin of artifacts in local repository; defaults to false
118+
* @param useLegacyLocalRepository Whether to ignore origin of artifacts in local repository; defaults to false
119119
* @return Modified instance of {@code PARTIALLYCONFIGUREDRESOLVERSYSTEMTYPE}
120120
*/
121-
PARTIALLYCONFIGUREDRESOLVERSYSTEMTYPE useLegacyLocalRepo(boolean useLegacyLocalReposity);
121+
PARTIALLYCONFIGUREDRESOLVERSYSTEMTYPE useLegacyLocalRepo(boolean useLegacyLocalRepository);
122122
}

maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenArtifactInfo.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ public interface MavenArtifactInfo {
2121
/**
2222
* Returns the resolved "version" portion of this artifact's coordinates; SNAPSHOTs may declare a version field (as
2323
* represented by {@link MavenResolvedArtifact#getResolvedVersion()}), which must resolve to a versioned snapshot version
24-
* number. That resolved version number is reflected by this field. In the case of true versions (ie.
24+
* number. That resolved version number is reflected by this field. In the case of true versions (i.e.
2525
* non-SNAPSHOTs), this call will be equal to {@link MavenCoordinate#getVersion()}.
2626
*
2727
* @return The resolved "version" portion of this artifact's coordinates
2828
*/
2929
String getResolvedVersion();
3030

3131
/**
32-
* Returns whether or not this artifact is using a SNAPSHOT version.
32+
* Returns whether this artifact is using a SNAPSHOT version.
3333
*
34-
* @return Whether or not this artifact is using a SNAPSHOT version.
34+
* @return Whether this artifact is using a SNAPSHOT version.
3535
*/
3636
boolean isSnapshotVersion();
3737

3838
/**
39-
* Returns the file extension of this artifact, ie. ("jar")
39+
* Returns the file extension of this artifact, i.e. ("jar")
4040
*
4141
* @return The file extension, which is never null
4242
*/

maven/api-maven/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolverSystem.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
package org.jboss.shrinkwrap.resolver.api.maven;
1818

19+
import org.jboss.shrinkwrap.resolver.api.Resolvers;
20+
1921
/**
2022
* Entry point of a Maven-based Resolver system which does not support configuration. To create a new instance, pass in
2123
* this class reference to {@link Resolvers#use(Class)} or {@link Resolvers#use(Class, ClassLoader)}.

0 commit comments

Comments
 (0)