Optimizing Imports and Formatting code 34/95934/1
authorSingal, Kapil (ks220y) <ks220y@att.com>
Wed, 18 Sep 2019 16:23:42 +0000 (12:23 -0400)
committerSingal, Kapil (ks220y) <ks220y@att.com>
Wed, 18 Sep 2019 16:23:42 +0000 (12:23 -0400)
No Business logic change, no code change.. just optimizing imports and reformatting code

Issue-ID: CCSDK-1744
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I1fb2ed10525a6f392f3c0d963c2ed03cfe8dec7e

49 files changed:
cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/resource-metadata/resource-metadata.component.html
cds-ui/client/src/app/feature-modules/resource-definition/resource-edit/sources-template/sources-template.component.html
cds-ui/pom.xml
components/model-catalog/blueprint-model/uat-blueprints/echo/Plans/TEST_echo.xml
components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configAssign.xml
components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configDeploy.xml
ms/blueprintsprocessor/application/pom.xml
ms/blueprintsprocessor/application/src/main/java/org/onap/ccsdk/cds/blueprintsprocessor/security/BasicAuthServerInterceptor.java
ms/blueprintsprocessor/application/src/main/resources/logback.xml
ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/ExtendedTemporaryFolder.kt
ms/blueprintsprocessor/distribution/pom.xml
ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/logback-test.xml
ms/blueprintsprocessor/functions/cli-executor/src/test/resources/logback-test.xml
ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/logback-test.xml
ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/payload/requests/interface-candidate.xml
ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/payload/requests/interface-running.xml
ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/logback-test.xml
ms/blueprintsprocessor/functions/python-executor/src/test/resources/logback-test.xml
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/logback-test.xml
ms/blueprintsprocessor/functions/restconf-executor/src/test/resources/logback-test.xml
ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/MariaDatabaseConfiguration.kt
ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/service/BlueprintProcessorCatalogServiceImpl.kt
ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/service/ControllerBlueprintCatalogServiceImpl.kt
ms/blueprintsprocessor/modules/commons/dmaap-lib/src/test/resources/logback-test.xml
ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BasicAuthRestClientService.kt
ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/BluePrintRestLibPropertyService.kt
ms/blueprintsprocessor/modules/commons/rest-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestClientServiceTest.kt
ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/configs/api/ResourceConfigSnapshotControllerTest.kt
ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/resources/logback.xml
ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/resources/logback-test.xml
ms/blueprintsprocessor/modules/inbounds/health-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/HealthCheckServiceTest.java
ms/blueprintsprocessor/modules/inbounds/health-api/src/test/resources/logback.xml
ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/resource/api/TemplateController.kt
ms/blueprintsprocessor/modules/inbounds/resource-api/src/test/resources/logback.xml
ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BluePrintMappings.kt
ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/logback-test.xml
ms/blueprintsprocessor/modules/services/execution-service/src/test/resources/logback-test.xml
ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/DGWorkflowExecutionServiceTest.kt
ms/blueprintsprocessor/modules/services/workflow-service/src/test/resources/logback.xml
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintFileUtils.kt
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java
ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java
ms/sdclistener/application/src/main/resources/logback.xml
ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java
ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java
ms/sdclistener/distribution/pom.xml
pom.xml

index 1ed8dd0..8a6f232 100644 (file)
@@ -31,7 +31,7 @@
       <mat-select matInput placeholder="Data Type" formControlName="_type" (selectionChange)="UploadMetadata()">
        <!-- <mat-option value="string">string</mat-option> -->
         <!-- <mat-option value="list">list</mat-option> -->
-        <mat-option value="string" *ngFor="let item of dataTypeList" >{{item.modelName}}</mat-option>
+        <mat-option value="string" *ngFor="let item of dataTypeList">{{item.modelName}}</mat-option>
       </mat-select>
     </mat-form-field>
     <mat-form-field class="form-field" >
