Skip to content

Commit ae7b910

Browse files
kinowkinow
committed
Optimize imports, fix IDE warnings, update Maven and Java dependencies
1 parent 40c44dc commit ae7b910

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

‎pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<properties>
5656
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
5757
<junit.version>5.9.1</junit.version>
58-
<commons.lang.version>2.6</commons.lang.version>
58+
<commons.lang.version>3.18.0</commons.lang.version>
5959
<jacoco.version>0.8.5</jacoco.version>
6060
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
6161
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -100,12 +100,12 @@
100100
<extension>
101101
<groupId>org.apache.maven.scm</groupId>
102102
<artifactId>maven-scm-provider-gitexe</artifactId>
103-
<version>1.9</version>
103+
<version>2.1.0</version>
104104
</extension>
105105
<extension>
106106
<groupId>org.apache.maven.scm</groupId>
107107
<artifactId>maven-scm-manager-plexus</artifactId>
108-
<version>1.9</version>
108+
<version>2.1.0</version>
109109
</extension>
110110
<extension>
111111
<groupId>com.github.stephenc.wagon</groupId>
@@ -117,7 +117,7 @@
117117
<plugin>
118118
<groupId>org.apache.maven.plugins</groupId>
119119
<artifactId>maven-compiler-plugin</artifactId>
120-
<version>2.3.2</version>
120+
<version>3.14.0</version>
121121
<configuration>
122122
<source>${java.version}</source>
123123
<target>${java.version}</target>
@@ -126,13 +126,13 @@
126126
<plugin>
127127
<groupId>org.apache.maven.plugins</groupId>
128128
<artifactId>maven-surefire-plugin</artifactId>
129-
<version>2.22.2</version>
129+
<version>3.5.3</version>
130130
</plugin>
131131
<!-- Coverage -->
132132
<plugin>
133133
<groupId>org.jacoco</groupId>
134134
<artifactId>jacoco-maven-plugin</artifactId>
135-
<version>0.7.7.201606060606</version>
135+
<version>0.8.13</version>
136136
<executions>
137137
<execution>
138138
<goals>
@@ -156,7 +156,7 @@
156156
<plugin>
157157
<groupId>org.apache.maven.plugins</groupId>
158158
<artifactId>maven-javadoc-plugin</artifactId>
159-
<version>2.9</version>
159+
<version>3.27.0</version>
160160
</plugin>
161161
<plugin>
162162
<groupId>org.apache.maven.plugins</groupId>
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-changes-plugin</artifactId>
172-
<version>2.3</version>
172+
<version>3.0.0-M3</version>
173173
<configuration>
174174
<issueLinkTemplate>%URL%/issues/%ISSUE%</issueLinkTemplate>
175175
</configuration>
@@ -184,34 +184,34 @@
184184
<plugin>
185185
<groupId>org.codehaus.mojo</groupId>
186186
<artifactId>findbugs-maven-plugin</artifactId>
187-
<version>2.5.1</version>
187+
<version>3.0.5</version>
188188
<configuration>
189189
<threshold>Normal</threshold>
190190
<effort>Default</effort>
191191
</configuration>
192192
</plugin>
193193
<plugin>
194194
<artifactId>maven-checkstyle-plugin</artifactId>
195-
<version>2.6</version>
195+
<version>3.6.0</version>
196196
</plugin>
197197
<plugin>
198198
<groupId>org.codehaus.mojo</groupId>
199199
<artifactId>cobertura-maven-plugin</artifactId>
200-
<version>2.4</version>
200+
<version>2.7</version>
201201
</plugin>
202202
<plugin>
203203
<groupId>org.codehaus.mojo</groupId>
204204
<artifactId>clirr-maven-plugin</artifactId>
205-
<version>2.5</version>
205+
<version>2.8</version>
206206
</plugin>
207207
</plugins>
208208
</reporting>
209209

