Skip to content

Commit c9cf7b5

Browse files
oschwaldoschwald
authored
Merge pull request #259 from maxmind/sromani/checkstyle
Add google style
2 parents 5301df7 + 0da4a62 commit c9cf7b5

24 files changed

Lines changed: 514 additions & 46 deletions

‎checkstyle.xml‎

Lines changed: 382 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
</developers>
3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40+
<checkstyle-maven-plugin.version>3.2.0</checkstyle-maven-plugin.version>
41+
<checkstyle.version>10.3</checkstyle.version>
42+
<checkstyle.config.location>checkstyle.xml</checkstyle.config.location>
43+
<checkstyle.suppressions.location>suppressions.xml</checkstyle.suppressions.location>
4044
</properties>
4145
<dependencies>
4246
<dependency>
@@ -108,6 +112,46 @@
108112
</dependencies>
109113
<build>
110114
<plugins>
115+
<plugin>
116+
<groupId>org.openrewrite.maven</groupId>
117+
<artifactId>rewrite-maven-plugin</artifactId>
118+
<version>4.37.0</version>
119+
<configuration>
120+
<activeRecipes>
121+
<recipe>org.openrewrite.java.cleanup.Cleanup</recipe>
122+
</activeRecipes>
123+
</configuration>
124+
</plugin>
125+
<plugin>
126+
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-checkstyle-plugin</artifactId>
129+
<version>${checkstyle-maven-plugin.version}</version>
130+
<configuration>
131+
<consoleOutput>true</consoleOutput>
132+
</configuration>
133+
<dependencies>
134+
<dependency>
135+
<groupId>com.puppycrawl.tools</groupId>
136+
<artifactId>checkstyle</artifactId>
137+
<version>${checkstyle.version}</version>
138+
</dependency>
139+
</dependencies>
140+
<executions>
141+
<execution>
142+
<id>validate</id>
143+
<phase>validate</phase>
144+
<goals>
145+
<goal>check</goal>
146+
</goals>
147+
</execution>
148+
</executions>
149+
</plugin>
150+
<plugin>
151+
<groupId>org.apache.maven.plugins</groupId>
152+
<artifactId>maven-site-plugin</artifactId>
153+
<version>3.9.1</version>
154+
</plugin>
111155
<plugin>
112156
<groupId>org.apache.maven.plugins</groupId>
113157
<artifactId>maven-assembly-plugin</artifactId>
@@ -220,4 +264,24 @@
220264
<artifactId>oss-parent</artifactId>
221265
<version>7</version>
222266
</parent>
267+
268+
<reporting>
269+
<plugins>
270+
<plugin>
271+
<groupId>org.apache.maven.plugins</groupId>
272+
<artifactId>maven-checkstyle-plugin</artifactId>
273+
<version>${checkstyle-maven-plugin.version}</version>
274+
<reportSets>
275+
<reportSet>
276+
<reports>
277+
<report>checkstyle</report>
278+
</reports>
279+
<configuration>
280+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
281+
</configuration>
282+
</reportSet>
283+
</reportSets>
284+
</plugin>
285+
</plugins>
286+
</reporting>
223287
</project>

‎src/main/java/com/maxmind/minfraud/Mapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1111

1212
class Mapper {
13-
private final static ObjectMapper mapper = JsonMapper.builder()
13+
private static final ObjectMapper mapper = JsonMapper.builder()
1414
.addModule(new JavaTimeModule())
1515
.defaultDateFormat(new StdDateFormat().withColonInTimeZone(true))
1616
.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)

‎src/main/java/com/maxmind/minfraud/WebServiceClient.java‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,36 @@
33
import com.fasterxml.jackson.core.type.TypeReference;
44
import com.fasterxml.jackson.databind.InjectableValues;
55
import com.fasterxml.jackson.databind.InjectableValues.Std;
6-
import com.maxmind.minfraud.exception.*;
6+
import com.maxmind.minfraud.exception.AuthenticationException;
7+
import com.maxmind.minfraud.exception.HttpException;
8+
import com.maxmind.minfraud.exception.InsufficientFundsException;
9+
import com.maxmind.minfraud.exception.InvalidRequestException;
10+
import com.maxmind.minfraud.exception.MinFraudException;
11+
import com.maxmind.minfraud.exception.PermissionRequiredException;
712
import com.maxmind.minfraud.request.Transaction;
813
import com.maxmind.minfraud.request.TransactionReport;
914
import com.maxmind.minfraud.response.FactorsResponse;
1015
import com.maxmind.minfraud.response.InsightsResponse;
1116
import com.maxmind.minfraud.response.ScoreResponse;
12-
1317
import java.io.Closeable;
1418
import java.io.IOException;
1519
import java.io.InputStream;
16-
import java.net.*;
20+
import java.net.InetSocketAddress;
21+
import java.net.Proxy;
22+
import java.net.ProxySelector;
23+
import java.net.URI;
24+
import java.net.URISyntaxException;
1725
import java.net.http.HttpClient;
1826
import java.net.http.HttpRequest;
1927
import java.net.http.HttpResponse;
2028
import java.nio.charset.StandardCharsets;
2129
import java.time.Duration;
22-
import java.util.*;
30+
import java.util.ArrayList;
31+
import java.util.Base64;
32+
import java.util.Collections;
33+
import java.util.HashMap;
34+
import java.util.List;
35+
import java.util.Map;
2336

