Skip to content

Commit

Permalink
style: setup & apply prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
gaetanmaisse authored and ThibaudAV committed Jan 24, 2022
1 parent 979716d commit 35b9d70
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
printWidth: 140
tabWidth: 4
17 changes: 17 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.hubspot.maven.plugins</groupId>
<artifactId>prettier-maven-plugin</artifactId>
<version>0.17</version>
<configuration>
<nodeVersion>12.13.0</nodeVersion>
<prettierJavaVersion>1.6.1</prettierJavaVersion>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -109,8 +107,9 @@ public void onRequest(Request request, Response response, ExecutionContext execu

// Extract capture group by name
Set<String> extractedGroupNames = getNamedGroupCandidates(pattern.pattern());
Map<String, String> groupNames = extractedGroupNames.stream().collect(
Collectors.toMap(groupName -> groupName, match::group));
Map<String, String> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package io.gravitee.policy.dynamicrouting.configuration;

import io.gravitee.policy.api.PolicyConfiguration;

import java.util.List;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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());
}
Expand Down

0 comments on commit 35b9d70

Please sign in to comment.