Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ publishing {
repositories {
maven {
url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
credentials {
username sonatypeUsername
password sonatypePassword
if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
credentials {
username sonatypeUsername
password sonatypePassword
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.gitgub.eaxdev.jsonresume.validator.model;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import lombok.Getter;
import lombok.Setter;

import java.time.LocalDate;

@Getter
@Setter
public class Education extends Period {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import lombok.Getter;
import lombok.Setter;

import java.time.LocalDate;

@Getter
@Setter
abstract class Period {

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import lombok.Setter;
import org.hibernate.validator.constraints.URL;

import java.time.LocalDate;

@Getter
@Setter
public class Volunteer extends Period {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import lombok.Setter;
import org.hibernate.validator.constraints.URL;

import java.time.LocalDate;

@Getter
@Setter
public class Work extends Period {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

public class BeanValidationDeserializer extends BeanDeserializer {

private final static ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();

private final Validator validator = factory.getValidator();

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

private void validate(final Object instance) {
final Set<ConstraintViolation<Object>> violations = validator.validate(instance);
if (violations.size() > 0) {
if (!violations.isEmpty()) {
final String message = "JSON is not valid. Reasons (" + violations.size() + "): ";
final String errorMessages = violations.stream()
.map(v -> "Value `" + v.getInvalidValue() + "` is not correct. " + v.getMessage())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

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

public class BasicTest {
class BasicTest {

@Test
void basicUsage() throws IOException, JsonResumeParseException {
Expand Down