@@ -46,5 +46,5 @@
     <mat-form-field class="form-field" >
       <textarea matInput placeholder="Description" formControlName="_description" (change)="UploadMetadata()"></textarea>
     </mat-form-field>
-    <br> 
-</form>
\ No newline at end of file
+    <br>
+</form>
index 56ced89..08c1030 100644 (file)
@@ -25,7 +25,7 @@ limitations under the License.
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.cds</groupId>
index b0ab5c6..b89a09e 100644 (file)
@@ -4,10 +4,10 @@
         <block atomic="true">
             <execute plugin="echo" method="process">
                 <outcome value="failure">
-                    <return status="failure" />
+                    <return status="failure"/>
                 </outcome>
                 <outcome value="success">
-                    <return status="success" />
+                    <return status="success"/>
                 </outcome>
             </execute>
         </block>
index f800561..a3eedf1 100644 (file)
@@ -4,10 +4,10 @@
         <block atomic="true">
             <execute plugin="config-assign" method="process">
                 <outcome value="failure">
-                    <return status="failure" />
+                    <return status="failure"/>
                 </outcome>
                 <outcome value="success">
-                    <return status="success" />
+                    <return status="success"/>
                 </outcome>
             </execute>
         </block>
index 39774b5..f4e1b99 100644 (file)
@@ -4,10 +4,10 @@
         <block atomic="true">
             <execute plugin="config-deploy" method="process">
                 <outcome value="failure">
-                    <return status="failure" />
+                    <return status="failure"/>
                 </outcome>
                 <outcome value="success">
-                    <return status="success" />
+                    <return status="success"/>
                 </outcome>
             </execute>
         </block>
index 90e9f50..1c12469 100755 (executable)
@@ -78,7 +78,6 @@
             <artifactId>health-api</artifactId>
         </dependency>
 
-
         <!-- Functions -->
         <dependency>
             <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId>
index 380ed36..d0bf9e8 100644 (file)
 package org.onap.ccsdk.cds.blueprintsprocessor.security;
 
 import com.google.common.base.Strings;
