You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/07/02 05:50:10 UTC
[camel-k-runtime] 10/13: checkstyle: fix camel-k-maven-plugin
violations
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 9626991d6a4d10a4e8121de143c15d83f8c503de
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Jun 25 14:13:29 2019 +0200
checkstyle: fix camel-k-maven-plugin violations
---
.../camel/k/tooling/maven/model/Artifact.java | 5 +++--
.../camel/k/tooling/maven/model/CamelScheme.java | 6 +++---
...gProcessor_3_x.java => CatalogProcessor3x.java} | 2 +-
...he.camel.k.tooling.maven.model.CatalogProcessor | 2 +-
.../processors/AbstractCataloProcessorTest.java | 2 +-
.../maven/processors/CatalogProcessor3Test.java | 24 +++++++++++-----------
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
index 12235f2..86ce6eb 100644
--- a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
+++ b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
@@ -56,8 +56,9 @@ public class Artifact {
return false;
}
Artifact artifact = (Artifact) o;
- return Objects.equals(groupId, artifact.groupId) &&
- Objects.equals(artifactId, artifact.artifactId);
+
+ return Objects.equals(groupId, artifact.groupId)
+ && Objects.equals(artifactId, artifact.artifactId);
}
@Override
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
index cc568af..51c0227 100644
--- a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
+++ b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
@@ -59,9 +59,9 @@ public class CamelScheme {
return false;
}
CamelScheme scheme = (CamelScheme) o;
- return isHttp() == scheme.isHttp() &&
- isPassive() == scheme.isPassive() &&
- Objects.equals(getId(), scheme.getId());
+ return isHttp() == scheme.isHttp()
+ && isPassive() == scheme.isPassive()
+ && Objects.equals(getId(), scheme.getId());
}
@Override
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
similarity index 99%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
rename to camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
index 37271a5..8d21e7f 100644
--- a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
+++ b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
@@ -26,7 +26,7 @@ import org.apache.camel.k.tooling.maven.model.CamelArtifact;
import org.apache.camel.k.tooling.maven.model.CatalogProcessor;
import org.apache.maven.project.MavenProject;
-public class CatalogProcessor_3_x implements CatalogProcessor {
+public class CatalogProcessor3x implements CatalogProcessor {
private static final List<String> KNOWN_HTTP_URIS = Arrays.asList(
"ahc",
"ahc-ws",
diff --git a/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor b/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
index aa4e3bc..28059d1 100644
--- a/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
+++ b/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.camel.k.tooling.maven.processors.CatalogProcessor_3_x
+org.apache.camel.k.tooling.maven.processors.CatalogProcessor3x
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
index 5b7da7a..84503be 100644
--- a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
+++ b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
public abstract class AbstractCataloProcessorTest {
- protected CamelCatalog versionCamelCatalog(String version){
+ protected CamelCatalog versionCamelCatalog(String version) {
return new DefaultCamelCatalog() {
@Override
public String getCatalogVersion() {
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
index 9fe2af5..88b3b8c 100644
--- a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
+++ b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
@@ -29,8 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
@Test
- public void testAcceptHyphen(){
- CatalogProcessor_3_x cp3 = new CatalogProcessor_3_x();
+ public void testAcceptHyphen() {
+ CatalogProcessor3x cp3 = new CatalogProcessor3x();
CamelCatalog catalog = versionCamelCatalog("3.0.0.acme-123456");
@@ -38,8 +38,8 @@ public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
}
@Test
- public void testAcceptEqualToLower(){
- CatalogProcessor_3_x cp3 = new CatalogProcessor_3_x();
+ public void testAcceptEqualToLower() {
+ CatalogProcessor3x cp3 = new CatalogProcessor3x();
CamelCatalog catalog = versionCamelCatalog("3.0.0");
@@ -47,8 +47,8 @@ public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
}
@Test
- public void testAcceptLessThanLower(){
- CatalogProcessor_3_x cp3 = new CatalogProcessor_3_x();
+ public void testAcceptLessThanLower() {
+ CatalogProcessor3x cp3 = new CatalogProcessor3x();
CamelCatalog catalog = versionCamelCatalog("2.17.0");
@@ -56,8 +56,8 @@ public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
}
@Test
- public void testAcceptEqualToHigher(){
- CatalogProcessor_3_x cp3 = new CatalogProcessor_3_x();
+ public void testAcceptEqualToHigher() {
+ CatalogProcessor3x cp3 = new CatalogProcessor3x();
CamelCatalog catalog = versionCamelCatalog("4.0.0");
@@ -65,8 +65,8 @@ public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
}
@Test
- public void testAcceptMoreThanHigher(){
- CatalogProcessor_3_x cp3 = new CatalogProcessor_3_x();
+ public void testAcceptMoreThanHigher() {
+ CatalogProcessor3x cp3 = new CatalogProcessor3x();
CamelCatalog catalog = versionCamelCatalog("5.0.0");
@@ -74,8 +74,8 @@ public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
}
@Test
- public void testArtifactsEnrichment(){
- CatalogProcessor processor = new CatalogProcessor_3_x();
+ public void testArtifactsEnrichment() {
+ CatalogProcessor processor = new CatalogProcessor3x();
CamelCatalog catalog = versionCamelCatalog("3.0.0");
Map<String, CamelArtifact> artifactMap = new HashMap<>();