fix nullable warning

hauner · hauner · commit adbdcd6f50dc · 2023-09-17T10:42:36.000+02:00
diff --git a/openapi-parser/src/main/java/io/openapiparser/model/v30/PathItem.java b/openapi-parser/src/main/java/io/openapiparser/model/v30/PathItem.java
@@ -49,42 +49,42 @@ public PathItem getRefObject () {
     }
 
     public @Nullable Operation getGet () {
-        return getOperation (GET);
+        return getOperationOrNull(GET);
     }
 
     public @Nullable Operation getPut () {
-        return getOperation (PUT);
+        return getOperationOrNull(PUT);
     }
 
     public @Nullable Operation getPost () {
-        return getOperation (POST);
+        return getOperationOrNull(POST);
     }
 
     public @Nullable Operation getDelete () {
-        return getOperation (DELETE);
+        return getOperationOrNull(DELETE);
     }
 
     public @Nullable Operation getOptions () {
-        return getOperation (OPTIONS);
+        return getOperationOrNull(OPTIONS);
     }
 
     public @Nullable Operation getHead () {
-        return getOperation (HEAD);
+        return getOperationOrNull(HEAD);
     }
 
     public @Nullable Operation getPatch () {
-        return getOperation (PATCH);
+        return getOperationOrNull(PATCH);
     }
 
     public @Nullable Operation getTrace () {
-        return getOperation (TRACE);
+        return getOperationOrNull(TRACE);
     }
 
     public Map<String, Operation> getOperations () {
         Map<String, Operation> operations = new LinkedHashMap<>();
         bucket.forEach ((operation, value) -> {
             if (OPERATIONS.contains (operation)) {
-                operations.put(operation, getOperation (operation));
+                operations.put(operation, getOperation(operation));
             }
         });
         return Collections.unmodifiableMap (operations);
@@ -98,7 +98,11 @@ public Collection<Parameter> getParameters () {
         return getObjectsOrEmpty (PARAMETERS, Parameter.class);
     }
 
-    private @Nullable Operation getOperation(String property) {
+    private Operation getOperation(String property) {
+        return getObjectOrThrow (property, Operation.class);
+    }
+
+    private @Nullable Operation getOperationOrNull(String property) {
         return getObjectOrNull (property, Operation.class);
     }
 
diff --git a/openapi-parser/src/main/java/io/openapiparser/model/v31/PathItem.java b/openapi-parser/src/main/java/io/openapiparser/model/v31/PathItem.java
@@ -51,35 +51,35 @@ public PathItem getRefObject () {
     }
 
     public @Nullable Operation getGet () {
-        return getOperation (GET);
+        return getOperationOrNull(GET);
     }
 
     public @Nullable Operation getPut () {
-        return getOperation (PUT);
+        return getOperationOrNull(PUT);
     }
 
     public @Nullable Operation getPost () {
-        return getOperation (POST);
+        return getOperationOrNull(POST);
     }
 
     public @Nullable Operation getDelete () {
-        return getOperation (DELETE);
+        return getOperationOrNull(DELETE);
     }
 
     public @Nullable Operation getOptions () {
-        return getOperation (OPTIONS);
+        return getOperationOrNull(OPTIONS);
     }
 
     public @Nullable Operation getHead () {
-        return getOperation (HEAD);
+        return getOperationOrNull(HEAD);
     }
 
     public @Nullable Operation getPatch () {
-        return getOperation (PATCH);
+        return getOperationOrNull(PATCH);
     }
 
     public @Nullable Operation getTrace () {
-        return getOperation (TRACE);
+        return getOperationOrNull(TRACE);
     }
 
     public Map<String, Operation> getOperations () {
@@ -100,7 +100,11 @@ public Collection<Parameter> getParameters () {
         return getObjectsOrEmpty (PARAMETERS, Parameter.class);
     }
 
-    private @Nullable Operation getOperation(String property) {
+    private Operation getOperation(String property) {
+        return getObjectOrThrow (property, Operation.class);
+    }
+
+    private @Nullable Operation getOperationOrNull(String property) {
         return getObjectOrNull (property, Operation.class);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -49,42 +49,42 @@ public PathItem getRefObject () {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public @Nullable Operation getGet () {`
`52`		`- return getOperation (GET);`
	`52`	`+ return getOperationOrNull(GET);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public @Nullable Operation getPut () {`
`56`		`- return getOperation (PUT);`
	`56`	`+ return getOperationOrNull(PUT);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public @Nullable Operation getPost () {`
`60`		`- return getOperation (POST);`
	`60`	`+ return getOperationOrNull(POST);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public @Nullable Operation getDelete () {`
`64`		`- return getOperation (DELETE);`
	`64`	`+ return getOperationOrNull(DELETE);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public @Nullable Operation getOptions () {`
`68`		`- return getOperation (OPTIONS);`
	`68`	`+ return getOperationOrNull(OPTIONS);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public @Nullable Operation getHead () {`
`72`		`- return getOperation (HEAD);`
	`72`	`+ return getOperationOrNull(HEAD);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public @Nullable Operation getPatch () {`
`76`		`- return getOperation (PATCH);`
	`76`	`+ return getOperationOrNull(PATCH);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public @Nullable Operation getTrace () {`
`80`		`- return getOperation (TRACE);`
	`80`	`+ return getOperationOrNull(TRACE);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public Map<String, Operation> getOperations () {`
`84`	`84`	`Map<String, Operation> operations = new LinkedHashMap<>();`
`85`	`85`	`bucket.forEach ((operation, value) -> {`
`86`	`86`	`if (OPERATIONS.contains (operation)) {`
`87`		`- operations.put(operation, getOperation (operation));`
	`87`	`+ operations.put(operation, getOperation(operation));`
`88`	`88`	`}`
`89`	`89`	`});`
`90`	`90`	`return Collections.unmodifiableMap (operations);`
`@@ -98,7 +98,11 @@ public Collection<Parameter> getParameters () {`
`98`	`98`	`return getObjectsOrEmpty (PARAMETERS, Parameter.class);`
`99`	`99`	`}`
`100`	`100`
`101`		`- private @Nullable Operation getOperation(String property) {`
	`101`	`+ private Operation getOperation(String property) {`
	`102`	`+ return getObjectOrThrow (property, Operation.class);`
	`103`	`+ }`
	`104`	`+`
	`105`	`+ private @Nullable Operation getOperationOrNull(String property) {`
`102`	`106`	`return getObjectOrNull (property, Operation.class);`
`103`	`107`	`}`
`104`	`108`
Original file line number	Diff line number	Diff line change
`@@ -51,35 +51,35 @@ public PathItem getRefObject () {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public @Nullable Operation getGet () {`
`54`		`- return getOperation (GET);`
	`54`	`+ return getOperationOrNull(GET);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public @Nullable Operation getPut () {`
`58`		`- return getOperation (PUT);`
	`58`	`+ return getOperationOrNull(PUT);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public @Nullable Operation getPost () {`
`62`		`- return getOperation (POST);`
	`62`	`+ return getOperationOrNull(POST);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public @Nullable Operation getDelete () {`
`66`		`- return getOperation (DELETE);`
	`66`	`+ return getOperationOrNull(DELETE);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public @Nullable Operation getOptions () {`
`70`		`- return getOperation (OPTIONS);`
	`70`	`+ return getOperationOrNull(OPTIONS);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public @Nullable Operation getHead () {`
`74`		`- return getOperation (HEAD);`
	`74`	`+ return getOperationOrNull(HEAD);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public @Nullable Operation getPatch () {`
`78`		`- return getOperation (PATCH);`
	`78`	`+ return getOperationOrNull(PATCH);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public @Nullable Operation getTrace () {`
`82`		`- return getOperation (TRACE);`
	`82`	`+ return getOperationOrNull(TRACE);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public Map<String, Operation> getOperations () {`
`@@ -100,7 +100,11 @@ public Collection<Parameter> getParameters () {`
`100`	`100`	`return getObjectsOrEmpty (PARAMETERS, Parameter.class);`
`101`	`101`	`}`
`102`	`102`
`103`		`- private @Nullable Operation getOperation(String property) {`
	`103`	`+ private Operation getOperation(String property) {`
	`104`	`+ return getObjectOrThrow (property, Operation.class);`
	`105`	`+ }`
	`106`	`+`
	`107`	`+ private @Nullable Operation getOperationOrNull(String property) {`
`104`	`108`	`return getObjectOrNull (property, Operation.class);`
`105`	`109`	`}`
`106`	`110`