-import io.grpc.Metadata;
-import io.grpc.ServerCall;
-import io.grpc.ServerCallHandler;
-import io.grpc.ServerInterceptor;
-import io.grpc.Status;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
+import io.grpc.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +27,9 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
 @Component
 public class BasicAuthServerInterceptor implements ServerInterceptor {
 
index 872ee4f..6f91709 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="info"/>
     <logger name="org.springframework.web" level="info"/>
     <logger name="org.hibernate" level="error"/>
index 3c517e6..57b4573 100644 (file)
@@ -22,11 +22,8 @@ package org.onap.ccsdk.cds.blueprintsprocessor
 import org.junit.rules.TemporaryFolder
 import java.io.File
 import java.io.IOException
-import java.nio.file.FileVisitResult
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.attribute.BasicFileAttributes
+import java.nio.file.*
+import java.nio.file.attribute.*
 import javax.annotation.PreDestroy
 
 class ExtendedTemporaryFolder {
index bbf9239..884d76a 100755 (executable)
@@ -84,7 +84,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source" />
+                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source"/>
                             </tasks>
                         </configuration>
                         <goals>
index 1f90761..c2cfa9b 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 3fe7da8..688a533 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework.test" level="warn" />
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
-    <logger name="internal.scripts" level="info" />
+    <logger name="org.springframework.test" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
+    <logger name="internal.scripts" level="info"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 1c729f6..6598dcc 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 3ab0bca..7914dd1 100644 (file)
   -->
 <output xmlns="http://yang.juniper.net/junos-qfx/rpc/interfaces">
     <interface-information xmlns:junos="http://xml.juniper.net/junos/17.4R1/junos" junos:style="normal">
-        <ifd-specific-config-flags />
-        <if-config-flags />
+        <ifd-specific-config-flags/>
+        <if-config-flags/>
         <link-type>Full-Duplex</link-type>
         <if-media-flags>
-            <ifmf-none />
+            <ifmf-none/>
         </if-media-flags>
         <interface-flapped junos:seconds="2343">34</interface-flapped>
         <traffic-statistics junos:style="brief">
index cd2cab8..425d704 100644 (file)
   -->
 <output xmlns="http://yang.juniper.net/junos-qfx/rpc/interfaces">
     <interface-information xmlns:junos="http://xml.juniper.net/junos/17.4R1/junos" junos:style="normal">
-        <ifd-specific-config-flags />
-        <if-config-flags />
+        <ifd-specific-config-flags/>
+        <if-config-flags/>
         <link-type>Full-Duplex</link-type>
         <if-media-flags>
-            <ifmf-none />
+            <ifmf-none/>
         </if-media-flags>
         <interface-flapped junos:seconds="0">Never</interface-flapped>
         <traffic-statistics junos:style="brief">
             <input-packets>0</input-packets>
             <output-packets>0</output-packets>
         </traffic-statistics>
-        <physical-interface />
+        <physical-interface/>
     </interface-information>
 </output>
\ No newline at end of file
index 2aaaead..da4cf9a 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework.test" level="warn" />
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.apache.sshd" level="warn" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.core" level="warn" />
+    <logger name="org.springframework.test" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.apache.sshd" level="warn"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.core" level="warn"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 8d0e8ee..f06ea14 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 0c44875..f915b1a 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.mockserver.mock" level="warn" />
-    <logger name="org.onap.ccsdk.cds.controllerblueprints" level="warn" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.mockserver.mock" level="warn"/>
+    <logger name="org.onap.ccsdk.cds.controllerblueprints" level="warn"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 9d6ab20..daab7ea 100644 (file)
         </encoder>
     </appender>
 
-    <logger name="org.springframework.test" level="warn" />
-    <logger name="org.springframework" level="warn" />
-    <logger name="org.hibernate" level="info" />
-    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info" />
+    <logger name="org.springframework.test" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
 
     <root level="warn">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>
index 5015388..6a0d4a0 100644 (file)
@@ -21,11 +21,6 @@ import org.onap.ccsdk.cds.blueprintsprocessor.db.MariaDataSourceProperties
 import org.slf4j.LoggerFactory
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 import org.springframework.jdbc.datasource.DriverManagerDataSource
-import org.springframework.orm.jpa.JpaTransactionManager
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter
-import org.springframework.transaction.PlatformTransactionManager
-import java.util.*
 import javax.sql.DataSource
 
 class MariaDatabaseConfiguration(private val mariaDataSourceProperties: MariaDataSourceProperties) : BluePrintDBLibGenericService {
index 3e0f351..5d04ddf 100755 (executable)
@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service
 import java.io.File
 import java.nio.file.Path
 import java.util.*
+
 // TODO("Duplicate : Merge BlueprintProcessorCatalogServiceImpl and ControllerBlueprintCatalogServiceImpl")
 /**
  * Similar/Duplicate implementation in [org.onap.ccsdk.cds.controllerblueprints.service.load.ControllerBlueprintCatalogServiceImpl]
index cff5742..dad15aa 100644 (file)
@@ -18,7 +18,6 @@
   ~  ============LICENSE_END=========================================================
   -->
 
-
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <!-- encoders are assigned the type
index bb6937d..9ce3bea 100644 (file)
@@ -18,10 +18,6 @@ package org.onap.ccsdk.cds.blueprintsprocessor.rest.service
 
 import org.apache.http.message.BasicHeader
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestLibConstants
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.utils.WebClientUtils
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import java.nio.charset.Charset
index 8d4f0ca..9fa13bd 100644 (file)
@@ -20,15 +20,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.rest.service
 
 import com.fasterxml.jackson.databind.JsonNode
 import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.BasicAuthRestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.DME2RestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.PolicyManagerRestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.RestLibConstants
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.SSLBasicAuthRestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.SSLRestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.SSLTokenAuthRestClientProperties
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.TokenAuthRestClientProperties
+import org.onap.ccsdk.cds.blueprintsprocessor.rest.*
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.springframework.stereotype.Service
index e6a6680..46d171b 100644 (file)
@@ -48,14 +48,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.TestPropertySource
 import org.springframework.test.context.junit4.SpringRunner
-import org.springframework.web.bind.annotation.DeleteMapping
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PatchMapping
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestHeader
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
index b4c1ad0..89f6281 100644 (file)
@@ -32,7 +32,6 @@ import org.springframework.test.context.TestPropertySource
 import org.springframework.test.context.junit4.SpringRunner
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.web.reactive.function.BodyInserters
-import java.util.*
 
 @RunWith(SpringRunner::class)
 @WebFluxTest
@@ -173,4 +172,4 @@ class ResourceConfigSnapshotControllerTest {
                 .expectBody().equals(snapshotData)
         }
     }
-}
\ No newline at end of file
+}
index ed92b89..c97e1cd 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="info"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
index feb4514..1b1c54c 100644 (file)
@@ -17,7 +17,7 @@
 
 <configuration>
 
-     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
@@ -25,7 +25,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.springframework.web" level="warn"/>
     <logger name="org.hibernate" level="error"/>
index 8fb5e58..128c80a 100644 (file)
 
 package org.onap.ccsdk.cds.blueprintsprocessor.healthapi;
 
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.anyString;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +32,12 @@ import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BasicAuthRestClientSe
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService.WebClientResponse;
 import org.springframework.http.HttpMethod;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.anyString;
+
 @RunWith(MockitoJUnitRunner.class)
 public class HealthCheckServiceTest {
 
index ed92b89..c97e1cd 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="info"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
index de5843a..93253a5 100644 (file)
@@ -24,7 +24,6 @@ import kotlinx.coroutines.runBlocking
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.db.TemplateResolution
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.db.TemplateResolutionService
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.springframework.dao.EmptyResultDataAccessException
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.security.access.prepost.PreAuthorize
index c546502..9c690fc 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="info"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
index b5984d7..46633aa 100644 (file)
@@ -19,11 +19,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode
 import com.google.common.base.Strings
 import com.google.protobuf.Struct
 import com.google.protobuf.util.JsonFormat
-import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers
-import org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader
-import org.onap.ccsdk.cds.controllerblueprints.common.api.EventType
-import org.onap.ccsdk.cds.controllerblueprints.common.api.Flag
-import org.onap.ccsdk.cds.controllerblueprints.common.api.Status
+import org.onap.ccsdk.cds.controllerblueprints.common.api.*
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput
index dd81657..117746f 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="info"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
index da1553d..703a526 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="warn"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
index 6e7e3cb..3ac5cd8 100644 (file)
@@ -29,7 +29,6 @@ import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonReactorUtils
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
-import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.junit4.SpringRunner
 import kotlin.test.assertEquals
@@ -76,4 +75,4 @@ class DGWorkflowExecutionServiceTest {
     }
 
 
-}
\ No newline at end of file
+}
index 3245937..1a6114b 100644 (file)
@@ -23,7 +23,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="warn"/>
     <logger name="org.hibernate" level="info"/>
     <logger name="org.onap.ccsdk.cds.blueprintsprocessor" level="info"/>
index 2f082db..0979673 100755 (executable)
@@ -21,23 +21,12 @@ package org.onap.ccsdk.cds.controllerblueprints.core.utils
 import com.google.common.base.Predicates
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.slf4j.LoggerFactory
-import java.io.BufferedInputStream
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.OutputStream
-import java.nio.charset.Charset
-import java.nio.file.FileVisitResult
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.attribute.BasicFileAttributes
-import java.util.function.Predicate
-import java.util.zip.Deflater
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import java.util.zip.ZipOutputStream
+import java.io.*
+import java.nio.charset.*
+import java.nio.file.*
+import java.nio.file.attribute.*
+import java.util.function.*
+import java.util.zip.*
 
 class BluePrintArchiveUtils {
 
index 17a7fd3..06f6f1d 100755 (executable)
@@ -32,10 +32,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileFilter
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.nio.file.StandardOpenOption
+import java.nio.file.*
 
 
 class BluePrintFileUtils {
index ce479d6..16b02d8 100644 (file)
@@ -17,7 +17,6 @@
 
 package org.onap.ccsdk.cds.controllerblueprints.resource.dict.utils;
 
-
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.Assert;
 import org.junit.Test;
@@ -27,11 +26,11 @@ import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils;
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment;
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition;
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDictionaryConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * ResourceDictionaryUtilsTest.
index 5866a63..b981b80 100644 (file)
  */
 package org.onap.ccsdk.cds.sdclistener.client;
 
-import io.grpc.CallOptions;
-import io.grpc.Channel;
-import io.grpc.ClientCall;
-import io.grpc.ClientInterceptor;
-import io.grpc.ForwardingClientCall;
-import io.grpc.Metadata;
+import io.grpc.*;
 import io.grpc.Metadata.Key;
-import io.grpc.MethodDescriptor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
index b6d0e48..42b7956 100644 (file)
  */
 package org.onap.ccsdk.cds.sdclistener.util;
 
-import static java.nio.file.Files.walk;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -24,9 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static java.nio.file.Files.walk;
 
 public final class FileUtil {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileUtils.class);
index b26cbcb..62465fd 100644 (file)
@@ -16,18 +16,18 @@ limitations under the License.
 -->
 
 <configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-    </encoder>
-  </appender>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
 
-  <root level="info">
-    <appender-ref ref="STDOUT"/>
-  </root>
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+    <logger name="org.springframework" level="info"/>
+    <logger name="org.springframework.web" level="info"/>
+    <logger name="org.onap.ccsdk.cds" level="info"/>
 
-  <logger name="org.springframework" level="info"/>
-  <logger name="org.springframework.web" level="info"/>
-  <logger name="org.onap.ccsdk.cds" level="info"/>
-  
 </configuration>
index c9f2c5a..1e6d7cb 100644 (file)
  */
 package org.onap.ccsdk.cds.sdclistener;
 
-import mockit.Expectations;
-import mockit.Injectable;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Tested;
-import mockit.VerificationsInOrder;
+import mockit.*;
 import mockit.integration.junit4.JMockit;
 import org.junit.Test;
 import org.junit.runner.RunWith;
index aa8f8e4..25b5098 100644 (file)
  */
 package org.onap.ccsdk.cds.sdclistener.service;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus.NotificationType.SDC_LISTENER_COMPONENT;
-import static org.onap.sdc.utils.DistributionStatusEnum.COMPONENT_DONE_OK;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Rule;
@@ -46,6 +38,16 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus.NotificationType.SDC_LISTENER_COMPONENT;
+import static org.onap.sdc.utils.DistributionStatusEnum.COMPONENT_DONE_OK;
+
 @RunWith(SpringRunner.class)
 @EnableConfigurationProperties({SdcListenerAuthClientInterceptor.class,
     BluePrintProcesssorHandler.class, SdcListenerDto.class, ListenerServiceImpl.class, SdcListenerStatus.class,
index 58dabc0..ca69478 100755 (executable)
@@ -85,7 +85,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source" />
+                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source"/>
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/pom.xml b/pom.xml
index 41ad1cb..a86d744 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.cds</groupId>
@@ -44,7 +44,7 @@ limitations under the License.
 
     <properties>
         <!--Don't set any language to let sonar enable multi-language support-->
-        <sonar.language />
+        <sonar.language/>
         <!--Provide src/main as source path so both src/main/java and src/main/kotlin are scanned-->
         <sonar.sources>src/main</sonar.sources>
         <!--Provide src/test as source path for test so both src/test/java and src/test/kotlin are scanned-->