Skip to content

Commit 9311433

Browse files
authored
refactor: #5 cleanup (#6)
1 parent 6e00f27 commit 9311433

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ publishing {
6161
repositories {
6262
maven {
6363
url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
64-
credentials {
65-
username sonatypeUsername
66-
password sonatypePassword
64+
if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
65+
credentials {
66+
username sonatypeUsername
67+
password sonatypePassword
68+
}
6769
}
6870
}
6971
}

src/main/java/io/gitgub/eaxdev/jsonresume/validator/model/BasicInfo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.gitgub.eaxdev.jsonresume.validator.model;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
43
import com.fasterxml.jackson.annotation.JsonProperty;
54
import com.fasterxml.jackson.annotation.JsonUnwrapped;
65
import lombok.Getter;

src/main/java/io/gitgub/eaxdev/jsonresume/validator/model/Education.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import lombok.Getter;
55
import lombok.Setter;
66

7-
import java.time.LocalDate;
8-
97
@Getter
108
@Setter
119
public class Education extends Period {

src/main/java/io/gitgub/eaxdev/jsonresume/validator/model/Period.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
import com.fasterxml.jackson.annotation.JsonProperty;
55
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
66
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
7+
import lombok.Getter;
8+
import lombok.Setter;
79

810
import java.time.LocalDate;
911

12+
@Getter
13+
@Setter
1014
abstract class Period {
1115

1216
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")

src/main/java/io/gitgub/eaxdev/jsonresume/validator/model/Volunteer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import lombok.Setter;
66
import org.hibernate.validator.constraints.URL;
77

8-
import java.time.LocalDate;
9-
108
@Getter
119
@Setter
1210
public class Volunteer extends Period {

src/main/java/io/gitgub/eaxdev/jsonresume/validator/model/Work.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import lombok.Setter;
66
import org.hibernate.validator.constraints.URL;
77

8-
import java.time.LocalDate;
9-
108
@Getter
119
@Setter
1210
public class Work extends Period {

src/main/java/io/gitgub/eaxdev/jsonresume/validator/validator/BeanValidationDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
public class BeanValidationDeserializer extends BeanDeserializer {
1515

16-
private final static ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
16+
private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
1717

1818
private final Validator validator = factory.getValidator();
1919

@@ -30,7 +30,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctx) throws IOExc
3030

3131
private void validate(final Object instance) {
3232
final Set<ConstraintViolation<Object>> violations = validator.validate(instance);
33-
if (violations.size() > 0) {
33+
if (!violations.isEmpty()) {
3434
final String message = "JSON is not valid. Reasons (" + violations.size() + "): ";
3535
final String errorMessages = violations.stream()
3636
.map(v -> "Value `" + v.getInvalidValue() + "` is not correct. " + v.getMessage())

src/test/java/io/gitgub/eaxdev/jsonresume/validator/BasicTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import static org.junit.jupiter.api.Assertions.*;
1313

14-
public class BasicTest {
14+
class BasicTest {
1515

1616
@Test
1717
void basicUsage() throws IOException, JsonResumeParseException {

0 commit comments

Comments
 (0)