-
Notifications
You must be signed in to change notification settings - Fork 95
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.
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
Add parser for Optional types to avoid the null madness #78
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
import com.google.gson.JsonObject; | ||
import com.google.gson.JsonParseException; | ||
import com.google.gson.TypeAdapter; | ||
import com.google.gson.TypeAdapterFactory; | ||
import com.google.gson.reflect.TypeToken; | ||
import com.google.gson.stream.JsonReader; | ||
import com.google.gson.stream.JsonToken; | ||
|
@@ -31,9 +32,11 @@ | |
import java.io.InputStreamReader; | ||
import java.io.Reader; | ||
import java.lang.reflect.Type; | ||
import java.lang.reflect.ParameterizedType; | ||
import java.util.Date; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.Optional; | ||
|
||
/** | ||
* Parser for Saltstack responses. | ||
|
@@ -79,6 +82,7 @@ public JsonParser(TypeToken<T> type) { | |
.registerTypeAdapter(StartTime.class, new StartTimeAdapter().nullSafe()) | ||
.registerTypeAdapter(Stats.class, new StatsDeserializer()) | ||
.registerTypeAdapter(Arguments.class, new ArgumentsDeserializer()) | ||
.registerTypeAdapterFactory(new OptionalTypeAdapterFactory()) | ||
.create(); | ||
} | ||
|
||
|
@@ -126,6 +130,47 @@ public Date read(JsonReader jsonReader) throws IOException { | |
} | ||
} | ||
|
||
/** | ||
* TypeAdaptorFactory creating TypeAdapters for Optional | ||
*/ | ||
private class OptionalTypeAdapterFactory implements TypeAdapterFactory { | ||
|
||
@Override | ||
@SuppressWarnings("unchecked") | ||
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) { | ||
Type type = typeToken.getType(); | ||
boolean isOptional = typeToken.getRawType() == Optional.class; | ||
boolean isParameterized = type instanceof ParameterizedType; | ||
if (isOptional && isParameterized) { | ||
Type elementType = ((ParameterizedType) type).getActualTypeArguments()[0]; | ||
TypeAdapter<?> elementAdapter = gson.getAdapter(TypeToken.get(elementType)); | ||
return (TypeAdapter<T>) optionalAdapter(elementAdapter); | ||
} else { | ||
return null; | ||
} | ||
} | ||
|
||
private <A> TypeAdapter<Optional<A>> optionalAdapter(TypeAdapter<A> innerAdapter) { | ||
return new TypeAdapter<Optional<A>>() { | ||
@Override | ||
public Optional<A> read(JsonReader in) throws IOException { | ||
if (in.peek() == JsonToken.NULL) { | ||
in.nextNull(); | ||
return Optional.empty(); | ||
} else { | ||
A value = innerAdapter.read(in); | ||
return Optional.of(value); | ||
} | ||
} | ||
|
||
@Override | ||
public void write(JsonWriter out, Optional<A> optional) throws IOException { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Aren't |
||
innerAdapter.write(out, optional.orElse(null)); | ||
} | ||
}; | ||
} | ||
} | ||
|
||
/** | ||
* Deserializer for the Stats object received from the API. | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/test/java/com/suse/saltstack/netapi/parser/OptionalTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package com.suse.saltstack.netapi.parser; | ||
|
||
import java.util.Optional; | ||
import java.util.List; | ||
|
||
/** | ||
* Helper Type to test the Optional Parser | ||
*/ | ||
public class OptionalTest { | ||
|
||
public Optional<String> nullString = Optional.empty(); | ||
public Optional<String> valueString = Optional.empty(); | ||
public Optional<String> absentString = Optional.empty(); | ||
public List<Optional<Integer>> maybeInts; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"nullString": null, | ||
"valueString": "string with value", | ||
"maybeInts": [1, 2, 3, null, 5] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
123 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
null |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Public methods should generally have javadoc, consider to add some documentation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
create is overridden from
TypeAdapterFactory
so its already documented there i put the@Override
on it to make it clear.