2437
/**
2538
* Client for MaxMind minFraud Score, Insights, and Factors
@@ -48,8 +61,8 @@ private WebServiceClient(WebServiceClient.Builder builder) {
4861
// HttpClient supports basic auth, but it will only send it after the
4962
// server responds with an unauthorized. As such, we just make the
5063
// Authorization header ourselves.
51-
authHeader = "Basic " +
52-
Base64.getEncoder()
64+
authHeader = "Basic "
65+
+ Base64.getEncoder()
5366
.encodeToString((builder.accountId + ":" + builder.licenseKey)
5467
.getBytes(StandardCharsets.UTF_8));
5568

@@ -502,12 +515,12 @@ public void close() throws IOException {
502515

503516
@Override
504517
public String toString() {
505-
return "WebServiceClient{" +
506-
"host='" + host + '\'' +
507-
", port=" + port +
508-
", useHttps=" + useHttps +
509-
", locales=" + locales +
510-
", httpClient=" + httpClient +
511-
'}';
518+
return "WebServiceClient{"
519+
+ "host='" + host + '\''
520+
+ ", port=" + port
521+
+ ", useHttps=" + useHttps
522+
+ ", locales=" + locales
523+
+ ", httpClient=" + httpClient
524+
+ '}';
512525
}
513526
}

‎src/main/java/com/maxmind/minfraud/request/AbstractLocation.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.maxmind.minfraud.AbstractModel;
5-
65
import java.util.regex.Pattern;
76

87
/**

‎src/main/java/com/maxmind/minfraud/request/Account.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.maxmind.minfraud.AbstractModel;
5-
65
import java.math.BigInteger;
7-
import java.nio.charset.Charset;
86
import java.nio.charset.StandardCharsets;
97
import java.security.MessageDigest;
108
import java.security.NoSuchAlgorithmException;

‎src/main/java/com/maxmind/minfraud/request/CreditCard.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.fasterxml.jackson.annotation.JsonProperty;
55
import com.maxmind.minfraud.AbstractModel;
6-
76
import java.util.regex.Pattern;
87

98
/**

‎src/main/java/com/maxmind/minfraud/request/CustomInputs.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.JsonAnyGetter;
44
import com.maxmind.minfraud.AbstractModel;
5-
65
import java.util.HashMap;
76
import java.util.Map;
87
import java.util.regex.Pattern;
@@ -41,10 +40,11 @@ public static class Builder {
4140
*/
4241
public Builder put(String key, String value) {
4342
validateKey(key);
44-
if (value.length() > 255 || value.contains("\n"))
45-
throw new IllegalArgumentException("The custom input string " +
46-
value + " is invalid. The string be less than" +
47-
"256 characters and the string must not contain a newline.");
43+
if (value.length() > 255 || value.contains("\n")) {
44+
throw new IllegalArgumentException("The custom input string "
45+
+ value + " is invalid. The string be less than"
46+
+ "256 characters and the string must not contain a newline.");
47+
}
4848
inputs.put(key, value);
4949
return this;
5050
}
@@ -62,11 +62,12 @@ public Builder put(String key, String value) {
6262
public Builder put(String key, Number value) {
6363
validateKey(key);
6464
double doubleValue = value.doubleValue();
65-
if (doubleValue <= -NUM_MAX || doubleValue >= NUM_MAX)
65+
if (doubleValue <= -NUM_MAX || doubleValue >= NUM_MAX) {
6666
throw new IllegalArgumentException(
67-
"The custom input number " + value + "is invalid. " +
68-
"The number must be between -" + NUM_MAX +
69-
" and " + NUM_MAX + ", exclusive.");
67+
"The custom input number " + value + "is invalid. "
68+
+ "The number must be between -" + NUM_MAX
69+
+ " and " + NUM_MAX + ", exclusive.");
70+
}
7071
inputs.put(key, value);
7172
return this;
7273
}

‎src/main/java/com/maxmind/minfraud/request/Device.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.maxmind.minfraud.AbstractModel;
5-
65
import java.net.InetAddress;
76

87
/**

‎src/main/java/com/maxmind/minfraud/request/Email.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import com.maxmind.minfraud.AbstractModel;
5-
import org.apache.commons.validator.routines.DomainValidator;
6-
import org.apache.commons.validator.routines.EmailValidator;
7-
85
import java.math.BigInteger;
96
import java.net.IDN;
10-
import java.nio.charset.Charset;
117
import java.nio.charset.StandardCharsets;
128
import java.security.MessageDigest;
139
import java.security.NoSuchAlgorithmException;
1410
import java.util.Collections;
1511
import java.util.HashMap;
1612
import java.util.Map;
13+
import org.apache.commons.validator.routines.DomainValidator;
14+
import org.apache.commons.validator.routines.EmailValidator;
1715

1816
/**
1917
* The email information for the transaction.

0 commit comments

Comments
 (0)