Skip to content

Commit 7d0994f

Browse files
wing328wing328
committed
Merge branch '22602-apiUtil-must-test-variable-nullity' of https://github.com/pkernevez/openapi-generator into pkernevez-22602-apiUtil-must-test-variable-nullity
2 parents 99baae6 + 64fec76 commit 7d0994f

35 files changed

Lines changed: 175 additions & 105 deletions

File tree

  • modules/openapi-generator/src/main/resources/JavaSpring
  • samples
    • openapi3
      • client/petstore
        • spring-stubs-skip-default-interface/src/main/java/org/openapitools/api
        • spring-stubs/src/main/java/org/openapitools/api
      • server/petstore
        • spring-boot-oneof-interface/src/main/java/org/openapitools/api
        • spring-boot-oneof-sealed/src/main/java/org/openapitools/api
        • spring-boot-oneof/src/main/java/org/openapitools/api
        • spring-boot-springdoc/src/main/java/org/openapitools/api
        • springboot-3/src/main/java/org/openapitools/api
        • springboot-delegate/src/main/java/org/openapitools/api
        • springboot-implicitHeaders/src/main/java/org/openapitools/api
        • springboot-source/src/main/java/org/openapitools/api
        • springboot/src/main/java/org/openapitools/api
    • server/petstore
      • spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/api
      • spring-boot-nullable-set/src/main/java/org/openapitools/api
      • springboot-api-response-examples/src/main/java/org/openapitools/api
      • springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api
      • springboot-beanvalidation/src/main/java/org/openapitools/api
      • springboot-builtin-validation/src/main/java/org/openapitools/api
      • springboot-delegate-j8/src/main/java/org/openapitools/api
      • springboot-delegate-no-response-entity/src/main/java/org/openapitools/api
      • springboot-delegate/src/main/java/org/openapitools/api
      • springboot-file-delegate-optional/src/main/java/org/openapitools/api
      • springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api
      • springboot-implicitHeaders/src/main/java/org/openapitools/api
      • springboot-lombok-data/src/main/java/org/openapitools/api
      • springboot-lombok-tostring/src/main/java/org/openapitools/api
      • springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api
      • springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api
      • springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api
      • springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api
      • springboot-spring-pageable/src/main/java/org/openapitools/api
      • springboot-spring-provide-args/src/main/java/org/openapitools/api
      • springboot-useoptional/src/main/java/org/openapitools/api
      • springboot-virtualan/src/main/java/org/openapitools/virtualan/api
      • springboot/src/main/java/org/openapitools/api

‎modules/openapi-generator/src/main/resources/JavaSpring/apiUtil.mustache‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ public class ApiUtil {
2121
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
2222
try {
2323
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
24-
res.setCharacterEncoding("UTF-8");
25-
res.addHeader("Content-Type", contentType);
26-
res.getWriter().print(example);
24+
if (res != null) {
25+
res.setCharacterEncoding("UTF-8");
26+
res.addHeader("Content-Type", contentType);
27+
res.getWriter().print(example);
28+
}
2729
} catch (IOException e) {
2830
throw new RuntimeException(e);
2931
}

‎samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

‎samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/ApiUtil.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ public class ApiUtil {
99
public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
1010
try {
1111
HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class);
12-
res.setCharacterEncoding("UTF-8");
13-
res.addHeader("Content-Type", contentType);
14-
res.getWriter().print(example);
12+
if (res != null) {
13+
res.setCharacterEncoding("UTF-8");
14+
res.addHeader("Content-Type", contentType);
15+
res.getWriter().print(example);
16+
}
1517
} catch (IOException e) {
1618
throw new RuntimeException(e);
1719
}

0 commit comments

Comments
 (0)