diff options
| author |   Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2022-09-26 11:09:50 -0400 |
|---|---|---|
| committer |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2022-10-22 10:57:11 +0000 |
| commit | 4d46bb1a5fbc151f7f76942a87def2fe8146134a (patch) | |
| tree | c25d439a28d1f801fd2f83582ca1bec7bb1b4845 /ms/blueprintsprocessor/modules/blueprints | |
| parent | ddd4e8990d487f34a190d314a0f0ea266925e532 (diff) | |
Upgrade spring boot parent and hazelcast
The code changes are required for kotlin upgrade.
New kotlin version is 1.5.32 (defined in spring-boot-parent)
Issue-ID: CCSDK-3701
Issue-ID: CCSDK-3762
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: I0d6ecc7bee8c21d2ecd3ac4364845c5c8e0e9738
Diffstat (limited to 'ms/blueprintsprocessor/modules/blueprints')
2 files changed, 4 insertions, 4 deletions
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt index 0c43eef78..b093e8e47 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt @@ -25,8 +25,8 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.config.Services @@ -160,7 +160,7 @@ open class BluePrintSourceCode : SourceCode { data class CompiledMessageData( val severity: CompilerMessageSeverity, val message: String, - val location: CompilerMessageLocation? + val location: CompilerMessageSourceLocation? ) /** Class to collect compilation results */ @@ -168,7 +168,7 @@ class CompilationMessageCollector : MessageCollector { private val compiledMessages: MutableList<CompiledMessageData> = arrayListOf() - override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) { + override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageSourceLocation?) { synchronized(compiledMessages) { compiledMessages.add(CompiledMessageData(severity, message, location)) } diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt index 1a7c23cf1..4e2271b6d 100755 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt @@ -250,7 +250,7 @@ class BluePrintArchiveUtils { override fun hasMoreElements(): Boolean { if (zipEnumeration != null) - return zipEnumeration?.hasMoreElements() + return zipEnumeration.hasMoreElements() else if (archiveStream != null) { nextEntry = archiveStream.nextEntry if (nextEntry != null && !archiveStream.canReadEntryData(nextEntry)) |