From d378c37fbd1ecec7b43394926f1ca32a695e07de Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 22 Mar 2021 15:33:06 +0000 Subject: Reformat openecomp-be Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3449 Change-Id: I13e02322f8e00820cc5a1d85752caaeda9bf10d1 --- .../externaltesting/api/ClientConfiguration.java | 10 ++--- .../api/ExternalTestingManager.java | 14 +++--- .../api/RemoteTestingEndpointDefinition.java | 36 +++++++-------- .../core/externaltesting/api/TestErrorBody.java | 27 ++++++----- .../core/externaltesting/api/TestTreeNode.java | 31 ++++++------- .../api/VtpNameDescriptionPair.java | 19 ++++---- .../core/externaltesting/api/VtpTestCase.java | 30 ++++++------- .../core/externaltesting/api/VtpTestCaseInput.java | 28 ++++++------ .../externaltesting/api/VtpTestCaseOutput.java | 4 +- .../api/VtpTestExecutionRequest.java | 21 +++++---- .../api/VtpTestExecutionResponse.java | 52 +++++++++++----------- 11 files changed, 128 insertions(+), 144 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api') diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ClientConfiguration.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ClientConfiguration.java index 9269e8bf22..285a5782cd 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ClientConfiguration.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ClientConfiguration.java @@ -13,17 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.openecomp.core.externaltesting.api; import lombok.Data; @Data public class ClientConfiguration { - /** - * Enable/disable state for the feature. Client can use this - * to show/hide menu items. - */ - private boolean enabled; + /** + * Enable/disable state for the feature. Client can use this to show/hide menu items. + */ + private boolean enabled; } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ExternalTestingManager.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ExternalTestingManager.java index 21d09edc91..0cbaf41583 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ExternalTestingManager.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/ExternalTestingManager.java @@ -23,8 +23,7 @@ import java.util.Map; public interface ExternalTestingManager { /** - * Return the configuration of this feature that we want to - * expose to the client. Treated as a JSON blob for flexibility. + * Return the configuration of this feature that we want to expose to the client. Treated as a JSON blob for flexibility. */ ClientConfiguration getConfig(); @@ -34,8 +33,7 @@ public interface ExternalTestingManager { ClientConfiguration setConfig(ClientConfiguration config); /** - * Build a tree of all test cases for the client including all - * defined endpoints, scenarios, and test suites. + * Build a tree of all test cases for the client including all defined endpoints, scenarios, and test suites. * * @return test case tree. */ @@ -48,8 +46,7 @@ public interface ExternalTestingManager { /** - * For functional testing purposes, allow the endpoint configuration - * to be provisioned to the BE. + * For functional testing purposes, allow the endpoint configuration to be provisioned to the BE. */ List setEndpoints(List endpoints); @@ -84,8 +81,7 @@ public interface ExternalTestingManager { VtpTestCase getTestCase(String endpoint, String scenario, String testSuite, String testCaseName); /** - * Execute a collection of tests where the manager must distribute - * the tests to the appropriate endpoint and correlate the responses. + * Execute a collection of tests where the manager must distribute the tests to the appropriate endpoint and correlate the responses. * * @param requests collection of request items. * @param requestId optional request ID provided from client. @@ -96,7 +92,7 @@ public interface ExternalTestingManager { */ List execute(List requests, String vspId, String vspVersionId, - String requestId, Map fileMap); + String requestId, Map fileMap); /** diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/RemoteTestingEndpointDefinition.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/RemoteTestingEndpointDefinition.java index 0d5c30d593..22ebe9b465 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/RemoteTestingEndpointDefinition.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/RemoteTestingEndpointDefinition.java @@ -17,30 +17,30 @@ package org.openecomp.core.externaltesting.api; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; - import java.util.regex.Pattern; +import lombok.Data; @Data public class RemoteTestingEndpointDefinition { - private boolean enabled; - private String title; - private String url; - private String id; - private String apiKey; - private String scenarioFilter; - // a compact way to specify and endpoint to ease docker configuration. - @JsonIgnore - private String config; + private boolean enabled; + private String title; + private String url; + private String id; + private String apiKey; + private String scenarioFilter; + + // a compact way to specify and endpoint to ease docker configuration. + @JsonIgnore + private String config; - private Pattern scenarioFilterPattern; + private Pattern scenarioFilterPattern; - @JsonIgnore - public Pattern getScenarioFilterPattern() { - if ((scenarioFilterPattern == null) && (scenarioFilter != null)) { - scenarioFilterPattern = Pattern.compile(scenarioFilter); + @JsonIgnore + public Pattern getScenarioFilterPattern() { + if ((scenarioFilterPattern == null) && (scenarioFilter != null)) { + scenarioFilterPattern = Pattern.compile(scenarioFilter); + } + return scenarioFilterPattern; } - return scenarioFilterPattern; - } } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestErrorBody.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestErrorBody.java index d721f8997a..aa4d63c475 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestErrorBody.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestErrorBody.java @@ -18,9 +18,8 @@ package org.openecomp.core.externaltesting.api; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; /** * Error body to return to client per IETF RFC 7807. @@ -31,20 +30,20 @@ import java.io.Serializable; @Data public class TestErrorBody implements Serializable { - private static final long serialVersionUID = 3504501412736665763L; + private static final long serialVersionUID = 3504501412736665763L; - private String code; - private Integer httpStatus; - private String message; + private String code; + private Integer httpStatus; + private String message; - TestErrorBody() { + TestErrorBody() { - } + } - public TestErrorBody(String code, Integer httpStatus, String message) { - this(); - this.code = code; - this.httpStatus = httpStatus; - this.message = message; - } + public TestErrorBody(String code, Integer httpStatus, String message) { + this(); + this.code = code; + this.httpStatus = httpStatus; + this.message = message; + } } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestTreeNode.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestTreeNode.java index 1b75772476..4965abffcd 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestTreeNode.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/TestTreeNode.java @@ -17,34 +17,31 @@ package org.openecomp.core.externaltesting.api; import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.ArrayList; -import java.util.List; - /** - * Tree structure of tests. VTP does not provide an organized - * tree of tests. Here we define a tree node with tests and - * child nodes to represent our tree. + * Tree structure of tests. VTP does not provide an organized tree of tests. Here we define a tree node with tests and child nodes to represent our + * tree. */ @SuppressWarnings("unused") @JsonInclude(JsonInclude.Include.NON_EMPTY) @Data() -@EqualsAndHashCode(callSuper=true) +@EqualsAndHashCode(callSuper = true) public class TestTreeNode extends VtpNameDescriptionPair { - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tests; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List tests; - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; - public TestTreeNode() { - super(); - } + public TestTreeNode() { + super(); + } - public TestTreeNode(String name, String description) { - super(name, description); - } + public TestTreeNode(String name, String description) { + super(name, description); + } } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpNameDescriptionPair.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpNameDescriptionPair.java index 9a435de4ae..c34d4d4aea 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpNameDescriptionPair.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpNameDescriptionPair.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.openecomp.core.externaltesting.api; import lombok.Data; @@ -23,16 +22,16 @@ import lombok.Data; */ @Data public class VtpNameDescriptionPair { - private String name; - private String description; - VtpNameDescriptionPair() { + private String name; + private String description; - } + VtpNameDescriptionPair() { + } - public VtpNameDescriptionPair(String name, String description) { - this(); - this.name = name; - this.description = description; - } + public VtpNameDescriptionPair(String name, String description) { + this(); + this.name = name; + this.description = description; + } } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCase.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCase.java index ae39159f32..d8a81ae9fe 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCase.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCase.java @@ -16,27 +16,25 @@ package org.openecomp.core.externaltesting.api; -import lombok.Data; - import java.util.List; +import lombok.Data; @Data public class VtpTestCase { - private String scenario; - private String testCaseName; - private String testSuiteName; - private String description; - private String author; - private List inputs; - private List outputs; - - /** - * Extends VTP test case content with location where test case is defined. - * This value is populated by the SDC-BE for consumption by the front end. - * This allows the front end to tell the back end where to run the test. - */ - private String endpoint; + private String scenario; + private String testCaseName; + private String testSuiteName; + private String description; + private String author; + private List inputs; + private List outputs; + + /** + * Extends VTP test case content with location where test case is defined. This value is populated by the SDC-BE for consumption by the front end. + * This allows the front end to tell the back end where to run the test. + */ + private String endpoint; } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseInput.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseInput.java index 5c6db8eb72..19d6303f39 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseInput.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseInput.java @@ -16,27 +16,25 @@ package org.openecomp.core.externaltesting.api; +import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Map; - @Data -@EqualsAndHashCode(callSuper=true) +@EqualsAndHashCode(callSuper = true) public class VtpTestCaseInput extends VtpNameDescriptionPair { - private String type; - private String defaultValue; - private boolean isOptional; - private Map metadata; + private String type; + private String defaultValue; + private boolean isOptional; + private Map metadata; - /** - * The VTP API has a field called isOptional, not just optional so - * we need to add getter and setter. - */ - @SuppressWarnings({"unused", "WeakerAccess"}) - public boolean getIsOptional() { - return isOptional; - } + /** + * The VTP API has a field called isOptional, not just optional so we need to add getter and setter. + */ + @SuppressWarnings({"unused", "WeakerAccess"}) + public boolean getIsOptional() { + return isOptional; + } } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseOutput.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseOutput.java index 7d4ae84544..b3781b3978 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseOutput.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestCaseOutput.java @@ -24,8 +24,8 @@ import lombok.EqualsAndHashCode; @JsonInclude(JsonInclude.Include.NON_NULL) @Schema(description = "VtpTestSuite") @Data -@EqualsAndHashCode(callSuper=true) +@EqualsAndHashCode(callSuper = true) class VtpTestCaseOutput extends VtpNameDescriptionPair { - private String type; + private String type; } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionRequest.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionRequest.java index 481fd46906..59f3b7d566 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionRequest.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionRequest.java @@ -17,23 +17,22 @@ package org.openecomp.core.externaltesting.api; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - import java.util.Map; +import lombok.Data; @Data public class VtpTestExecutionRequest { - private String scenario; - private String testSuiteName; - private String testCaseName; + private String scenario; + private String testSuiteName; + private String testCaseName; - @JsonInclude(value = JsonInclude.Include.NON_NULL) - private String profile; + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String profile; - @JsonInclude(value = JsonInclude.Include.NON_NULL) - private Map parameters; + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Map parameters; - @JsonInclude(value = JsonInclude.Include.NON_NULL) - private String endpoint; + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String endpoint; } diff --git a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionResponse.java b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionResponse.java index add85210cb..c9756469ce 100644 --- a/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionResponse.java +++ b/openecomp-be/lib/openecomp-sdc-externaltesting-lib/openecomp-sdc-externaltesting-api/src/main/java/org/openecomp/core/externaltesting/api/VtpTestExecutionResponse.java @@ -17,37 +17,37 @@ package org.openecomp.core.externaltesting.api; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; - import java.util.Map; +import lombok.Data; @Data public class VtpTestExecutionResponse { - private String scenario; - private String testCaseName; - private String testSuiteName; - private String executionId; - private Map parameters; - private Object results; - private String status; - private String startTime; // don't bother to convert various ISO8601 formats. - private String endTime; // don't bother to convert various ISO8601 formats. - /** - * In the event on an error, code provided. - */ - @JsonInclude(value= JsonInclude.Include.NON_NULL) - private String code; + private String scenario; + private String testCaseName; + private String testSuiteName; + private String executionId; + private Map parameters; + private Object results; + private String status; + private String startTime; // don't bother to convert various ISO8601 formats. + private String endTime; // don't bother to convert various ISO8601 formats. + + /** + * In the event on an error, code provided. + */ + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String code; - /** - * Error message - */ - @JsonInclude(value= JsonInclude.Include.NON_NULL) - private String message; + /** + * Error message + */ + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String message; - /** - * In the event of an unexpected status. - */ - @JsonInclude(value= JsonInclude.Include.NON_NULL) - private Integer httpStatus; + /** + * In the event of an unexpected status. + */ + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Integer httpStatus; } -- cgit 1.2.3-korg