Fixed NPE

NPE when validating method with query parameters without providing the correct query parameter as part of the request

Author: Chris Wiechmann

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.6.3] 2022-07-05
+### Fixed
+- NPE when validating method with query parameters without providing the correct query parameter as part of the request
+
 ## [1.6.2] 2022-06-30
 ### Fixed
 - If a Content-Type header is set, it is used for validation and then removed, because it additionally exists in the http.content.headers attribute.

src/main/java/com/axway/apim/openapi/validator/OpenAPIValidator.java

@@ -224,6 +224,7 @@ public Collection<String> getQueryParameters() {
 			public Collection<String> getQueryParameterValues(String name) {
 				if(queryParams==null) return Collections.emptyList();
 				ArrayList<String> values = queryParams.getHeaderValues(name);
+				if(values == null) return Collections.emptyList();
 				if(decodeQueryParams) {
 					values.replaceAll(headerValue -> {
 						try {

src/test/java/com/axway/apim/openapi/validator/TestOpenAPIValidator.java

@@ -86,6 +86,21 @@ public void validGetRequestPetsByStatusPetstoreSwagger20() throws IOException
     	Assert.assertTrue(validator.isValidRequest(null, verb, path, queryParams, headers), "Request should be valid!");
     }
 
+    @Test
+    public void invalidGetRequestPetsByStatusWithoutQueryParam() throws IOException
+    {
+    	String swagger = Files.readFile(this.getClass().getClassLoader().getResourceAsStream(TEST_PACKAGE + "PetstoreSwagger2.0.json"));
+    	OpenAPIValidator validator = OpenAPIValidator.getInstance(swagger);
+    	
+    	String path = "/pet/findByStatus";
+    	QueryStringHeaderSet queryParams = new QueryStringHeaderSet();
+    	String verb = "GET";
+    	HeaderSet headers = new HeaderSet();
+    	headers.addHeader("Content-Type", "application/json");
+    	
+    	Assert.assertFalse(validator.isValidRequest(null, verb, path, queryParams, headers), "Request is invalid!");
+    }
+    
     @Test
     public void validRequestWithFullPathAndPathParameter() throws IOException
     {