Skip to content

Commit

Permalink
Remove validations as requirement, optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
GedMarc committed Apr 13, 2024
1 parent efe64d8 commit 34b6e7b
Show file tree
Hide file tree
Showing 23 changed files with 53 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.*;
import com.guicedee.guicedinjection.interfaces.ObjectBinderKeys;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.guicedee.services.jsonrepresentation.implementations.ObjectMapperBinder;
import com.guicedee.services.jsonrepresentation.json.LaxJsonModule;

Expand All @@ -15,7 +17,6 @@
import java.util.*;

import static com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS;
import static com.guicedee.guicedinjection.interfaces.ObjectBinderKeys.*;

@SuppressWarnings("unused")
public interface IJsonRepresentation<J> extends Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
package com.guicedee.services.jsonrepresentation.implementations;

import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.google.inject.AbstractModule;
import com.guicedee.guicedinjection.interfaces.*;
import com.guicedee.services.jsonrepresentation.IJsonRepresentation;
import com.guicedee.guicedinjection.interfaces.IGuiceModule;
import com.guicedee.guicedinjection.interfaces.ObjectBinderKeys;
import com.guicedee.services.jsonrepresentation.json.LaxJsonModule;
import jakarta.inject.*;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import jakarta.inject.Provider;
import jakarta.inject.Singleton;
import lombok.Getter;
import lombok.extern.java.Log;

import static com.fasterxml.jackson.core.JsonParser.Feature.*;
import static com.guicedee.guicedinjection.interfaces.ObjectBinderKeys.*;
import static com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS;
import static com.guicedee.guicedinjection.interfaces.ObjectBinderKeys.DefaultObjectMapper;
import static com.guicedee.guicedinjection.interfaces.ObjectBinderKeys.JavaScriptObjectWriter;

@Log
public class ObjectMapperBinder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
Expand All @@ -7,7 +8,7 @@
import java.text.NumberFormat;
import java.time.Duration;

import static com.guicedee.services.jsonrepresentation.json.StaticStrings.*;
import static com.guicedee.services.jsonrepresentation.json.StaticStrings.STRING_EMPTY;
import static java.time.temporal.ChronoUnit.*;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;

import jakarta.validation.constraints.NotNull;
import java.io.IOException;
import java.time.Duration;

Expand All @@ -22,7 +21,7 @@ public void serialize(Duration value, JsonGenerator gen, SerializerProvider seri
gen.writeString(convert(value));
}

public String convert(@NotNull Duration value)
public String convert( Duration value)
{
return value.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;

public class InstantSerializer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;

import java.io.IOException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
import com.google.common.base.*;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;

import java.io.*;
import java.time.*;
import java.time.format.*;
import java.io.IOException;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;

//import static com.guicedee.guicedinjection.json.LocalTimeSerializer.*;
import static com.guicedee.services.jsonrepresentation.json.LocalDateTimeDeserializer.formats;
import static com.guicedee.services.jsonrepresentation.json.StaticStrings.*;
import static com.guicedee.services.jsonrepresentation.json.StaticStrings.STRING_0;
import static com.guicedee.services.jsonrepresentation.json.StaticStrings.STRING_NULL;


public class LocalTimeDeserializer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;

import java.io.*;
import java.time.*;
import java.time.format.*;
import java.io.IOException;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;

public class LocalTimeSerializer
extends JsonSerializer<LocalTime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.fasterxml.jackson.databind.SerializerProvider;

import java.io.IOException;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.fasterxml.jackson.databind.SerializerProvider;

import java.io.IOException;
import java.time.LocalDateTime;
import java.time.OffsetTime;
import java.time.format.DateTimeFormatter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;

import java.io.IOException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;
import org.apache.commons.lang3.StringUtils;

import jakarta.validation.constraints.NotNull;
import java.io.IOException;
import java.text.NumberFormat;
import java.time.Duration;
Expand All @@ -29,7 +28,7 @@ public Duration deserialize(JsonParser p, DeserializationContext ctxt) throws IO
return convert(name);
}

public Duration convert(@NotNull String value)
public Duration convert( String value)
{
if (Strings.isNullOrEmpty(value) || STRING_NULL.equals(value) || STRING_0.equals(value)) {
return null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;

import jakarta.validation.constraints.NotNull;
import java.io.IOException;

/**
Expand All @@ -22,7 +20,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
return convert(value);
}

public int convert(@NotNull String value)
public int convert( String value)
{
if (Strings.isNullOrEmpty(value))
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.guicedee.services.jsonrepresentation.json;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.google.common.base.Strings;

import jakarta.validation.constraints.NotNull;
import java.io.IOException;

/**
Expand All @@ -21,7 +20,7 @@ public Integer deserialize(JsonParser p, DeserializationContext ctxt) throws IOE
return convert(value);
}

public Integer convert(@NotNull String value)
public Integer convert( String value)
{
if (Strings.isNullOrEmpty(value)) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.google.common.base.Strings;
import lombok.extern.java.Log;


import java.io.IOException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.guicedee.services.jsonrepresentation.json.mapkeys;

import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.KeyDeserializer;
import com.guicedee.services.jsonrepresentation.json.LocalDateDeserializer;


import java.io.*;
import java.io.IOException;

public class LocalDateDeserializerKey
extends KeyDeserializer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.guicedee.services.jsonrepresentation.json.mapkeys;

import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.KeyDeserializer;
import com.guicedee.services.jsonrepresentation.json.LocalDateTimeDeserializer;

import java.io.*;
import java.io.IOException;

public class LocalDateTimeDeserializerKey
extends KeyDeserializer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.guicedee.services.jsonrepresentation.json.mapkeys;

import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.KeyDeserializer;
import com.guicedee.services.jsonrepresentation.json.OffsetDateTimeDeserializer;

import java.io.*;
import java.io.IOException;

public class OffsetDateTimeDeserializerKey
extends KeyDeserializer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@

import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException;
import java.time.format.FormatStyle;
import java.time.temporal.ChronoField;

import static com.guicedee.services.jsonrepresentation.json.LocalDateTimeDeserializer.formats;

Expand Down

0 comments on commit 34b6e7b

Please sign in to comment.