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 40cb5f6d76c592364fe4f0dbb687b6d0d60d39f8
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Tue Jun 25 14:49:03 2019 +0200
checkstyle: fix camel-knative violations
---
.../component/knative/KnativeEnvironment.java | 62 +++++++++++-----------
.../org/apache/camel/component/knative/ce/V01.java | 6 +--
.../org/apache/camel/component/knative/ce/V02.java | 6 +--
.../component/knative/CloudEventsV01Test.java | 24 ++++-----
.../component/knative/CloudEventsV02Test.java | 26 ++++-----
.../component/knative/KnativeComponentTest.java | 12 ++---
6 files changed, 68 insertions(+), 68 deletions(-)
diff --git
a/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEnvironment.java
b/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEnvironment.java
index fffdf35..14e7b51 100644
---
a/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEnvironment.java
+++
b/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEnvironment.java
@@ -80,36 +80,36 @@ public class KnativeEnvironment {
@SuppressWarnings("unchecked")
private Optional<KnativeServiceDefinition> lookup(Knative.Type type,
String name) {
- final String contextPath = StringHelper.after(name, "/");
- final String serviceName = (contextPath == null) ? name :
StringHelper.before(name, "/");
-
- return services.stream()
- .filter(definition -> {
- return Objects.equals(type.name(),
definition.getMetadata().get(Knative.KNATIVE_TYPE))
- && Objects.equals(serviceName, definition.getName());
- })
- .map(definition -> {
- //
- // The context path set on the endpoint overrides the one
- // eventually provided by the service definition.
- //
- if (contextPath != null) {
- return new KnativeServiceDefinition(
- definition.getType(),
- definition.getProtocol(),
- definition.getName(),
- definition.getHost(),
- definition.getPort(),
- KnativeSupport.mergeMaps(
- definition.getMetadata(),
-
Collections.singletonMap(Knative.SERVICE_META_PATH, "/" + contextPath)
- )
- );
- }
-
- return definition;
- })
- .findFirst();
+ final String contextPath = StringHelper.after(name, "/");
+ final String serviceName = (contextPath == null) ? name :
StringHelper.before(name, "/");
+
+ return services.stream()
+ .filter(definition -> {
+ return Objects.equals(type.name(),
definition.getMetadata().get(Knative.KNATIVE_TYPE))
+ && Objects.equals(serviceName, definition.getName());
+ })
+ .map(definition -> {
+ //
+ // The context path set on the endpoint overrides the one
+ // eventually provided by the service definition.
+ //
+ if (contextPath != null) {
+ return new KnativeServiceDefinition(
+ definition.getType(),
+ definition.getProtocol(),
+ definition.getName(),
+ definition.getHost(),
+ definition.getPort(),
+ KnativeSupport.mergeMaps(
+ definition.getMetadata(),
+
Collections.singletonMap(Knative.SERVICE_META_PATH, "/" + contextPath)
+ )
+ );
+ }
+
+ return definition;
+ })
+ .findFirst();
}
@@ -178,7 +178,7 @@ public class KnativeEnvironment {
// ************************
@SuppressWarnings("unchecked")
- public final static class KnativeServiceDefinition extends
DefaultServiceDefinition {
+ public static final class KnativeServiceDefinition extends
DefaultServiceDefinition {
@JsonCreator
public KnativeServiceDefinition(
@JsonProperty(value = "type", required = true) Knative.Type type,
diff --git
a/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V01.java
b/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V01.java
index 703d099..6921e7c 100644
--- a/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V01.java
+++ b/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V01.java
@@ -35,9 +35,6 @@ import org.apache.commons.lang3.StringUtils;
import static org.apache.camel.util.ObjectHelper.ifNotEmpty;
final class V01 {
- private V01() {
- }
-
public static final Function<KnativeEndpoint, Processor> PRODUCER =
(KnativeEndpoint endpoint) -> {
KnativeEnvironment.KnativeServiceDefinition service =
endpoint.getService();
String uri = endpoint.getEndpointUri();
@@ -103,4 +100,7 @@ final class V01 {
}
};
};
+
+ private V01() {
+ }
}
diff --git
a/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V02.java
b/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V02.java
index 5e8b2c7..857d87c 100644
--- a/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V02.java
+++ b/camel-knative/src/main/java/org/apache/camel/component/knative/ce/V02.java
@@ -35,9 +35,6 @@ import org.apache.commons.lang3.StringUtils;
import static org.apache.camel.util.ObjectHelper.ifNotEmpty;
final class V02 {
- private V02() {
- }
-
public static final Function<KnativeEndpoint, Processor> PRODUCER =
(KnativeEndpoint endpoint) -> {
KnativeEnvironment.KnativeServiceDefinition service =
endpoint.getService();
String uri = endpoint.getEndpointUri();
@@ -103,4 +100,7 @@ final class V02 {
}
};
};
+
+ private V02() {
+ }
}
diff --git
a/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV01Test.java
b/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV01Test.java
index faedb3b..189c79d 100644
---
a/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV01Test.java
+++
b/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV01Test.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.knative;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -28,10 +32,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-
public class CloudEventsV01Test {
private CamelContext context;
@@ -186,16 +186,16 @@ public class CloudEventsV01Test {
mock2.expectedBodiesReceived("test2");
context.createProducerTemplate().send(
- "direct:source",
- e -> {
- e.getIn().setBody("test");
- }
+ "direct:source",
+ e -> {
+ e.getIn().setBody("test");
+ }
);
context.createProducerTemplate().send(
- "direct:source2",
- e -> {
- e.getIn().setBody("test2");
- }
+ "direct:source2",
+ e -> {
+ e.getIn().setBody("test2");
+ }
);
mock.assertIsSatisfied();
diff --git
a/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV02Test.java
b/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV02Test.java
index aff9a82..54dc2d0 100644
---
a/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV02Test.java
+++
b/camel-knative/src/test/java/org/apache/camel/component/knative/CloudEventsV02Test.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.knative;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -28,10 +32,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-
public class CloudEventsV02Test {
private CamelContext context;
@@ -59,7 +59,7 @@ public class CloudEventsV02Test {
// Tests
//
// **************************
-
+
@Test
void testInvokeEndpoint() throws Exception {
final int port = AvailablePortFinder.getNextAvailable();
@@ -186,16 +186,16 @@ public class CloudEventsV02Test {
mock2.expectedBodiesReceived("test2");
context.createProducerTemplate().send(
- "direct:source",
- e -> {
- e.getIn().setBody("test");
- }
+ "direct:source",
+ e -> {
+ e.getIn().setBody("test");
+ }
);
context.createProducerTemplate().send(
- "direct:source2",
- e -> {
- e.getIn().setBody("test2");
- }
+ "direct:source2",
+ e -> {
+ e.getIn().setBody("test2");
+ }
);
mock.assertIsSatisfied();
diff --git
a/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
b/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
index f85a6af..5a956f1 100644
---
a/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
+++
b/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java
@@ -16,6 +16,12 @@
*/
package org.apache.camel.component.knative;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -30,12 +36,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Properties;
-
import static
org.apache.camel.component.knative.KnativeEnvironment.mandatoryLoadFromResource;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
