Skip to content

fixes #13 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mservicetech</groupId>
<artifactId>openapi-schema-validation</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<packaging>jar</packaging>
<description>openapi schema for openpai 3.*</description>
<url>https://github.com/mservicetech/openapi-schema-validation</url>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ private Status validatePathParameters(final RequestEntity requestEntity, final N
return result.getStatus();
}
if (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
return new Status(VALIDATOR_REQUEST_PARAMETER_MISSING, openApiOperation.getMethod(), openApiOperation.getPathString().original());
return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
.filter(s->s != null).findFirst().get();
}
return null;
}
Expand Down Expand Up @@ -231,7 +232,8 @@ private Status validateQueryParameters(final RequestEntity requestEntity, final
return result.getStatus();
}
if (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
return new Status(VALIDATOR_REQUEST_PARAMETER_MISSING, openApiOperation.getMethod(), openApiOperation.getPathString().original());
return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
.filter(s->s != null).findFirst().get();
}
return null;
}
Expand Down Expand Up @@ -260,7 +262,8 @@ private Optional<Status> validatePathLevelHeaders(final RequestEntity requestEnt
return Optional.ofNullable(result.getStatus());
}
if (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING, openApiOperation.getMethod(), openApiOperation.getPathString().original()));
return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
.filter(s->s != null).findFirst();
}
return Optional.ofNullable(null);
}
Expand All @@ -274,7 +277,8 @@ private Optional<Status> validateOperationLevelHeaders(final RequestEntity reque
return Optional.ofNullable(result.getStatus());
}
if (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING, openApiOperation.getMethod(), openApiOperation.getPathString().original()));
return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
.filter(s->s != null).findFirst();
}
return Optional.ofNullable(null);
}
Expand All @@ -300,7 +304,8 @@ private Optional<Status> validatePathLevelCookies(final RequestEntity requestEnt
return Optional.ofNullable(result.getStatus());
}
if (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING, openApiOperation.getMethod(), openApiOperation.getPathString().original()));
return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
.filter(s->s != null).findFirst();
}
return Optional.ofNullable(null);
}
Expand All @@ -314,7 +319,8 @@ private Optional<Status> validateOperationLevelCookies(final RequestEntity reque
return Optional.ofNullable(result.getStatus());
}
if (result.skippedParameters!=null && !result.skippedParameters.isEmpty()) {
return Optional.ofNullable(new Status(VALIDATOR_REQUEST_PARAMETER_MISSING, openApiOperation.getMethod(), openApiOperation.getPathString().original()));
return result.skippedParameters.stream().map(p-> new Status (VALIDATOR_REQUEST_PARAMETER_MISSING, p.getName(), openApiOperation.getPathString().original()))
.filter(s->s != null).findFirst();
}
return Optional.ofNullable(null);
}
Expand Down Expand Up @@ -367,7 +373,7 @@ public Status getStatus() {
return statuses.isEmpty()?null:statuses.get(0);
}

public List<Status> getAllStatueses(){
public List<Status> getAllStatues(){
return Collections.unmodifiableList(statuses);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,28 @@ public void testRequestPath4() {
}

@Test
public void testRequestQueryMissNotRequired() {
public void testRequestQueryMissRequired() {

RequestEntity requestEntity = new RequestEntity();
Map<String, Object> queryMap = new HashMap<>();
requestEntity.setQueryParameters(queryMap);
Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
Assert.assertNull(status);
Assert.assertNotNull(status);
Assert.assertEquals( status.getCode(), "ERR11001");
// {"statusCode":400,"code":"ERR11001","message":"VALIDATOR_REQUEST_PARAMETER_MISSING","description":"Parameter limit is required but is missing.","severity":"ERROR"}
}

@Test
public void testRequestQueryRequiredWithEmpty() {

RequestEntity requestEntity = new RequestEntity();
Map<String, Object> queryMap = new HashMap<>();
requestEntity.setQueryParameters(queryMap);
queryMap.put("limit", null);
Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
Assert.assertEquals( status.getCode(), "ERR11001");
//{"statusCode":400,"code":"ERR11001","message":"VALIDATOR_REQUEST_PARAMETER_MISSING","description":"Parameter limit is required but is missing.","severity":"ERROR"}
Assert.assertNotNull(status);
}

@Test
Expand Down Expand Up @@ -171,6 +186,7 @@ public void testRequestQueryBooleanType() {
RequestEntity requestEntity = new RequestEntity();
Map<String, Object> queryMap = new HashMap<>();
queryMap.put("includeCode", "true");
queryMap.put("limit", 12);
requestEntity.setQueryParameters(queryMap);
Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
Assert.assertNull(status);
Expand All @@ -182,6 +198,7 @@ public void testRequestQueryBooleanTypeWithError() {
RequestEntity requestEntity = new RequestEntity();
Map<String, Object> queryMap = new HashMap<>();
queryMap.put("includeCode", "yes");
queryMap.put("limit", 12);
requestEntity.setQueryParameters(queryMap);
Status status = openApiValidator.validateRequestPath("/pets", "get", requestEntity);
Assert.assertNotNull(status);
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ paths:
- name: limit
in: query
description: How many items to return at one time (max 100)
required: false
required: true
schema:
type: integer
format: int32
Expand Down