Skip to content

Commit 52736cc

Browse files
committed
fix Java client import in JSON (refs #8123)
1 parent f5c4e3e commit 52736cc

File tree

10 files changed

+11
-57
lines changed

10 files changed

+11
-57
lines changed

modules/swagger-codegen/src/main/resources/Java/JSON.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
2525
import org.threeten.bp.format.DateTimeFormatter;
2626
{{/threetenbp}}
2727

28-
{{#parent.length}}
28+
{{#models.0}}
2929
import {{modelPackage}}.*;
30-
{{/parent.length}}
30+
{{/models.0}}
3131
import okio.ByteString;
3232

3333
import java.io.IOException;

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/JSON.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
2525
import org.threeten.bp.format.DateTimeFormatter;
2626
{{/threetenbp}}
2727

28-
{{#parent.length}}
28+
{{#models.0}}
2929
import {{modelPackage}}.*;
30-
{{/parent.length}}
30+
{{/models.0}}
3131

3232
import java.io.IOException;
3333
import java.io.StringReader;

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.threeten.bp.OffsetDateTime;
2828
import org.threeten.bp.format.DateTimeFormatter;
2929

30+
import io.swagger.client.model.*;
3031
import okio.ByteString;
3132

3233
import java.io.IOException;

samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.threeten.bp.OffsetDateTime;
2828
import org.threeten.bp.format.DateTimeFormatter;
2929

30+
import io.swagger.client.model.*;
3031
import okio.ByteString;
3132

3233
import java.io.IOException;

samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/api/DefaultApiTest.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

samples/client/petstore/java/okhttp-gson/src/test/java/io/swagger/client/model/EnumValueTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testEnumTest() {
4242
// test serialization
4343
Gson gson = new Gson();
4444
String json = gson.toJson(enumTest);
45-
assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
45+
assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":1,\"enum_number\":1.1}");
4646
// test deserialization
4747
EnumTest fromString = gson.fromJson(json, EnumTest.class);
4848
assertEquals(fromString.getEnumString().toString(), "lower");

samples/client/petstore/java/rest-assured/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.threeten.bp.OffsetDateTime;
2828
import org.threeten.bp.format.DateTimeFormatter;
2929

30+
import io.swagger.client.model.*;
3031
import okio.ByteString;
3132

3233
import java.io.IOException;

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.threeten.bp.OffsetDateTime;
2828
import org.threeten.bp.format.DateTimeFormatter;
2929

30+
import io.swagger.client.model.*;
3031

3132
import java.io.IOException;
3233
import java.io.StringReader;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.threeten.bp.OffsetDateTime;
2828
import org.threeten.bp.format.DateTimeFormatter;
2929

30+
import io.swagger.client.model.*;
3031

3132
import java.io.IOException;
3233
import java.io.StringReader;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.threeten.bp.OffsetDateTime;
2828
import org.threeten.bp.format.DateTimeFormatter;
2929

30+
import io.swagger.client.model.*;
3031

3132
import java.io.IOException;
3233
import java.io.StringReader;

0 commit comments

Comments
 (0)