Skip to content

Instantly share code, notes, and snippets.

@vishalg0wda

vishalg0wda/diff.txt

Created June 20, 2025 14:05
Show Gist options
  • Save vishalg0wda/fc3e3e249c0534be8b4eeda81ddf4f60 to your computer and use it in GitHub Desktop.
Save vishalg0wda/fc3e3e249c0534be8b4eeda81ddf4f60 to your computer and use it in GitHub Desktop.
Download ZIP
primary<>java25-refresh test changes
Raw
diff.txt
diff '--color=auto' -ruNwB templates/templates/javav2/tests/primary/ErrorAdditionalTest.java templates/templates/javav2/tests/java25-refresh/ErrorAdditionalTest.java
--- templates/templates/javav2/tests/primary/ErrorAdditionalTest.java 2025-04-17 14:07:58.172680312 +0100
+++ templates/templates/javav2/tests/java25-refresh/ErrorAdditionalTest.java 2025-06-20 12:44:23.793115199 +0100
@@ -5,8 +5,6 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.Optional;
-
import org.junit.jupiter.api.Test;
import org.openapis.openapi.models.errors.APIException;
import org.openapis.openapi.models.operations.StatusGetErrorResponse;
@@ -45,7 +43,7 @@
APIException thrown = assertThrows(APIException.class, () -> {
StatusGetXSpeakeasyErrorsResponse res =
- s.errors().statusGetXSpeakeasyErrors(400l, Optional.empty());
+ s.errors().statusGetXSpeakeasyErrors(400l, null);
});
assertTrue(thrown.message().contains("API error occurred"));
assertEquals(400, thrown.code());
@@ -53,7 +51,7 @@
thrown = assertThrows(APIException.class, () -> {
StatusGetXSpeakeasyErrorsResponse res =
- s.errors().statusGetXSpeakeasyErrors(401l, Optional.empty());
+ s.errors().statusGetXSpeakeasyErrors(401l, null);
});
assertTrue(thrown.message().contains("API error occurred"));
assertEquals(401, thrown.code());
@@ -61,7 +59,7 @@
thrown = assertThrows(APIException.class, () -> {
StatusGetXSpeakeasyErrorsResponse res =
- s.errors().statusGetXSpeakeasyErrors(402l, Optional.empty());
+ s.errors().statusGetXSpeakeasyErrors(402l, null);
});
assertTrue(thrown.message().contains("API error occurred"));
assertEquals(402, thrown.code());
@@ -70,7 +68,7 @@
org.openapis.openapi.models.errors.Error eThrown =
assertThrows(org.openapis.openapi.models.errors.Error.class, () -> {
StatusGetXSpeakeasyErrorsResponse res =
- s.errors().statusGetXSpeakeasyErrors(500l, Optional.empty());
+ s.errors().statusGetXSpeakeasyErrors(500l, null);
});
assertTrue(eThrown.message().get().contains("an error occurred"));
assertEquals("500", eThrown.code().get());
@@ -80,7 +78,7 @@
org.openapis.openapi.models.errors.StatusGetXSpeakeasyErrorsResponseBody.class,
() -> {
StatusGetXSpeakeasyErrorsResponse res =
- s.errors().statusGetXSpeakeasyErrors(501l, Optional.empty());
+ s.errors().statusGetXSpeakeasyErrors(501l, null);
});
assertTrue(oThrown.message().get().contains("an error occurred"));
assertEquals("501", oThrown.code().get());
@@ -109,7 +107,7 @@
SDK s = SDK.builder().client(r -> CommonHelpers.createJsonResponse(r, 500, json)).build();
var err = assertThrows(org.openapis.openapi.models.errors.Error.class, () -> {
- s.errors().statusGetXSpeakeasyErrors(400);
+ s.errors().statusGetXSpeakeasyErrors(400l);
});
assertEquals("500", err.code().get());
assertEquals("something happened", err.message().get());
diff '--color=auto' -ruNwB templates/templates/javav2/tests/primary/PaginationAdditionalTest.java templates/templates/javav2/tests/java25-refresh/PaginationAdditionalTest.java
--- templates/templates/javav2/tests/primary/PaginationAdditionalTest.java 2025-04-17 14:07:58.172680312 +0100
+++ templates/templates/javav2/tests/java25-refresh/PaginationAdditionalTest.java 2025-06-20 11:28:24.322934005 +0100
@@ -13,6 +13,7 @@
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
@@ -52,21 +53,24 @@
long serverLimit = 20l;
- PaginationLimitOffsetPageParamsResponse res =
- s.pagination().paginationLimitOffsetPageParams().page(1).call();
+ Iterator<PaginationLimitOffsetPageParamsResponse> iterator = s.pagination().paginationLimitOffsetPageParams()
+ .page(1)
+ .callAsIterable()
+ .iterator();
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetPageParamsResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(serverLimit, res.res().get().resultArray().size());
- Optional<PaginationLimitOffsetPageParamsResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(0, res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetPageParamsResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(0, nextRes.res().get().resultArray().size());
- Optional<PaginationLimitOffsetPageParamsResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -88,25 +92,24 @@
Long page = 1l;
Long limit = 15l;
-
- LimitOffsetConfig request =
- LimitOffsetConfig.builder().limit(limit).page(page).build();
- PaginationLimitOffsetPageBodyResponse res =
- s.pagination().paginationLimitOffsetPageBody(request, Optional.empty());
+ LimitOffsetConfig request = LimitOffsetConfig.builder().limit(limit).page(page).build();
+ Iterator<PaginationLimitOffsetPageBodyResponse> iterator = s.pagination().paginationLimitOffsetPageBody()
+ .request(request)
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetPageBodyResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(limit, res.res().get().resultArray().size());
- Optional<PaginationLimitOffsetPageBodyResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertTrue(limit > res.res().get().resultArray().size());
-
- Optional<PaginationLimitOffsetPageBodyResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetPageBodyResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertTrue(limit > nextRes.res().get().resultArray().size());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -118,25 +121,25 @@
Long page = 1l;
Long limit = 15l;
-
- LimitOffsetConfig request =
- LimitOffsetConfig.builder().limit(limit).page(page).build();
- PaginationLimitOffsetDeepOutputsPageBodyResponse res =
- s.pagination().paginationLimitOffsetDeepOutputsPageBody(request, Optional.empty());
+ LimitOffsetConfig request = LimitOffsetConfig.builder().limit(limit).page(page).build();
+ Iterator<PaginationLimitOffsetDeepOutputsPageBodyResponse> iterator = s.pagination()
+ .paginationLimitOffsetDeepOutputsPageBody()
+ .request(request)
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetDeepOutputsPageBodyResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(limit, res.res().get().resultArray().size());
- Optional<PaginationLimitOffsetDeepOutputsPageBodyResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertTrue(limit > res.res().get().resultArray().size());
-
- Optional<PaginationLimitOffsetDeepOutputsPageBodyResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetDeepOutputsPageBodyResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertTrue(limit > nextRes.res().get().resultArray().size());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -146,8 +149,7 @@
long page = 1;
long limit = 15;
- LimitOffsetConfig request =
- LimitOffsetConfig.builder().limit(limit).page(page).build();
+ LimitOffsetConfig request = LimitOffsetConfig.builder().limit(limit).page(page).build();
Stream<Long> results = s.pagination().paginationLimitOffsetPageBody()
.request(request)
.callAsStreamUnwrapped();
@@ -164,23 +166,24 @@
Long limit = 15l;
Long offset = 0l;
-
- PaginationLimitOffsetOffsetParamsResponse res =
- s.pagination().paginationLimitOffsetOffsetParams(Optional.of(limit),
- Optional.of(offset), Optional.empty());
+ Iterator<PaginationLimitOffsetOffsetParamsResponse> iterator = s.pagination().paginationLimitOffsetOffsetParams()
+ .limit(limit)
+ .offset(offset)
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetOffsetParamsResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(limit, res.res().get().resultArray().size());
- Optional<PaginationLimitOffsetOffsetParamsResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(20l - limit, res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetOffsetParamsResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(20l - limit, nextRes.res().get().resultArray().size());
- Optional<PaginationLimitOffsetOffsetParamsResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -206,27 +209,28 @@
long limit = 15;
long offset = 0;
- LimitOffsetConfig request =
- LimitOffsetConfig.builder() //
+ LimitOffsetConfig request = LimitOffsetConfig.builder() //
.limit(limit) //
.offset(offset) //
.build();
- PaginationLimitOffsetOffsetBodyResponse res =
- s.pagination().paginationLimitOffsetOffsetBody(request, Optional.empty());
+ Iterator<PaginationLimitOffsetOffsetBodyResponse> iterator = s.pagination().paginationLimitOffsetOffsetBody()
+ .request(request)
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetOffsetBodyResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(limit, res.res().get().resultArray().size());
- Optional<PaginationLimitOffsetOffsetBodyResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertTrue(limit > res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationLimitOffsetOffsetBodyResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertTrue(limit > nextRes.res().get().resultArray().size());
- Optional<PaginationLimitOffsetOffsetBodyResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -236,8 +240,7 @@
long limit = 15;
long offset = 0;
- LimitOffsetConfig request =
- LimitOffsetConfig.builder() //
+ LimitOffsetConfig request = LimitOffsetConfig.builder() //
.limit(limit) //
.offset(offset) //
.build();
@@ -255,27 +258,29 @@
long cursor = -1;
- PaginationCursorParamsResponse res =
- s.pagination().paginationCursorParams(cursor, Optional.empty());
+ Iterator<PaginationCursorParamsResponse> iterator = s.pagination().paginationCursorParams()
+ .cursor(cursor)
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationCursorParamsResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(15, res.res().get().resultArray().size());
- Optional<PaginationCursorParamsResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(5, res.res().get().resultArray().size());
-
- Optional<PaginationCursorParamsResponse> penultimateRes = res.next();
- assertTrue(penultimateRes.isPresent());
- res = penultimateRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(0, res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationCursorParamsResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(5, nextRes.res().get().resultArray().size());
+
+ assertTrue(iterator.hasNext());
+ PaginationCursorParamsResponse penultimateRes = iterator.next();
+ assertNotNull(penultimateRes);
+ assertEquals(200, penultimateRes.statusCode());
+ assertEquals(0, penultimateRes.res().get().resultArray().size());
- Optional<PaginationCursorParamsResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -284,8 +289,7 @@
long cursor = -1;
- Stream<Long> results =
- s.pagination().paginationCursorParams()
+ Stream<Long> results = s.pagination().paginationCursorParams()
.cursor(cursor)
.callAsStreamUnwrapped();
assertEquals(20, results.count());
@@ -302,27 +306,29 @@
PaginationCursorBodyRequestBody request = new PaginationCursorBodyRequestBody(cursor);
- PaginationCursorBodyResponse res =
- s.pagination().paginationCursorBody(request, Optional.empty());
+ Iterator<PaginationCursorBodyResponse> iterator = s.pagination().paginationCursorBody()
+ .request(request)
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationCursorBodyResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(15, res.res().get().resultArray().size());
- Optional<PaginationCursorBodyResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(5, res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationCursorBodyResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(5, nextRes.res().get().resultArray().size());
+
+ assertTrue(iterator.hasNext());
+ PaginationCursorBodyResponse penultimateRes = iterator.next();
+ assertNotNull(penultimateRes);
+ assertEquals(200, penultimateRes.statusCode());
+ assertEquals(0, penultimateRes.res().get().resultArray().size());
- Optional<PaginationCursorBodyResponse> penultimateRes = res.next();
- assertTrue(penultimateRes.isPresent());
- res = penultimateRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(0, res.res().get().resultArray().size());
-
- Optional<PaginationCursorBodyResponse> nullRes = res.next();
- assertFalse(nullRes.isPresent());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -333,8 +339,7 @@
PaginationCursorBodyRequestBody request = new PaginationCursorBodyRequestBody(cursor);
- Stream<Long> results =
- s.pagination().paginationCursorBody()
+ Stream<Long> results = s.pagination().paginationCursorBody()
.request(request)
.callAsStreamUnwrapped();
assertEquals(20, results.count());
@@ -345,25 +350,27 @@
recordTest("pagination-cursor-non-numeric");
SDK s = SDK.builder().build();
- PaginationCursorNonNumericResponse res = s.pagination().paginationCursorNonNumeric().call();
+ Iterator<PaginationCursorNonNumericResponse> iterator = s.pagination().paginationCursorNonNumeric().callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationCursorNonNumericResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(15, res.res().get().resultArray().size());
- Optional<PaginationCursorNonNumericResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(5, res.res().get().resultArray().size());
-
- Optional<PaginationCursorNonNumericResponse> penultimateRes = res.next();
- assertTrue(penultimateRes.isPresent());
- res = penultimateRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(0, res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationCursorNonNumericResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(5, nextRes.res().get().resultArray().size());
+
+ assertTrue(iterator.hasNext());
+ PaginationCursorNonNumericResponse penultimateRes = iterator.next();
+ assertNotNull(penultimateRes);
+ assertEquals(200, penultimateRes.statusCode());
+ assertEquals(0, penultimateRes.res().get().resultArray().size());
- assertFalse(res.next().isPresent());
+ assertFalse(iterator.hasNext());
}
@Disabled // GEN-1013
@@ -372,24 +379,26 @@
// recordTest("pagination-cursor-non-numeric-nullable");
SDK s = SDK.builder().build();
- PaginationCursorNonNumericNullableResponse res = s.pagination()
+ Iterator<PaginationCursorNonNumericNullableResponse> iterator = s.pagination()
.paginationCursorNonNumericNullable()
.cursor("2")
- .call();
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationCursorNonNumericNullableResponse res = iterator.next();
assertNotNull(res);
assertEquals(200, res.statusCode());
assertEquals(15, res.res().get().resultArray().size());
assertEquals("17", res.res().get().cursor().get());
- Optional<PaginationCursorNonNumericNullableResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(2, res.res().get().resultArray().size());
- assertNull(res.res().get().cursor());
+ assertTrue(iterator.hasNext());
+ PaginationCursorNonNumericNullableResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(2, nextRes.res().get().resultArray().size());
+ assertNull(nextRes.res().get().cursor());
- assertFalse(res.next().isPresent());
+ assertFalse(iterator.hasNext());
}
@Test
@@ -409,13 +417,13 @@
long cursor = -1l;
- PaginationCursorBodyRequestBody request = new PaginationCursorBodyRequestBody(cursor);
-
- long pagesCount = s.pagination().paginationCursorBody().request(request).callAsStream()
+ long pagesCount = s.pagination().paginationCursorBody()
+ .request(new PaginationCursorBodyRequestBody(cursor)).callAsStream()
.flatMap(x -> x.res().stream()).count();
assertEquals(3, pagesCount);
- long itemsCount = s.pagination().paginationCursorBody().request(request)
+ long itemsCount = s.pagination().paginationCursorBody()
+ .request(new PaginationCursorBodyRequestBody(cursor))
.callAsStreamUnwrapped()
.count();
assertEquals(20, itemsCount);
@@ -476,9 +484,11 @@
SDK s = SDK.builder().client(recordingClient).build();
- PaginationWithRetriesResponse res = s.pagination().paginationWithRetries()
+ Iterator<PaginationWithRetriesResponse> iterator = s.pagination().paginationWithRetries()
.requestId(UUID.randomUUID().toString())
- .call();
+ .callAsIterable().iterator();
+ assertTrue(iterator.hasNext());
+ PaginationWithRetriesResponse res = iterator.next();
int count = 0;
@@ -487,20 +497,20 @@
assertEquals(15, res.res().get().resultArray().size());
count += res.res().get().resultArray().size();
- Optional<PaginationWithRetriesResponse> nextRes = res.next();
- assertTrue(nextRes.isPresent());
- res = nextRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(5, res.res().get().resultArray().size());
- count += res.res().get().resultArray().size();
-
- Optional<PaginationWithRetriesResponse> penultimateRes = res.next();
- assertTrue(penultimateRes.isPresent());
- res = penultimateRes.get();
- assertEquals(200, res.statusCode());
- assertEquals(0, res.res().get().resultArray().size());
+ assertTrue(iterator.hasNext());
+ PaginationWithRetriesResponse nextRes = iterator.next();
+ assertNotNull(nextRes);
+ assertEquals(200, nextRes.statusCode());
+ assertEquals(5, nextRes.res().get().resultArray().size());
+ count += nextRes.res().get().resultArray().size();
+
+ assertTrue(iterator.hasNext());
+ PaginationWithRetriesResponse penultimateRes = iterator.next();
+ assertNotNull(penultimateRes);
+ assertEquals(200, penultimateRes.statusCode());
+ assertEquals(0, penultimateRes.res().get().resultArray().size());
- assertFalse(res.next().isPresent());
+ assertFalse(iterator.hasNext());
assertEquals(20, count);
@@ -510,8 +520,7 @@
"503:GET:/pagination/cursor_non_numeric",
"200:GET:/pagination/cursor_non_numeric",
"200:GET:/pagination/cursor_non_numeric",
- "200:GET:/pagination/cursor_non_numeric"
- );
+ "200:GET:/pagination/cursor_non_numeric");
assertEquals(expected, recordingClient.log());
}
@@ -536,8 +545,7 @@
"503:GET:/pagination/cursor_non_numeric",
"200:GET:/pagination/cursor_non_numeric",
"200:GET:/pagination/cursor_non_numeric",
- "200:GET:/pagination/cursor_non_numeric"
- );
+ "200:GET:/pagination/cursor_non_numeric");
assertEquals(expected, recordingClient.log());
}
diff '--color=auto' -ruNwB templates/templates/javav2/tests/primary/RequestBodiesAdditionalTest.java templates/templates/javav2/tests/java25-refresh/RequestBodiesAdditionalTest.java
--- templates/templates/javav2/tests/primary/RequestBodiesAdditionalTest.java 2025-06-20 11:53:31.401562709 +0100
+++ templates/templates/javav2/tests/java25-refresh/RequestBodiesAdditionalTest.java 2025-06-20 12:53:08.282110641 +0100
@@ -11,7 +11,6 @@
import java.util.Optional;
import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openapis.openapi.models.operations.DifferentFileName;
import org.openapis.openapi.models.operations.File;
@@ -34,7 +33,7 @@
import org.openapis.openapi.models.shared.NullableObject;
import org.openapis.openapi.models.shared.SimpleObject;
import org.openapis.openapi.utils.JSON;
-import org.openapitools.jackson.nullable.JsonNullable;
+import org.junit.jupiter.api.Disabled;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -211,11 +210,11 @@
assertNotNull(s);
NullableRequiredPropertyPostRequestBody req = NullableRequiredPropertyPostRequestBody
- .builder().nullableOptionalInt(JsonNullable.of(null))
- .nullableRequiredArray(Optional.empty()).nullableRequiredEnum(Optional.empty())
- .nullableRequiredInt(Optional.empty()).nullableRequiredDateTime(Optional.empty())
- .nullableRequiredBigIntStr(Optional.empty())
- .nullableRequiredDecimalStr(Optional.empty()).build();
+ .builder().nullableOptionalInt(null)
+ .nullableRequiredArray(null).nullableRequiredEnum(null)
+ .nullableRequiredInt(null).nullableRequiredDateTime(null)
+ .nullableRequiredBigIntStr(null)
+ .nullableRequiredDecimalStr(null).build();
NullableRequiredPropertyPostResponse res =
s.requestBodies().nullableRequiredPropertyPost().request(req).call();
assertEquals(200, res.statusCode());
@@ -231,11 +230,11 @@
assertNotNull(s);
NullableRequiredPropertyPostRequestBody req = NullableRequiredPropertyPostRequestBody
- .builder().nullableOptionalInt(JsonNullable.undefined())
- .nullableRequiredArray(Optional.empty()).nullableRequiredEnum(Optional.empty())
- .nullableRequiredInt(Optional.empty()).nullableRequiredDateTime(Optional.empty())
- .nullableRequiredBigIntStr(Optional.empty())
- .nullableRequiredDecimalStr(Optional.empty()).build();
+ .builder()
+ .nullableRequiredArray(null).nullableRequiredEnum(null)
+ .nullableRequiredInt(null).nullableRequiredDateTime(null)
+ .nullableRequiredBigIntStr(null)
+ .nullableRequiredDecimalStr(null).build();
NullableRequiredPropertyPostResponse res =
s.requestBodies().nullableRequiredPropertyPost().request(req).call();
assertEquals(200, res.statusCode());
@@ -258,8 +257,8 @@
NullableRequiredSharedObjectPostRequestBody req =
NullableRequiredSharedObjectPostRequestBody.builder()
- .nullableOptionalObj(JsonNullable.of(null))
- .nullableRequiredObj(Optional.empty()).build();
+ .nullableOptionalObj(null)
+ .nullableRequiredObj(null).build();
NullableRequiredSharedObjectPostResponse res =
s.requestBodies().nullableRequiredSharedObjectPost().request(req).call();
assertEquals(200, res.statusCode());
@@ -279,7 +278,7 @@
NullableRequiredSharedObjectPostRequestBody req =
NullableRequiredSharedObjectPostRequestBody.builder()
- .nullableRequiredObj(Optional.empty()).build();
+ .nullableRequiredObj(null).build();
NullableRequiredSharedObjectPostResponse res =
s.requestBodies().nullableRequiredSharedObjectPost().request(req).call();
assertEquals(200, res.statusCode());
diff '--color=auto' -ruNwB templates/templates/javav2/tests/primary/UnionsAdditionalTest.java templates/templates/javav2/tests/java25-refresh/UnionsAdditionalTest.java
--- templates/templates/javav2/tests/primary/UnionsAdditionalTest.java 2025-04-17 14:07:58.172680312 +0100
+++ templates/templates/javav2/tests/java25-refresh/UnionsAdditionalTest.java 2025-06-20 12:44:15.550355646 +0100
@@ -3,6 +3,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.openapis.openapi.Helpers.checkRoundTrip;
@@ -136,8 +137,8 @@
.dateTime(OffsetDateTime.of(2020, 1, 1, 0, 0, 0, 1, ZoneOffset.UTC)) //
.boolOpt(true) //
.strOpt("testOptional") //
- .intOptNull(Optional.empty()) //
- .numOptNull(Optional.empty()) //
+ .intOptNull(null) //
+ .numOptNull(null) //
.type("simpleObjectWithType") //
.build();
@@ -294,11 +295,13 @@
SDK s = SDK.builder().build();
TypedObjectNullableOneOfPostResponse res = s.unions().typedObjectNullableOneOfPost() //
- .request(Optional.empty())
+ .request(null)
.call();
assertNotNull(res);
assertEquals(HttpStatus.SC_OK, res.statusCode());
- assertFalse(res.res().get().json().isPresent());
+ assertTrue(res.res().isPresent());
+ assertTrue(res.res().get().json().isPresent());
+ assertNull(res.res().get().json().get());
}
@Test
@@ -355,12 +358,14 @@
SDK s = SDK.builder().build();
NullableTypedObjectPostResponse res = s.unions().nullableTypedObjectPost() //
- .request(Optional.empty()) //
+ .request(null) //
.call();
assertNotNull(res);
assertEquals(HttpStatus.SC_OK, res.statusCode());
- assertFalse(res.res().get().json().isPresent());
+ assertTrue(res.res().isPresent());
+ assertTrue(res.res().get().json().isPresent());
+ assertNull(res.res().get().json().get());
}
@Test
@@ -388,13 +393,16 @@
SDK s = SDK.builder().build();
- NullableOneOfSchemaPostResponse res = s.unions().nullableOneOfSchemaPost() //
- .request(Optional.empty()) //
+ NullableOneOfSchemaPostResponse res = s.unions()
+ .nullableOneOfSchemaPost() //
+ .request(null) //
.call();
assertNotNull(res);
assertEquals(HttpStatus.SC_OK, res.statusCode());
- assertFalse(res.res().get().json().isPresent());
+ assertTrue(res.res().isPresent());
+ assertTrue(res.res().get().json().isPresent());
+ assertNull(res.res().get().json().get());
}
@Test
@@ -642,8 +650,10 @@
.oneOfOne(true) //
.build();
checkRoundTrip(o);
- assertFalse(o.nullableOneOfOne().isPresent());
- assertFalse(o.nullableOneOfTwo().isPresent());
+ assertTrue(o.nullableOneOfOne().isPresent());
+ assertNull(o.nullableOneOfOne().get());
+ assertTrue(o.nullableOneOfTwo().isPresent());
+ assertNull(o.nullableOneOfTwo().get());
// ensure required nullable fields are present with value null
JsonNode node = Helpers.jsonTree(o);
assertTrue(node.get("NullableOneOfOne").getNodeType() == JsonNodeType.NULL);
@@ -651,8 +661,8 @@
}
{
NullableOneOfTypeInObject o = NullableOneOfTypeInObject.builder() //
- .nullableOneOfOne(Optional.empty()) //
- .nullableOneOfTwo(Optional.empty()) //
+ .nullableOneOfOne(null) //
+ .nullableOneOfTwo(null) //
.oneOfOne(true) //
.build();
checkRoundTrip(o);
@@ -683,8 +693,10 @@
.build())) //
.build();
checkRoundTrip(o);
- assertFalse(o.nullableOneOfOne().isPresent());
- assertFalse(o.nullableOneOfTwo().isPresent());
+ assertTrue(o.nullableOneOfOne().isPresent());
+ assertNull(o.nullableOneOfOne().get());
+ assertTrue(o.nullableOneOfTwo().isPresent());
+ assertNull(o.nullableOneOfTwo().get());
// ensure required nullable fields are present with value null
JsonNode node = Helpers.jsonTree(o);
assertTrue(node.get("NullableOneOfOne").getNodeType() == JsonNodeType.NULL);
@@ -692,8 +704,8 @@
}
{
NullableOneOfRefInObject o = NullableOneOfRefInObject.builder() //
- .nullableOneOfOne(Optional.empty()) //
- .nullableOneOfTwo(Optional.empty()) //
+ .nullableOneOfOne(null) //
+ .nullableOneOfTwo(null) //
.oneOfOne(OneOfOne.of( //
TypedObject1.builder() //
.value("one") //
@@ -748,8 +760,8 @@
.dateTime(OffsetDateTime.of(2020, 1, 1, 0, 0, 0, 1, ZoneOffset.UTC)) //
.boolOpt(true) //
.strOpt("testOptional") //
- .intOptNull(Optional.empty()) //
- .numOptNull(Optional.empty()) //
+ .intOptNull(null) //
+ .numOptNull(null) //
.objType("simpleObjectWithNonStandardTypeName") //
.build();
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment