From 35b9d706670dab074482a3990dcc66cf3d94bab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Fri, 21 Jan 2022 14:34:04 +0100 Subject: [PATCH] style: setup & apply prettier --- .prettierrc | 2 ++ pom.xml | 17 +++++++++++++++++ .../dynamicrouting/DynamicRoutingPolicy.java | 17 ++++++++--------- .../DynamicRoutingPolicyConfiguration.java | 1 - .../dynamicrouting/configuration/Rule.java | 5 ++--- .../DynamicRoutingPolicyTest.java | 15 +++++++-------- .../DynamicRoutingPolicyConfigurationTest.java | 8 +++----- 7 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..aa85a8f --- /dev/null +++ b/.prettierrc @@ -0,0 +1,2 @@ +printWidth: 140 +tabWidth: 4 diff --git a/pom.xml b/pom.xml index b11563a..cd07e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -153,6 +153,23 @@ + + com.hubspot.maven.plugins + prettier-maven-plugin + 0.17 + + 12.13.0 + 1.6.1 + + + + validate + + check + + + + diff --git a/src/main/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicy.java b/src/main/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicy.java index 983c1e5..62875a5 100644 --- a/src/main/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicy.java +++ b/src/main/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicy.java @@ -24,9 +24,6 @@ import io.gravitee.policy.api.annotations.OnRequest; import io.gravitee.policy.dynamicrouting.configuration.DynamicRoutingPolicyConfiguration; import io.gravitee.policy.dynamicrouting.configuration.Rule; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.Charset; @@ -37,6 +34,8 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author David BRASSELY (david.brassely at graviteesource.com) @@ -50,10 +49,10 @@ public class DynamicRoutingPolicy { */ private static final Logger LOGGER = LoggerFactory.getLogger(DynamicRoutingPolicy.class); - private final static Pattern GROUP_NAME_PATTERN = Pattern.compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>"); + private static final Pattern GROUP_NAME_PATTERN = Pattern.compile("\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>"); - private final static String GROUP_ATTRIBUTE = "group"; - private final static String GROUP_NAME_ATTRIBUTE = "groupName"; + private static final String GROUP_ATTRIBUTE = "group"; + private static final String GROUP_NAME_ATTRIBUTE = "groupName"; /** * The associated configuration to this Policy @@ -75,7 +74,6 @@ public void onRequest(Request request, Response response, ExecutionContext execu String decodedSubPath = URLDecoder.decode(request.pathInfo(), Charset.defaultCharset().name()); String originalSubPath = request.pathInfo(); - LOGGER.debug("Dynamic routing for path {}", originalSubPath); Rule rule = null; Pattern pattern = null; @@ -109,8 +107,9 @@ public void onRequest(Request request, Response response, ExecutionContext execu // Extract capture group by name Set extractedGroupNames = getNamedGroupCandidates(pattern.pattern()); - Map groupNames = extractedGroupNames.stream().collect( - Collectors.toMap(groupName -> groupName, match::group)); + Map groupNames = extractedGroupNames + .stream() + .collect(Collectors.toMap(groupName -> groupName, match::group)); executionContext.getTemplateEngine().getTemplateContext().setVariable(GROUP_NAME_ATTRIBUTE, groupNames); // Given endpoint can be defined as the template using EL diff --git a/src/main/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfiguration.java b/src/main/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfiguration.java index 72614ca..17fa23c 100644 --- a/src/main/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfiguration.java +++ b/src/main/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfiguration.java @@ -16,7 +16,6 @@ package io.gravitee.policy.dynamicrouting.configuration; import io.gravitee.policy.api.PolicyConfiguration; - import java.util.List; /** diff --git a/src/main/java/io/gravitee/policy/dynamicrouting/configuration/Rule.java b/src/main/java/io/gravitee/policy/dynamicrouting/configuration/Rule.java index 079e499..3eaf3ba 100644 --- a/src/main/java/io/gravitee/policy/dynamicrouting/configuration/Rule.java +++ b/src/main/java/io/gravitee/policy/dynamicrouting/configuration/Rule.java @@ -24,9 +24,8 @@ public final class Rule { private String pattern; private String url; - - public Rule() { - } + + public Rule() {} public Rule(String pattern, String url) { this.pattern = pattern; diff --git a/src/test/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicyTest.java b/src/test/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicyTest.java index 72179cc..223f447 100644 --- a/src/test/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicyTest.java +++ b/src/test/java/io/gravitee/policy/dynamicrouting/DynamicRoutingPolicyTest.java @@ -15,6 +15,9 @@ */ package io.gravitee.policy.dynamicrouting; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.*; + import io.gravitee.el.TemplateContext; import io.gravitee.el.TemplateEngine; import io.gravitee.gateway.api.ExecutionContext; @@ -24,20 +27,16 @@ import io.gravitee.policy.api.PolicyResult; import io.gravitee.policy.dynamicrouting.configuration.DynamicRoutingPolicyConfiguration; import io.gravitee.policy.dynamicrouting.configuration.Rule; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.PatternSyntaxException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.PatternSyntaxException; - -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.*; - /** * @author David BRASSELY (david.brassely at graviteesource.com) * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) diff --git a/src/test/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfigurationTest.java b/src/test/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfigurationTest.java index 90ce99a..3197cb0 100644 --- a/src/test/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfigurationTest.java +++ b/src/test/java/io/gravitee/policy/dynamicrouting/configuration/DynamicRoutingPolicyConfigurationTest.java @@ -16,11 +16,10 @@ package io.gravitee.policy.dynamicrouting.configuration; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Assert; -import org.junit.Test; - import java.io.IOException; import java.net.URL; +import org.junit.Assert; +import org.junit.Test; /** * @author David BRASSELY (david.brassely at graviteesource.com) @@ -30,8 +29,7 @@ public class DynamicRoutingPolicyConfigurationTest { @Test public void testConfiguration_singleRule() throws IOException { - DynamicRoutingPolicyConfiguration configuration = - load("/io/gravitee/policy/dynamicrouting/configuration/configuration1.json"); + DynamicRoutingPolicyConfiguration configuration = load("/io/gravitee/policy/dynamicrouting/configuration/configuration1.json"); Assert.assertEquals(1, configuration.getRules().size()); }