You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/11/07 22:03:42 UTC
[2/2] maven-resolver git commit: Even more Checkstyle fixes
Even more Checkstyle fixes
Project: http://git-wip-us.apache.org/repos/asf/maven-resolver/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/c5aaff39
Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/c5aaff39
Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/c5aaff39
Branch: refs/heads/master
Commit: c5aaff3900887c5f729633595e257bf1e643a98d
Parents: cb775bb
Author: Michael Osipov <mi...@apache.org>
Authored: Mon Nov 7 23:03:18 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Mon Nov 7 23:03:18 2016 +0100
----------------------------------------------------------------------
.../basic/BasicRepositoryConnectorFactory.java | 4 ++--
.../aether/internal/impl/DefaultRepositorySystem.java | 14 +++++++-------
.../internal/test/util/TestVersionConstraint.java | 4 ++--
.../transport/wagon/PlexusWagonConfigurator.java | 4 ++--
.../internal/transport/wagon/PlexusWagonProvider.java | 4 ++--
.../util/concurrency/RunnableErrorForwarder.java | 4 ++--
.../graph/visitor/FilteringDependencyVisitor.java | 4 ++--
.../ConservativeAuthenticationSelector.java | 4 ++--
.../util/repository/ConservativeProxySelector.java | 4 ++--
.../aether/util/version/GenericVersionConstraint.java | 4 ++--
10 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
----------------------------------------------------------------------
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
index f308d0c..006e4f5 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.connector.basic;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,6 +22,8 @@ import java.util.Objects;
import javax.inject.Inject;
import javax.inject.Named;
+import java.util.Objects;
+
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.RepositoryConnector;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
index 9a321d9..777d149 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
@@ -429,13 +429,13 @@ public class DefaultRepositorySystem
private void validateSession( RepositorySystemSession session )
{
Objects.requireNonNull( session, "repository system session cannot be null" );
- invalidSession(session.getLocalRepositoryManager(), "local repository manager" );
- invalidSession(session.getSystemProperties(), "system properties" );
- invalidSession(session.getConfigProperties(), "config properties" );
- invalidSession(session.getMirrorSelector(), "mirror selector" );
- invalidSession(session.getProxySelector(), "proxy selector" );
- invalidSession(session.getAuthenticationSelector(), "authentication selector" );
- invalidSession(session.getArtifactTypeRegistry(), "artifact type registry" );
+ invalidSession( session.getLocalRepositoryManager(), "local repository manager" );
+ invalidSession( session.getSystemProperties(), "system properties" );
+ invalidSession( session.getConfigProperties(), "config properties" );
+ invalidSession( session.getMirrorSelector(), "mirror selector" );
+ invalidSession( session.getProxySelector(), "proxy selector" );
+ invalidSession( session.getAuthenticationSelector(), "authentication selector" );
+ invalidSession( session.getArtifactTypeRegistry(), "artifact type registry" );
}
private void invalidSession( Object obj, String name )
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
----------------------------------------------------------------------
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
index 09f92e8..3ba5567 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.internal.test.util;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.eclipse.aether.version.Version;
import org.eclipse.aether.version.VersionConstraint;
import org.eclipse.aether.version.VersionRange;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
index 94647c7..5f10cac 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.internal.transport.wagon;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
----------------------------------------------------------------------
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
index 3b41f47..aed2f4d 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.internal.transport.wagon;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
----------------------------------------------------------------------
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
index bf9f4aa..78d3ac2 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.util.concurrency;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
----------------------------------------------------------------------
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
index b617388..3c824fa 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.util.graph.visitor;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.graph.DependencyVisitor;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
----------------------------------------------------------------------
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
index 0419015..ace0957 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.util.repository;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.eclipse.aether.repository.Authentication;
import org.eclipse.aether.repository.AuthenticationSelector;
import org.eclipse.aether.repository.RemoteRepository;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
----------------------------------------------------------------------
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
index 402250b..d65212e 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.util.repository;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.eclipse.aether.repository.Proxy;
import org.eclipse.aether.repository.ProxySelector;
import org.eclipse.aether.repository.RemoteRepository;
http://git-wip-us.apache.org/repos/asf/maven-resolver/blob/c5aaff39/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
----------------------------------------------------------------------
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
index 9191f1d..6a863a6 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
@@ -1,7 +1,5 @@
package org.eclipse.aether.util.version;
-import java.util.Objects;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.util.Objects;
* under the License.
*/
+import java.util.Objects;
+
import org.eclipse.aether.version.Version;
import org.eclipse.aether.version.VersionConstraint;
import org.eclipse.aether.version.VersionRange;