From 1072867dfac0df993cbd3e44bcc11a5cac7465fd Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 22 Sep 2020 12:16:46 -0400 Subject: Enabling Code Formatter Code Formatter was turned off due to java 11 migation Issue-ID: CCSDK-2852 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I3d02ed3cc7a93d7551fe25356512cfe8db1517d8 --- .../catalog/services/ErrorCatalogConfiguration.kt | 1 + .../catalog/services/ErrorCatalogDBService.kt | 9 ++++--- .../services/ErrorCatalogExceptionHandler.kt | 30 ++++++++++++++-------- .../catalog/services/ErrorCatalogLoadService.kt | 14 ++++++---- .../error/catalog/services/ErrorCatalogService.kt | 12 ++++----- .../cds/error/catalog/services/domain/Domain.kt | 8 +++--- .../catalog/services/domain/ErrorMessageModel.kt | 1 + 7 files changed, 47 insertions(+), 28 deletions(-) (limited to 'ms/error-catalog/services/src/main/kotlin') diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogConfiguration.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogConfiguration.kt index f0a75e087..8fc5edf37 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogConfiguration.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogConfiguration.kt @@ -28,6 +28,7 @@ open class ErrorCatalogConfiguration @Component @ConfigurationProperties(prefix = "error.catalog") open class ErrorCatalogProperties { + lateinit var type: String lateinit var applicationId: String var errorDefinitionDir: String? = null diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogDBService.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogDBService.kt index 95b44e683..4bb042e95 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogDBService.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogDBService.kt @@ -41,7 +41,7 @@ open class ErrorCatalogDBService( * This is a getAllDomains method to retrieve all the Domain in Error Catalog Database by pages * * @return Page list of the domains by page - */ + */ open fun getAllDomains(pageRequest: Pageable): Page { return domainRepository.findAll(pageRequest) } @@ -50,7 +50,7 @@ open class ErrorCatalogDBService( * This is a getAllDomains method to retrieve all the Domain in Error Catalog Database * * @return List list of the domains - */ + */ open fun getAllDomains(): List { return domainRepository.findAll() } @@ -59,7 +59,7 @@ open class ErrorCatalogDBService( * This is a getAllDomainsByApplication method to retrieve all the Domain that belong to an application in Error Catalog Database * * @return List list of the domains - */ + */ open fun getAllDomainsByApplication(applicationId: String): List { return domainRepository.findAllByApplicationId(applicationId) } @@ -68,7 +68,7 @@ open class ErrorCatalogDBService( * This is a getAllErrorMessagesByApplication method to retrieve all the Messages that belong to an application in Error Catalog Database * * @return MutableMap list of the abstractErrorModel - */ + */ open fun getAllErrorMessagesByApplication(applicationId: String): MutableMap { val domains = domainRepository.findAllByApplicationId(applicationId) val errorMessages = mutableMapOf() @@ -93,6 +93,7 @@ open class ErrorCatalogDBService( } companion object { + private const val MESSAGE_KEY_SEPARATOR = "." } } diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogExceptionHandler.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogExceptionHandler.kt index 258209f71..161b6b8e4 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogExceptionHandler.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogExceptionHandler.kt @@ -39,40 +39,50 @@ abstract class ErrorCatalogExceptionHandler(private val errorCatalogService: Err @ExceptionHandler fun errorCatalogException(e: ServerWebInputException): ResponseEntity { - val error = ErrorCatalogException(HttpErrorCodes.code(ErrorCatalogCodes.REQUEST_NOT_FOUND), - e.errorMessageOrDefault(), e.errorCauseOrDefault()) + val error = ErrorCatalogException( + HttpErrorCodes.code(ErrorCatalogCodes.REQUEST_NOT_FOUND), + e.errorMessageOrDefault(), e.errorCauseOrDefault() + ) val errorPayload = ErrorPayload(error.code, error.name, error.errorMessageOrDefault()) return errorPayload.toResponseEntity() } @ExceptionHandler fun errorCatalogException(e: IncorrectResultSizeDataAccessException): ResponseEntity { - val error = ErrorCatalogException(HttpErrorCodes.code(ErrorCatalogCodes.DUPLICATE_DATA), - e.errorMessageOrDefault(), e.errorCauseOrDefault()) + val error = ErrorCatalogException( + HttpErrorCodes.code(ErrorCatalogCodes.DUPLICATE_DATA), + e.errorMessageOrDefault(), e.errorCauseOrDefault() + ) val errorPayload = ErrorPayload(error.code, error.name, error.errorMessageOrDefault()) return errorPayload.toResponseEntity() } @ExceptionHandler fun errorCatalogException(e: EmptyResultDataAccessException): ResponseEntity { - val error = ErrorCatalogException(HttpErrorCodes.code(ErrorCatalogCodes.RESOURCE_NOT_FOUND), - e.errorMessageOrDefault(), e.errorCauseOrDefault()) + val error = ErrorCatalogException( + HttpErrorCodes.code(ErrorCatalogCodes.RESOURCE_NOT_FOUND), + e.errorMessageOrDefault(), e.errorCauseOrDefault() + ) val errorPayload = ErrorPayload(error.code, error.name, error.errorMessageOrDefault()) return errorPayload.toResponseEntity() } @ExceptionHandler fun errorCatalogException(e: JpaObjectRetrievalFailureException): ResponseEntity { - val error = ErrorCatalogException(HttpErrorCodes.code(ErrorCatalogCodes.RESOURCE_NOT_FOUND), - e.errorMessageOrDefault(), e.errorCauseOrDefault()) + val error = ErrorCatalogException( + HttpErrorCodes.code(ErrorCatalogCodes.RESOURCE_NOT_FOUND), + e.errorMessageOrDefault(), e.errorCauseOrDefault() + ) val errorPayload = ErrorPayload(error.code, error.name, error.errorMessageOrDefault()) return errorPayload.toResponseEntity() } @ExceptionHandler fun errorCatalogException(e: Exception): ResponseEntity { - val error = ErrorCatalogException(HttpErrorCodes.code(ErrorCatalogCodes.GENERIC_FAILURE), - e.errorMessageOrDefault(), e.errorCauseOrDefault()) + val error = ErrorCatalogException( + HttpErrorCodes.code(ErrorCatalogCodes.GENERIC_FAILURE), + e.errorMessageOrDefault(), e.errorCauseOrDefault() + ) val errorPayload = ErrorPayload(error.code, error.name, error.errorMessageOrDefault()) return errorPayload.toResponseEntity() } diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogLoadService.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogLoadService.kt index df13724c6..bcde35029 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogLoadService.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogLoadService.kt @@ -100,7 +100,7 @@ open class ErrorCatalogLoadDBService( havingValue = ErrorMessageLibConstants.ERROR_CATALOG_TYPE_PROPERTIES ) open class ErrorCatalogLoadPropertyService(private var errorCatalogProperties: ErrorCatalogProperties) : - ErrorCatalogLoadService { + ErrorCatalogLoadService { private val propertyFileName = ErrorMessageLibConstants.ERROR_CATALOG_PROPERTIES_FILENAME private lateinit var propertyFile: File @@ -134,11 +134,15 @@ open class ErrorCatalogLoadPropertyService(private var errorCatalogProperties: E inputStream = propertyFile.inputStream() props.load(inputStream) } catch (e: FileNotFoundException) { - log.error("Application ID: ${errorCatalogProperties.applicationId} > Property File '$propertyFileName' " + - "not found in the application directory.") + log.error( + "Application ID: ${errorCatalogProperties.applicationId} > Property File '$propertyFileName' " + + "not found in the application directory." + ) } catch (e: IOException) { - log.error("Application ID: ${errorCatalogProperties.applicationId} > Fail to load property file " + - "'$propertyFileName' for message errors.") + log.error( + "Application ID: ${errorCatalogProperties.applicationId} > Fail to load property file " + + "'$propertyFileName' for message errors." + ) } finally { inputStream?.close() } diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt index 21fd51b2f..298daa6fc 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/ErrorCatalogService.kt @@ -18,6 +18,7 @@ package org.onap.ccsdk.cds.error.catalog.services import kotlinx.coroutines.runBlocking +import org.apache.commons.lang3.exception.ExceptionUtils import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalog import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogException import org.onap.ccsdk.cds.error.catalog.core.ErrorMessageLibConstants @@ -25,7 +26,6 @@ import org.onap.ccsdk.cds.error.catalog.core.ErrorPayload import org.onap.ccsdk.cds.error.catalog.core.GrpcErrorCodes import org.onap.ccsdk.cds.error.catalog.core.HttpErrorCodes import org.onap.ccsdk.cds.error.catalog.core.utils.ErrorCatalogUtils -import org.apache.commons.lang3.exception.ExceptionUtils import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.stereotype.Service import javax.annotation.PostConstruct @@ -78,11 +78,11 @@ open class ErrorCatalogService(private var errorCatalogLoadService: ErrorCatalog } return ErrorCatalog( - errorCatalogException.name, - errorCatalogException.domain, - errorCode, - action, - errorCause + errorCatalogException.name, + errorCatalogException.domain, + errorCode, + action, + errorCause ) } diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt index 7ade1c2a2..7216c0585 100755 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/Domain.kt @@ -17,18 +17,18 @@ package org.onap.ccsdk.cds.error.catalog.services.domain import java.io.Serializable +import java.util.UUID import javax.persistence.CascadeType import javax.persistence.Column import javax.persistence.Entity import javax.persistence.FetchType import javax.persistence.Id +import javax.persistence.JoinColumn +import javax.persistence.JoinTable import javax.persistence.Lob import javax.persistence.ManyToMany import javax.persistence.Table import javax.persistence.UniqueConstraint -import java.util.UUID -import javax.persistence.JoinTable -import javax.persistence.JoinColumn /** * Provide ErrorCode Entity @@ -40,6 +40,7 @@ import javax.persistence.JoinColumn @Entity @Table(name = "ERROR_DOMAINS", uniqueConstraints = [UniqueConstraint(columnNames = ["name", "application_id"])]) class Domain : Serializable { + @Id var id: String = UUID.randomUUID().toString() @@ -71,6 +72,7 @@ class Domain : Serializable { } companion object { + private const val serialVersionUID = 1L } } diff --git a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt index a4e92af48..f2556e6c1 100644 --- a/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt +++ b/ms/error-catalog/services/src/main/kotlin/org/onap/ccsdk/cds/error/catalog/services/domain/ErrorMessageModel.kt @@ -56,6 +56,7 @@ class ErrorMessageModel : Serializable { val domains: MutableSet = mutableSetOf() companion object { + private const val serialVersionUID = 1L } -- cgit 1.2.3-korg