diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
index ebafb6b5e42..ca384edfac4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
@@ -68,11 +68,11 @@ public class CodegenOperation {
      * @return true if parameter exists, false otherwise
      */
     private static boolean nonEmpty(List<?> params) {
-        return params != null && params.size() > 0;
+        return params != null && !params.isEmpty();
     }
 
     private static boolean nonEmpty(Map<?, ?> params) {
-        return params != null && params.size() > 0;
+        return params != null && !params.isEmpty();
     }
 
     /**
@@ -189,7 +189,7 @@ public class CodegenOperation {
      * @return true if responses contain a default response, false otherwise
      */
     public boolean getHasDefaultResponse() {
-        return responses.stream().filter(response -> response.isDefault).findFirst().isPresent();
+        return responses.stream().anyMatch(response -> response.isDefault);
     }
 
     /**