diff options
Diffstat (limited to 'ms/controllerblueprints/modules')
5 files changed, 25 insertions, 39 deletions
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt index 2f082db9c..097967313 100755 --- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt +++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt @@ -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 { diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintFileUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintFileUtils.kt index 17a7fd348..06f6f1d17 100755 --- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintFileUtils.kt +++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintFileUtils.kt @@ -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 { diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml index eb4dd9f78..91097b9d9 100644 --- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml @@ -66,19 +66,21 @@ </pluginArtifact> </configuration> </execution> -<!-- <execution>--> -<!-- <id>grpc-coroutines</id>--> -<!-- <goals>--> -<!-- <goal>compile-custom</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <pluginId>kroto-plus</pluginId>--> -<!-- <pluginArtifact>--> -<!-- com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8--> -<!-- </pluginArtifact>--> -<!-- <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter>--> -<!-- </configuration>--> -<!-- </execution>--> + <!-- + <execution> + <id>grpc-coroutines</id> + <goals> + <goal>compile-custom</goal> + </goals> + <configuration> + <pluginId>kroto-plus</pluginId> + <pluginArtifact> + com.github.marcoferrer.krotoplus:protoc-gen-kroto-plus:${kroto-plus.version}:jar:jvm8 + </pluginArtifact> + <pluginParameter>ConfigPath=${project.basedir}/krotoPlusConfig.asciipb</pluginParameter> + </configuration> + </execution> + --> </executions> </plugin> <plugin> @@ -95,7 +97,7 @@ <sourceDirs> <sourceDir>${project.basedir}/target/generated-sources/protobuf/java</sourceDir> <sourceDir>${project.basedir}/target/generated-sources/protobuf/grpc-java</sourceDir> -<!-- <sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>--> + <!--<sourceDir>${project.basedir}/target/generated-sources/protobuf/kroto-plus</sourceDir>--> </sourceDirs> </configuration> </execution> diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml index 40fff14d4..5bc2e2a6b 100644 --- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml @@ -47,7 +47,6 @@ <artifactId>resource-dict</artifactId> </dependency> - <!--Testing dependencies--> <dependency> <groupId>org.jetbrains.kotlin</groupId> diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java index ce479d6df..16b02d86c 100644 --- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java +++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java @@ -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. |