Skip to content

Refactor #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 4, 2018
Merged

Refactor #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cff075c
removed unused imports from any module
ashutoshcp Jan 3, 2018
fb3b066
removed unused imports from extra module
ashutoshcp Jan 3, 2018
da508a2
Simplified condition
ashutoshcp Jan 3, 2018
ac6fb38
removed unused imports from output module
ashutoshcp Jan 3, 2018
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
3 changes: 1 addition & 2 deletions src/main/java/com/jsoniter/any/Any.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.jsoniter.output.CodegenAccess;
import com.jsoniter.spi.JsonException;
import com.jsoniter.JsonIterator;
import com.jsoniter.ValueType;
import com.jsoniter.output.JsonStream;
import com.jsoniter.spi.Encoder;
Expand Down Expand Up @@ -189,7 +188,7 @@ public Any mustBeValid() {
}
}

public Set<String> keys() {
public Set keys() {
return EMPTY_KEYS;
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/jsoniter/any/DoubleAny.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.jsoniter.ValueType;
import com.jsoniter.output.JsonStream;
import com.jsoniter.spi.TypeLiteral;

import java.io.IOException;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/jsoniter/any/LongAny.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.jsoniter.ValueType;
import com.jsoniter.output.JsonStream;
import com.jsoniter.spi.TypeLiteral;

import java.io.IOException;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/jsoniter/extra/Base64Support.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.jsoniter.JsonIterator;
import com.jsoniter.spi.Slice;
import com.jsoniter.any.Any;
import com.jsoniter.output.JsonStream;
import com.jsoniter.spi.Decoder;
import com.jsoniter.spi.Encoder;
Expand Down
21 changes: 12 additions & 9 deletions src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,18 @@ public boolean equals(Object o) {

Builder builder = (Builder) o;

if (excludeFieldsWithoutExposeAnnotation != builder.excludeFieldsWithoutExposeAnnotation) return false;
if (disableHtmlEscaping != builder.disableHtmlEscaping) return false;
if (!dateFormat.get().equals(builder.dateFormat.get())) return false;
if (fieldNamingStrategy != null ? !fieldNamingStrategy.equals(builder.fieldNamingStrategy) : builder.fieldNamingStrategy != null)
return false;
if (version != null ? !version.equals(builder.version) : builder.version != null) return false;
if (serializationExclusionStrategies != null ? !serializationExclusionStrategies.equals(builder.serializationExclusionStrategies) : builder.serializationExclusionStrategies != null)
return false;
return deserializationExclusionStrategies != null ? deserializationExclusionStrategies.equals(builder.deserializationExclusionStrategies) : builder.deserializationExclusionStrategies == null;
return excludeFieldsWithoutExposeAnnotation == builder.excludeFieldsWithoutExposeAnnotation &&
disableHtmlEscaping == builder.disableHtmlEscaping &&
dateFormat.get().equals(builder.dateFormat.get()) &&
(fieldNamingStrategy != null ? fieldNamingStrategy.equals(builder.fieldNamingStrategy) :
builder.fieldNamingStrategy == null) &&
(version != null ? version.equals(builder.version) : builder.version == null) &&
(serializationExclusionStrategies != null ?
serializationExclusionStrategies.equals(builder.serializationExclusionStrategies) :
builder.serializationExclusionStrategies == null) &&
(deserializationExclusionStrategies != null ?
deserializationExclusionStrategies.equals(builder.deserializationExclusionStrategies) :
builder.deserializationExclusionStrategies == null);
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/jsoniter/output/Codegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.jsoniter.output;

import com.jsoniter.any.Any;
import com.jsoniter.spi.*;

import java.io.File;
Expand All @@ -10,7 +9,6 @@
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.WildcardType;
import java.util.*;

class Codegen {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/jsoniter/output/CodegenResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.jsoniter.output;

import com.jsoniter.spi.JsonException;
import com.jsoniter.spi.JsoniterSpi;

class CodegenResult {
Expand Down