diff options
Diffstat (limited to 'ms/blueprintsprocessor/functions')
2 files changed, 10 insertions, 7 deletions
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt index 70aadb4b1..e3f876365 100755 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt @@ -71,7 +71,7 @@ class TemplateResolution : Serializable { @get:ApiModelProperty(value = "If resolution occurred multiple time, this field provides the index.", required = true) @Column(name = "occurrence", nullable = false) - var occurrence: Int = 0 + var occurrence: Int = 1 @Id @Column(name = "template_resolution_id") @@ -87,4 +87,4 @@ class TemplateResolution : Serializable { companion object { private const val serialVersionUID = 1L } -}
\ No newline at end of file +} diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt index 55f7e770b..c64605ef0 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolutionService.kt @@ -53,7 +53,7 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa blueprintVersion: String, artifactPrefix: String, resolutionKey: String, - occurrence: Int = 0): String = + occurrence: Int = 1): String = withContext(Dispatchers.IO) { templateResolutionRepository.findByResolutionKeyAndBlueprintNameAndBlueprintVersionAndArtifactNameAndOccurrence( @@ -69,7 +69,7 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa artifactPrefix: String, resourceId: String, resourceType: String, - occurrence: Int = 0): String = + occurrence: Int = 1): String = withContext(Dispatchers.IO) { templateResolutionRepository.findByResourceIdAndResourceTypeAndBlueprintNameAndBlueprintVersionAndArtifactNameAndOccurrence( @@ -93,7 +93,6 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa val resourceId = properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_RESOURCE_ID] as String val resourceType = properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_RESOURCE_TYPE] as String val occurrence = properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_OCCURRENCE] as Int - write(blueprintName, blueprintVersion, artifactPrefix, @@ -105,7 +104,7 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa } suspend fun write(blueprintName: String, blueprintVersion: String, artifactPrefix: String, - template: String, occurrence: Int = 0, resolutionKey: String = "", resourceId: String = "", + template: String, occurrence: Int = 1, resolutionKey: String = "", resourceId: String = "", resourceType: String = ""): TemplateResolution = withContext(Dispatchers.IO) { @@ -148,9 +147,13 @@ class TemplateResolutionService(private val templateResolutionRepository: Templa } } try { + log.info("Writing out template_resolution result: bpName: $blueprintName bpVer $blueprintVersion resKey:$resolutionKey" + + " (resourceId: $resourceId resourceType: $resourceType) occurrence:$occurrence") templateResolutionRepository.saveAndFlush(resourceResolutionResult) } catch (ex: DataIntegrityViolationException) { + log.error("Error writing out template_resolution result: bpName: $blueprintName bpVer $blueprintVersion resKey:$resolutionKey" + + " (resourceId: $resourceId resourceType: $resourceType) occurrence:$occurrence error: {}", ex.message) throw BluePrintException("Failed to store resource api result.", ex) } } -}
\ No newline at end of file +} |