210210
<dependencies>
211211
<!-- [lang] -->
212212
<dependency>
213-
<groupId>commons-lang</groupId>
214-
<artifactId>commons-lang</artifactId>
213+
<groupId>org.apache.commons</groupId>
214+
<artifactId>commons-lang3</artifactId>
215215
<version>${commons.lang.version}</version>
216216
</dependency>
217217
<!-- testing -->

‎src/main/java/com/tupilabs/human_name_parser/HumanNameParserBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public final class HumanNameParserBuilder {
105105
"junior"));
106106

107107
// build values
108-
private Name name;
108+
private final Name name;
109109
private List<String> salutations;
110110
private List<String> postnominals;
111111
private List<String> prefixes;

‎src/main/java/com/tupilabs/human_name_parser/HumanNameParserParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424
package com.tupilabs.human_name_parser;
2525

26-
import java.util.List;
26+
import org.apache.commons.lang3.StringUtils;
2727

28-
import org.apache.commons.lang.StringUtils;
28+
import java.util.List;
2929

3030
/**
3131
* <p>

‎src/test/java/com/tupilabs/human_name_parser/BuilderTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
*/
2424
package com.tupilabs.human_name_parser;
2525

26+
import org.junit.jupiter.api.Test;
27+
28+
import java.util.Collections;
29+
2630
import static org.junit.jupiter.api.Assertions.assertEquals;
2731
import static org.junit.jupiter.api.Assertions.assertFalse;
2832
import static org.junit.jupiter.api.Assertions.assertThrows;
2933
import static org.junit.jupiter.api.Assertions.assertTrue;
3034

31-
import java.util.Arrays;
32-
33-
import org.junit.jupiter.api.Test;
34-
3535
/**
3636
* Tests for the {@code HumanNameParserBuilder}.
3737
* @author kinow
@@ -52,15 +52,15 @@ public void testDefaultSuffixes() {
5252
@Test
5353
public void testReplacingSuffixes() {
5454
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
55-
HumanNameParserParser parser = builder.withSuffixes(Arrays.asList("mage")).build();
55+
HumanNameParserParser parser = builder.withSuffixes(Collections.singletonList("mage")).build();
5656
assertFalse(parser.suffixes.contains("senior"));
5757
assertTrue(parser.suffixes.contains("mage"));
5858
}
5959

6060
@Test
6161
public void testExtraSuffixes() {
6262
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
63-
HumanNameParserParser parser = builder.withExtraSuffixes(Arrays.asList("mage")).build();
63+
HumanNameParserParser parser = builder.withExtraSuffixes(Collections.singletonList("mage")).build();
6464
assertTrue(parser.suffixes.contains("senior"));
6565
assertTrue(parser.suffixes.contains("mage"));
6666
}
@@ -77,15 +77,15 @@ public void testDefaultPrefixes() {
7777
@Test
7878
public void testReplacingPrefixes() {
7979
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
80-
HumanNameParserParser parser = builder.withPrefixes(Arrays.asList("sama")).build();
80+
HumanNameParserParser parser = builder.withPrefixes(Collections.singletonList("sama")).build();
8181
assertFalse(parser.prefixes.contains("de la"));
8282
assertTrue(parser.prefixes.contains("sama"));
8383
}
8484

8585
@Test
8686
public void testExtraPrefixes() {
8787
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
88-
HumanNameParserParser parser = builder.withExtraPrefixes(Arrays.asList("sama")).build();
88+
HumanNameParserParser parser = builder.withExtraPrefixes(Collections.singletonList("sama")).build();
8989
assertTrue(parser.prefixes.contains("de la"));
9090
assertTrue(parser.prefixes.contains("sama"));
9191
}
@@ -103,15 +103,15 @@ public void testDefaultPostnominals() {
103103
public void testReplacingPostnominals() {
104104
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
105105
// Au.D. is one of the examples from issue #10 on GitHub
106-
HumanNameParserParser parser = builder.withPostnominals(Arrays.asList("Au.D.")).build();
106+
HumanNameParserParser parser = builder.withPostnominals(Collections.singletonList("Au.D.")).build();
107107
assertFalse(parser.postnominals.contains("phd"));
108108
assertTrue(parser.postnominals.contains("Au.D."));
109109
}
110110

111111
@Test
112112
public void testExtraPostnominals() {
113113
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
114-
HumanNameParserParser parser = builder.withExtraPostnominals(Arrays.asList("Au.D.")).build();
114+
HumanNameParserParser parser = builder.withExtraPostnominals(Collections.singletonList("Au.D.")).build();
115115
assertTrue(parser.postnominals.contains("phd"));
116116
assertTrue(parser.postnominals.contains("Au.D."));
117117
}
@@ -128,15 +128,15 @@ public void testDefaultSalutations() {
128128
@Test
129129
public void testReplacingSalutations() {
130130
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
131-
HumanNameParserParser parser = builder.withSalutations(Arrays.asList("sinho")).build();
131+
HumanNameParserParser parser = builder.withSalutations(Collections.singletonList("sinho")).build();
132132
assertFalse(parser.salutations.contains("judge"));
133133
assertTrue(parser.salutations.contains("sinho"));
134134
}
135135

136136
@Test
137137
public void testExtraSalutations() {
138138
HumanNameParserBuilder builder = new HumanNameParserBuilder("john paul");
139-
HumanNameParserParser parser = builder.withExtraSalutations(Arrays.asList("sinho")).build();
139+
HumanNameParserParser parser = builder.withExtraSalutations(Collections.singletonList("sinho")).build();
140140
assertTrue(parser.salutations.contains("judge"));
141141
assertTrue(parser.salutations.contains("sinho"));
142142
}
@@ -203,7 +203,7 @@ public void testFailsToBuildWithNullPrefixes2() {
203203

204204
@Test
205205
public void testCreateWithStringOrName() {
206-
assertEquals("ramon", new HumanNameParserBuilder("don ramon valdez").withSalutations(Arrays.asList("don")).build().getFirst());
207-
assertEquals("ramon", new HumanNameParserBuilder(new Name("don ramon valdez")).withSalutations(Arrays.asList("don")).build().getFirst());
206+
assertEquals("ramon", new HumanNameParserBuilder("don ramon valdez").withSalutations(Collections.singletonList("don")).build().getFirst());
207+
assertEquals("ramon", new HumanNameParserBuilder(new Name("don ramon valdez")).withSalutations(Collections.singletonList("don")).build().getFirst());
208208
}
209209
}

‎src/test/java/com/tupilabs/human_name_parser/NameTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
*/
2424
package com.tupilabs.human_name_parser;
2525

