Format code

joschi · joschi · commit 03b16460f18c · 2020-04-16T13:49:12.000+02:00
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/ExtensionsDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/ExtensionsDiff.java
@@ -29,9 +29,7 @@ public boolean isParentApplicable(
     if (extensions.size() == 0) {
       return true;
     }
-    return extensions
-        .entrySet()
-        .stream()
+    return extensions.entrySet().stream()
         .map(
             entry ->
                 executeExtension(
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/OpenApiDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/OpenApiDiff.java
@@ -138,27 +138,19 @@ private void preProcess(OpenAPI openApi) {
             .values()
             .forEach(
                 pathItem ->
-                    pathItem
-                        .readOperationsMap()
-                        .values()
-                        .stream()
+                    pathItem.readOperationsMap().values().stream()
                         .filter(operation -> operation.getSecurity() != null)
                         .forEach(
                             operation ->
                                 operation.setSecurity(
-                                    operation
-                                        .getSecurity()
-                                        .stream()
+                                    operation.getSecurity().stream()
                                         .distinct()
                                         .collect(Collectors.toList()))));
         paths
             .values()
             .forEach(
                 pathItem ->
-                    pathItem
-                        .readOperationsMap()
-                        .values()
-                        .stream()
+                    pathItem.readOperationsMap().values().stream()
                         .filter(operation -> operation.getSecurity() == null)
                         .forEach(operation -> operation.setSecurity(distinctSecurityRequirements)));
       }
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/OperationDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/OperationDiff.java
@@ -84,8 +84,7 @@ public void removePathParameters(Map<String, String> pathParameters, ChangedPara
   }
 
   public void removePathParameter(String name, List<Parameter> parameters) {
-    parameters
-        .stream()
+    parameters.stream()
         .filter(p -> "path".equals(p.getIn()) && name.equals(p.getName()))
         .findFirst()
         .ifPresent(parameters::remove);
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/ParametersDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/ParametersDiff.java
@@ -39,8 +39,7 @@ public ParametersDiff(OpenApiDiff openApiDiff) {
 
   public static Optional<Parameter> contains(
       Components components, List<Parameter> parameters, Parameter parameter) {
-    return parameters
-        .stream()
+    return parameters.stream()
         .filter(param -> same(refPointer.resolveRef(components, param, param.get$ref()), parameter))
         .findFirst();
   }
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/PathsDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/PathsDiff.java
@@ -42,9 +42,7 @@ public Optional<ChangedPaths> diff(
               PathItem leftPath = left.get(url);
               String template = normalizePath(url);
               Optional<String> result =
-                  right
-                      .keySet()
-                      .stream()
+                  right.keySet().stream()
                       .filter(s -> normalizePath(s).equals(template))
                       .findFirst();
               if (result.isPresent()) {
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/SecurityDiffInfo.java b/src/main/java/com/qdesrame/openapi/diff/compare/SecurityDiffInfo.java
@@ -30,8 +30,7 @@ public static SecurityRequirement getSecurityRequirement(
 
   public static Optional<List<SecurityDiffInfo>> containsList(
       List<List<SecurityDiffInfo>> securityRequirements, List<SecurityDiffInfo> leftSecurities) {
-    return securityRequirements
-        .stream()
+    return securityRequirements.stream()
         .filter(rightSecurities -> sameList(leftSecurities, rightSecurities))
         .findFirst();
   }
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/SecurityRequirementDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/SecurityRequirementDiff.java
@@ -30,9 +30,7 @@ public SecurityRequirementDiff(OpenApiDiff openApiDiff) {
 
   public static SecurityRequirement getCopy(LinkedHashMap<String, List<String>> right) {
     SecurityRequirement newSecurityRequirement = new SecurityRequirement();
-    right
-        .entrySet()
-        .stream()
+    right.entrySet().stream()
         .forEach(e -> newSecurityRequirement.put(e.getKey(), new ArrayList<>(e.getValue())));
     return newSecurityRequirement;
   }
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/SecurityRequirementsDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/SecurityRequirementsDiff.java
@@ -39,8 +39,7 @@ public SecurityRequirementsDiff(OpenApiDiff openApiDiff) {
 
   public Optional<SecurityRequirement> contains(
       List<SecurityRequirement> securityRequirements, SecurityRequirement left) {
-    return securityRequirements
-        .stream()
+    return securityRequirements.stream()
         .filter(rightSecurities -> same(left, rightSecurities))
         .findFirst();
   }
@@ -63,9 +62,7 @@ public boolean same(SecurityRequirement left, SecurityRequirement right) {
 
   private List<Pair<SecurityScheme.Type, SecurityScheme.In>> getListOfSecuritySchemes(
       Components components, SecurityRequirement securityRequirement) {
-    return securityRequirement
-        .keySet()
-        .stream()
+    return securityRequirement.keySet().stream()
         .map(
             x -> {
               SecurityScheme result = components.getSecuritySchemes().get(x);
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ComposedSchemaDiffResult.java b/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ComposedSchemaDiffResult.java
@@ -115,9 +115,7 @@ private Map<String, String> getMapping(ComposedSchema composedSchema) {
       }
     }
 
-    return reverseMapping
-        .entrySet()
-        .stream()
+    return reverseMapping.entrySet().stream()
         .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
   }
 }
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedOpenApi.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedOpenApi.java
@@ -23,8 +23,7 @@ public class ChangedOpenApi implements ComposedChanged {
   private ChangedExtensions changedExtensions;
 
   public List<Endpoint> getDeprecatedEndpoints() {
-    return changedOperations
-        .stream()
+    return changedOperations.stream()
         .filter(ChangedOperation::isDeprecated)
         .map(
             c ->
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedParameters.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedParameters.java
@@ -39,8 +39,7 @@ public DiffResult isCoreChanged() {
     if (increased.isEmpty() && missing.isEmpty()) {
       return DiffResult.NO_CHANGES;
     }
-    if (increased
-            .stream()
+    if (increased.stream()
             .noneMatch(
                 p -> {
                   return p.getRequired() != null && p.getRequired();
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ComposedChanged.java b/src/main/java/com/qdesrame/openapi/diff/model/ComposedChanged.java
@@ -16,8 +16,7 @@ public interface ComposedChanged extends Changed {
   default DiffResult isChanged() {
     DiffResult elementsResult =
         DiffResult.fromWeight(
-            getChangedElements()
-                .stream()
+            getChangedElements().stream()
                 .filter(Objects::nonNull)
                 .map(Changed::isChanged)
                 .mapToInt(DiffResult::getWeight)
diff --git a/src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java b/src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java
@@ -63,8 +63,7 @@ protected String sectionTitle(String title) {
   protected String listEndpoints(String title, List<Endpoint> endpoints) {
     if (null == endpoints || endpoints.size() == 0) return "";
     StringBuilder sb = new StringBuilder(sectionTitle(title));
-    endpoints
-        .stream()
+    endpoints.stream()
         .map(e -> itemEndpoint(e.getMethod().toString(), e.getPathUrl(), e.getSummary()))
         .forEach(sb::append);
     return sb.toString();
@@ -85,8 +84,7 @@ protected String titleH5(String title) {
   protected String listEndpoints(List<ChangedOperation> changedOperations) {
     if (null == changedOperations || changedOperations.size() == 0) return "";
     StringBuilder sb = new StringBuilder(sectionTitle("What's Changed"));
-    changedOperations
-        .stream()
+    changedOperations.stream()
         .map(
             operation -> {
               StringBuilder details =
@@ -122,20 +120,15 @@ protected String responses(ChangedApiResponse changedApiResponse) {
     StringBuilder sb = new StringBuilder("\n");
     sb.append(listResponse("New response", changedApiResponse.getIncreased()));
     sb.append(listResponse("Deleted response", changedApiResponse.getMissing()));
-    changedApiResponse
-        .getChanged()
-        .entrySet()
-        .stream()
+    changedApiResponse.getChanged().entrySet().stream()
         .map(e -> this.itemResponse(e.getKey(), e.getValue()))
         .forEach(sb::append);
     return sb.toString();
   }
 
   protected String listResponse(String title, Map<String, ApiResponse> responses) {
     StringBuilder sb = new StringBuilder();
-    responses
-        .entrySet()
-        .stream()
+    responses.entrySet().stream()
         .map(e -> this.itemResponse(title, e.getKey(), e.getValue()))
         .forEach(sb::append);
     return sb.toString();
@@ -177,10 +170,7 @@ protected String headers(ChangedHeaders headers) {
     if (headers != null) {
       sb.append(listHeader("New header", headers.getIncreased()))
           .append(listHeader("Deleted header", headers.getMissing()));
-      headers
-          .getChanged()
-          .entrySet()
-          .stream()
+      headers.getChanged().entrySet().stream()
           .map(e -> this.itemHeader(e.getKey(), e.getValue()))
           .forEach(sb::append);
     }
@@ -189,9 +179,7 @@ protected String headers(ChangedHeaders headers) {
 
   protected String listHeader(String title, Map<String, Header> headers) {
     StringBuilder sb = new StringBuilder();
-    headers
-        .entrySet()
-        .stream()
+    headers.entrySet().stream()
         .map(e -> this.itemHeader(title, e.getKey(), e.getValue()))
         .forEach(sb::append);
     return sb.toString();
@@ -225,10 +213,7 @@ protected String bodyContent(String prefix, ChangedContent changedContent) {
     } else {
       deepness = 0;
     }
-    changedContent
-        .getChanged()
-        .entrySet()
-        .stream()
+    changedContent.getChanged().entrySet().stream()
         .map(e -> this.itemContent(deepness, e.getKey(), e.getValue()))
         .forEach(e -> sb.append(prefix).append(e));
     return sb.toString();
@@ -240,9 +225,7 @@ protected String bodyContent(ChangedContent changedContent) {
 
   protected String listContent(String prefix, String title, Map<String, MediaType> mediaTypes) {
     StringBuilder sb = new StringBuilder();
-    mediaTypes
-        .entrySet()
-        .stream()
+    mediaTypes.entrySet().stream()
         .map(e -> this.itemContent(title, e.getKey(), e.getValue()))
         .forEach(e -> sb.append(prefix).append(e));
     return sb.toString();
@@ -340,18 +323,14 @@ protected String schema(int deepness, ComposedSchema schema, DiffContext context
     StringBuilder sb = new StringBuilder();
     if (schema.getAllOf() != null && schema.getAllOf() != null) {
       LOGGER.debug("All of schema");
-      schema
-          .getAllOf()
-          .stream()
+      schema.getAllOf().stream()
           .map(this::resolve)
           .forEach(composedChild -> sb.append(schema(deepness, composedChild, context)));
     }
     if (schema.getOneOf() != null && schema.getOneOf() != null) {
       LOGGER.debug("One of schema");
       sb.append(format("%sOne of:\n\n", indent(deepness)));
-      schema
-          .getOneOf()
-          .stream()
+      schema.getOneOf().stream()
           .map(this::resolve)
           .forEach(composedChild -> sb.append(schema(deepness + 1, composedChild, context)));
     }
diff --git a/src/test/java/com/qdesrame/openapi/test/SecurityDiffTest.java b/src/test/java/com/qdesrame/openapi/test/SecurityDiffTest.java
@@ -21,9 +21,7 @@ public void testDiffDifferent() {
     assertThat(changedOpenApi.getChangedOperations().size() == 3);
 
     ChangedOperation changedOperation1 =
-        changedOpenApi
-            .getChangedOperations()
-            .stream()
+        changedOpenApi.getChangedOperations().stream()
             .filter(x -> x.getPathUrl().equals("/pet/{petId}"))
             .findFirst()
             .get();
@@ -51,9 +49,7 @@ public void testDiffDifferent() {
                     .isEqualTo("read:pets"));
 
     ChangedOperation changedOperation2 =
-        changedOpenApi
-            .getChangedOperations()
-            .stream()
+        changedOpenApi.getChangedOperations().stream()
             .filter(x -> x.getPathUrl().equals("/pet3"))
             .findFirst()
             .get();
@@ -73,9 +69,7 @@ public void testDiffDifferent() {
     assertThat(changedImplicitOAuthFlow2.isAuthorizationUrl()).isTrue();
 
     ChangedOperation changedOperation3 =
-        changedOpenApi
-            .getChangedOperations()
-            .stream()
+        changedOpenApi.getChangedOperations().stream()
             .filter(x -> x.getPathUrl().equals("/pet/findByStatus2"))
             .findFirst()
             .get();
diff --git a/src/test/java/com/qdesrame/openapi/test/Swagger2CompatibilityTest.java b/src/test/java/com/qdesrame/openapi/test/Swagger2CompatibilityTest.java
@@ -1,20 +1,20 @@
 package com.qdesrame.openapi.test;
 
-import org.junit.Test;
-
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
 
+import org.junit.Test;
+
 public class Swagger2CompatibilityTest {
-    private final String SWAGGER_DOC1 = "petstore_swagger2.yaml";
-    private final String OPENAPI_DOC2 = "petstore_openapi3.yaml";
+  private final String SWAGGER_DOC1 = "petstore_swagger2.yaml";
+  private final String OPENAPI_DOC2 = "petstore_openapi3.yaml";
 
-    @Test
-    public void testEqual() {
-        assertOpenApiAreEquals(SWAGGER_DOC1, SWAGGER_DOC1);
-    }
+  @Test
+  public void testEqual() {
+    assertOpenApiAreEquals(SWAGGER_DOC1, SWAGGER_DOC1);
+  }
 
-    @Test
-    public void testSwagger2ToOpenapi3() {
-        assertOpenApiAreEquals(SWAGGER_DOC1, OPENAPI_DOC2);
-    }
+  @Test
+  public void testSwagger2ToOpenapi3() {
+    assertOpenApiAreEquals(SWAGGER_DOC1, OPENAPI_DOC2);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ public void removePathParameters(Map<String, String> pathParameters, ChangedPara`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public void removePathParameter(String name, List<Parameter> parameters) {`
`87`		`- parameters`
`88`		`- .stream()`
	`87`	`+ parameters.stream()`
`89`	`88`	`.filter(p -> "path".equals(p.getIn()) && name.equals(p.getName()))`
`90`	`89`	`.findFirst()`
`91`	`90`	`.ifPresent(parameters::remove);`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ public ParametersDiff(OpenApiDiff openApiDiff) {`
`39`	`39`
`40`	`40`	`public static Optional<Parameter> contains(`
`41`	`41`	`Components components, List<Parameter> parameters, Parameter parameter) {`
`42`		`- return parameters`
`43`		`- .stream()`
	`42`	`+ return parameters.stream()`
`44`	`43`	`.filter(param -> same(refPointer.resolveRef(components, param, param.get$ref()), parameter))`
`45`	`44`	`.findFirst();`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ public static SecurityRequirement getSecurityRequirement(`
`30`	`30`
`31`	`31`	`public static Optional<List<SecurityDiffInfo>> containsList(`
`32`	`32`	`List<List<SecurityDiffInfo>> securityRequirements, List<SecurityDiffInfo> leftSecurities) {`
`33`		`- return securityRequirements`
`34`		`- .stream()`
	`33`	`+ return securityRequirements.stream()`
`35`	`34`	`.filter(rightSecurities -> sameList(leftSecurities, rightSecurities))`
`36`	`35`	`.findFirst();`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,7 @@ private Map<String, String> getMapping(ComposedSchema composedSchema) {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`- return reverseMapping`
`119`		`- .entrySet()`
`120`		`- .stream()`
	`118`	`+ return reverseMapping.entrySet().stream()`
`121`	`119`	`.collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));`
`122`	`120`	`}`
`123`	`121`	`}`