From 59075d105edbe5940155c7e18cd2ca6d9255da47 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 10 May 2017 18:06:49 +0800 Subject: [PATCH] update java parcelable model petstore --- .../src/main/java/io/swagger/client/model/FormatTest.java | 8 +------- .../MixedPropertiesAndAdditionalPropertiesClass.java | 7 +------ .../src/main/java/io/swagger/client/model/Order.java | 6 +----- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java index fb92f06cfe36..9a3463ed6f7c 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java @@ -420,15 +420,9 @@ public class FormatTest implements Parcelable { string = (String)in.readValue(null); _byte = (byte[])in.readValue(null); binary = (byte[])in.readValue(null); -<<<<<<< HEAD - date = (LocalDate)in.readValue(null); - dateTime = (OffsetDateTime)in.readValue(null); - uuid = (UUID)in.readValue(null); -======= date = (LocalDate)in.readValue(LocalDate.class.getClassLoader()); - dateTime = (DateTime)in.readValue(DateTime.class.getClassLoader()); + dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); uuid = (UUID)in.readValue(UUID.class.getClassLoader()); ->>>>>>> origin/master password = (String)in.readValue(null); } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 8a8a15735aaf..eab8af25f8c4 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -161,13 +161,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable { MixedPropertiesAndAdditionalPropertiesClass(Parcel in) { -<<<<<<< HEAD - uuid = (UUID)in.readValue(null); - dateTime = (OffsetDateTime)in.readValue(null); -======= uuid = (UUID)in.readValue(UUID.class.getClassLoader()); - dateTime = (DateTime)in.readValue(DateTime.class.getClassLoader()); ->>>>>>> origin/master + dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); map = (Map)in.readValue(Animal.class.getClassLoader()); } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java index e323c3b821dc..c28e613509e6 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java @@ -251,11 +251,7 @@ public class Order implements Parcelable { id = (Long)in.readValue(null); petId = (Long)in.readValue(null); quantity = (Integer)in.readValue(null); -<<<<<<< HEAD - shipDate = (OffsetDateTime)in.readValue(null); -======= - shipDate = (DateTime)in.readValue(DateTime.class.getClassLoader()); ->>>>>>> origin/master + shipDate = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader()); status = (StatusEnum)in.readValue(null); complete = (Boolean)in.readValue(null); }