This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit e63792ff182eefe3dd312c86b11b2b907d8c32d0 Author: luke.me <[email protected]> AuthorDate: Mon Jun 19 16:23:26 2023 +0900 Change to Checkstyle format --- .../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 4 ++-- .../org/apache/camel/impl/engine/DefaultCamelContextTest.java | 8 +++----- .../src/main/java/org/apache/camel/util/URISupport.java | 8 ++++---- .../src/test/java/org/apache/camel/util/URISupportTest.java | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java index 0439da8df0c..e22568d641e 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java @@ -711,10 +711,10 @@ public abstract class AbstractCamelContext extends BaseService stopServices(oldEndpoint); } else { String decodeUri = URISupport.getDecodeQuery(uri); - if(decodeUri != null) { + if (decodeUri != null) { oldEndpoint = endpoints.remove(getEndpointKey(decodeUri)); } - if(oldEndpoint != null){ + if (oldEndpoint != null) { answer.add(oldEndpoint); stopServices(oldEndpoint); } else { diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java index 336f681ccab..1de5a3a9e8d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java @@ -40,7 +40,6 @@ import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.DefaultUuidGenerator; import org.apache.camel.support.NormalizedUri; import org.apache.camel.support.service.ServiceSupport; -import org.apache.camel.util.StringHelper; import org.apache.camel.util.URISupport; import org.junit.jupiter.api.Test; @@ -434,11 +433,11 @@ public class DefaultCamelContextTest extends TestSupport { EndpointRegistry<NormalizedUri> endpoints = ctx.getEndpointRegistry(); Map<String, RouteService> routeServices = ctx.getRouteServices(); - Set<Endpoint> routeEndpoints = routeServices.get("rawRoute").gatherEndpoints(); + Set<Endpoint> routeEndpoints = routeServices.get("rawRoute").gatherEndpoints(); - for(Endpoint endpoint : routeEndpoints) { + for (Endpoint endpoint : routeEndpoints) { Endpoint oldEndpoint = endpoints.remove(ctx.getEndpointKey(endpoint.getEndpointUri())); - if(oldEndpoint == null) { + if (oldEndpoint == null) { String decodeUri = URISupport.getDecodeQuery(endpoint.getEndpointUri()); oldEndpoint = endpoints.remove(ctx.getEndpointKey(decodeUri)); @@ -450,7 +449,6 @@ public class DefaultCamelContextTest extends TestSupport { } - private static class MyService extends ServiceSupport implements CamelContextAware { private CamelContext camelContext; diff --git a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java index 40cc7b92e2a..9e1df36550c 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java @@ -753,7 +753,7 @@ public final class URISupport { return rc; } - private static String makeUri(String uriWithoutQuery, String query){ + private static String makeUri(String uriWithoutQuery, String query) { int len = uriWithoutQuery.length(); if (query != null) { len += 1 + query.length(); @@ -772,9 +772,9 @@ public final class URISupport { URI u = new URI(uri); String query = URISupport.prepareQuery(u); String uriWithoutQuery = URISupport.stripQuery(uri); - if(query == null){ + if (query == null) { return uriWithoutQuery; - }else { + } else { Map<String, Object> parameters = URISupport.parseQuery(query, false, false); if (parameters.size() == 1) { // only 1 parameter need to create new query string @@ -791,7 +791,7 @@ public final class URISupport { return makeUri(uriWithoutQuery, query); } } - }catch(URISyntaxException ex){ + } catch (URISyntaxException ex) { return null; } } diff --git a/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java b/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java index 832206e15d4..14a4cdb5856 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java @@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -614,7 +614,7 @@ public class URISupportTest { } @Test - public void testGetDecodeQuery() throws Exception{ + public void testGetDecodeQuery() throws Exception { String out = URISupport.normalizeUri("smtp://localhost?username=davsclaus&password=secret"); String enc = UnsafeUriCharactersEncoder.encode(out); String dec = URISupport.getDecodeQuery(enc);
