Skip to content

[Java] Inheritance support Java client (Retrofit Gson) #4729

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 11 commits into from
Oct 8, 2017
Merged

[Java] Inheritance support Java client (Retrofit Gson) #4729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb09f98
merge with master
konopski Feb 6, 2017
c60703a
remove zoo specific artifact names
konopski Feb 6, 2017
663273f
Merge branch 'master' into inheritance_support_java_client_retrofit_gson
konopski Mar 31, 2017
10d61f4
Merge branch 'master' into inheritance_support_java_client_retrofit_gson
konopski May 27, 2017
b16e878
Merge branch 'master' into inheritance_support_java_client_retrofit_gson
konopski Jul 1, 2017
53bec92
Merge branch 'master' into inheritance_support_java_client_retrofit_gson
konopski Jul 27, 2017
7d256d1
Merge branch 'master' into inheritance_support_java_client_retrofit_gson
konopski Sep 4, 2017
a1b4043
fix duplicate doublequote
konopski Sep 4, 2017
8ac8b80
#3904 add samples for retrofit2
konopski Sep 27, 2017
28b6473
#3904 clean json field retrieval
konopski Oct 7, 2017
e351dd2
#3904 allow non-abstract parent class
konopski Oct 7, 2017
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
2 changes: 2 additions & 0 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.google.gson.JsonElement;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
Expand All @@ -25,6 +26,7 @@
import java.text.DateFormat;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.HashMap;

public class ApiClient {

Expand Down
26 changes: 25 additions & 1 deletion samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,24 @@
import com.google.gson.internal.bind.util.ISO8601Utils;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.google.gson.JsonElement;
import io.gsonfire.GsonFireBuilder;
import io.gsonfire.TypeSelector;
import org.threeten.bp.LocalDate;
import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.format.DateTimeFormatter;

import io.swagger.client.model.*;

import java.io.IOException;
import java.io.StringReader;
import java.lang.reflect.Type;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
import java.util.Date;
import java.util.Map;
import java.util.HashMap;

public class JSON {
private Gson gson;
Expand All @@ -39,8 +46,25 @@ public class JSON {
private OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new OffsetDateTimeTypeAdapter();
private LocalDateTypeAdapter localDateTypeAdapter = new LocalDateTypeAdapter();

public static GsonBuilder createGson() {
GsonFireBuilder fireBuilder = new GsonFireBuilder()
.registerTypeSelector(Animal.class, new TypeSelector() {
@Override
public Class getClassForElement(JsonElement readElement) {
Map classByDiscriminatorValue = new HashMap();
classByDiscriminatorValue.put("Cat".toUpperCase(), Cat.class);
classByDiscriminatorValue.put("Dog".toUpperCase(), Dog.class);
Copy link
Contributor

@cbornet cbornet Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't Animal a valid discriminator value ?

Copy link
Contributor Author

@konopski konopski Oct 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assumed my case with abstract superclass would be most typical. I added support for it and sample is including also Animal.

String discriminatorField = "className";
String discriminatorValue = readElement.getAsJsonObject().get(discriminatorField).getAsString();
Copy link
Contributor

@cbornet cbornet Sep 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The case where discriminatorField is not in the JSON should be handled cleanly

return (Class) classByDiscriminatorValue.get(discriminatorValue.toUpperCase());
Copy link
Contributor

@cbornet cbornet Sep 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The case where discriminatorValue is not in classByDiscriminatorValue should be handled cleanly.

}
})
;
return fireBuilder.createGsonBuilder();
}

public JSON() {
gson = new GsonBuilder()
gson = createGson()
.registerTypeAdapter(Date.class, dateTypeAdapter)
.registerTypeAdapter(java.sql.Date.class, sqlDateTypeAdapter)
.registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter)
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import retrofit2.http.*;

import okhttp3.RequestBody;
import okhttp3.ResponseBody;

import java.math.BigDecimal;
import io.swagger.client.model.Client;
Expand Down
1 change: 1 addition & 0 deletions .../petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import retrofit2.http.*;

import okhttp3.RequestBody;
import okhttp3.ResponseBody;

import io.swagger.client.model.Client;

Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import retrofit2.http.*;

import okhttp3.RequestBody;
import okhttp3.ResponseBody;

import java.io.File;
import io.swagger.client.model.ModelApiResponse;
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import retrofit2.http.*;

import okhttp3.RequestBody;
import okhttp3.ResponseBody;

import io.swagger.client.model.Order;

Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import retrofit2.http.*;

import okhttp3.RequestBody;
import okhttp3.ResponseBody;

import io.swagger.client.model.User;

Expand Down