summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToineSiebelink <toine.siebelink@est.tech>2021-01-15 09:30:40 +0000
committerToineSiebelink <toine.siebelink@est.tech>2021-01-15 09:30:46 +0000
commit4118d94f71a4e5f5a4aef038f51c66fd2c1b8b60 (patch)
tree232a489f69d5bb7cbbaeb548e19a63dbde828ddb
parentba4055607a392544238418a76707fc2bf66cc689 (diff)
SonarQube fixes
- Ignore missed SonarQube violations on SchemaSetAlreadyDefinedException - Added coverage fro CpsConfig as it will not be covered by MVC tests Issue-ID: CPS-89 Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Change-Id: I52911419dd9556cf078f2a05eab2c7783cbf304f
-rw-r--r--cps-rest/src/test/groovy/org/onap/cps/config/CpsConfigSpec.groovy37
-rw-r--r--cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetAlreadyDefinedException.java2
-rw-r--r--cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy2
3 files changed, 40 insertions, 1 deletions
diff --git a/cps-rest/src/test/groovy/org/onap/cps/config/CpsConfigSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/config/CpsConfigSpec.groovy
new file mode 100644
index 0000000000..d11e0e8807
--- /dev/null
+++ b/cps-rest/src/test/groovy/org/onap/cps/config/CpsConfigSpec.groovy
@@ -0,0 +1,37 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.cps.config
+
+import org.modelmapper.ModelMapper
+import spock.lang.Specification
+import springfox.documentation.spring.web.plugins.Docket
+
+class CpsConfigSpec extends Specification {
+ def objectUnderTest = new CpsConfig()
+
+ def 'CPS configuration has a Model Mapper'() {
+ expect: 'the CPS configuration has a Model Mapper'
+ objectUnderTest.modelMapper() instanceof ModelMapper
+ }
+
+ def 'CPS configuration has a Docket API'() {
+ expect: 'the CPS configuration has a Docket API'
+ objectUnderTest.api() instanceof Docket
+ }
+}
diff --git a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetAlreadyDefinedException.java b/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetAlreadyDefinedException.java
index 9376d6893d..1e0b8dbb65 100644
--- a/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetAlreadyDefinedException.java
+++ b/cps-service/src/main/java/org/onap/cps/spi/exceptions/SchemaSetAlreadyDefinedException.java
@@ -22,6 +22,8 @@ package org.onap.cps.spi.exceptions;
/**
* Schema set already defined exception. Indicates the a schema set with same name already exists in the same dataspace
*/
+
+@SuppressWarnings("squid:S110") // Team agreed to accept 6 levels of inheritance for CPS Exceptions
public class SchemaSetAlreadyDefinedException extends CpsAdminException {
private static final long serialVersionUID = 501929839139881112L;
diff --git a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy
index 5c6a16dfff..067556dd58 100644
--- a/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/spi/exceptions/CpsExceptionsSpec.groovy
@@ -1,6 +1,6 @@
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2020 Nordix Foundation
+ * Copyright (C) 2021 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.