loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

update java parcelable model petstore

Browse Source
This commit is contained in:
wing328
2017-05-10 18:06:49 +08:00
parent 45ff39c237
commit 59075d105e
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/FormatTest.java
View File

@@ -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);
}

7
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@@ -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<String, Animal>)in.readValue(Animal.class.getClassLoader());
}

6
samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/model/Order.java
View File

@@ -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);
}