26-
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
2826
import org.junit.jupiter.api.BeforeEach;
2927
import org.junit.jupiter.api.Test;
3028

29+
import static org.junit.jupiter.api.Assertions.assertEquals;
30+
3131
/**
3232
* Tests for {@code Name} and {@code HumanNameParserParser}. Utilizes the same
3333
* input file as the PHP library 0.2 version.

‎src/test/java/com/tupilabs/human_name_parser/ParserTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@
2323
*/
2424
package com.tupilabs.human_name_parser;
2525

26-
import static org.junit.jupiter.api.Assertions.assertEquals;
26+
import org.apache.commons.lang3.StringUtils;
27+
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.Test;
2729

2830
import java.io.BufferedReader;
2931
import java.io.File;
3032
import java.io.FileReader;
3133
import java.io.IOException;
34+
import java.util.Objects;
3235
import java.util.logging.Logger;
3336

34-
import org.apache.commons.lang.StringUtils;
35-
import org.junit.jupiter.api.BeforeAll;
36-
import org.junit.jupiter.api.Test;
37+
import static org.junit.jupiter.api.Assertions.assertEquals;
3738

3839
public class ParserTest {
3940

@@ -43,7 +44,7 @@ public class ParserTest {
4344

4445
@BeforeAll
4546
public static void setUp() {
46-
testNames = new File(ParserTest.class.getResource("/testNames.txt").getFile());
47+
testNames = new File(Objects.requireNonNull(ParserTest.class.getResource("/testNames.txt")).getFile());
4748
}
4849

4950
@Test

0 commit comments

Comments
 (0)