From 7eb6d45338bd96172d8f4d88a8b613ebc67207b5 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 9 Mar 2021 12:24:09 +0100 Subject: [PATCH] Polish --- .../verifier/builder/GroovyBodyParser.java | 3 +-- .../verifier/builder/JaxRsUrlPathWhen.java | 3 +-- .../contract/verifier/builder/JaxRsWhen.java | 15 +++++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/GroovyBodyParser.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/GroovyBodyParser.java index 5333825dcd..9c2919c6b5 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/GroovyBodyParser.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/GroovyBodyParser.java @@ -83,8 +83,7 @@ interface GroovyBodyParser extends BodyParser { escapedString = "\\'" + escapedString.substring(1); } if (escapedString.endsWith("'")) { - escapedString = escapedString.substring(0, escapedString.length() - 1) - + "\\'"; + escapedString = escapedString.substring(0, escapedString.length() - 1) + "\\'"; } return "'''" + escapedString + "'''"; } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsUrlPathWhen.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsUrlPathWhen.java index 0be77f743d..ca8236c3fe 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsUrlPathWhen.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsUrlPathWhen.java @@ -35,8 +35,7 @@ class JaxRsUrlPathWhen implements When, JaxRsAcceptor, QueryParamsResolver { private final BodyParser bodyParser; - JaxRsUrlPathWhen(BlockBuilder blockBuilder, GeneratedClassMetaData metaData, - BodyParser bodyParser) { + JaxRsUrlPathWhen(BlockBuilder blockBuilder, GeneratedClassMetaData metaData, BodyParser bodyParser) { this.blockBuilder = blockBuilder; this.generatedClassMetaData = metaData; this.bodyParser = bodyParser; diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsWhen.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsWhen.java index af327ba738..eb844faff9 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsWhen.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/JaxRsWhen.java @@ -36,14 +36,13 @@ class JaxRsWhen implements When, BodyMethodVisitor, JaxRsAcceptor { this.blockBuilder = blockBuilder; this.generatedClassMetaData = generatedClassMetaData; this.bodyParser = bodyParser; - this.whens.addAll(Arrays.asList( - new JaxRsUrlPathWhen(this.blockBuilder, this.generatedClassMetaData, - bodyParser), - new JaxRsRequestWhen(this.blockBuilder, this.generatedClassMetaData), - new JaxRsRequestHeadersWhen(this.blockBuilder, bodyParser), - new JaxRsRequestCookiesWhen(this.blockBuilder, bodyParser), - new JaxRsRequestMethodWhen(this.blockBuilder, this.generatedClassMetaData), - new JaxRsRequestInvokerWhen(this.blockBuilder))); + this.whens + .addAll(Arrays.asList(new JaxRsUrlPathWhen(this.blockBuilder, this.generatedClassMetaData, bodyParser), + new JaxRsRequestWhen(this.blockBuilder, this.generatedClassMetaData), + new JaxRsRequestHeadersWhen(this.blockBuilder, bodyParser), + new JaxRsRequestCookiesWhen(this.blockBuilder, bodyParser), + new JaxRsRequestMethodWhen(this.blockBuilder, this.generatedClassMetaData), + new JaxRsRequestInvokerWhen(this.blockBuilder))); } @Override