From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../pom.xml | 54 ++++++++++------------ .../pom.xml.versionsBackup | 36 +++++++++++++++ .../ApplicationConfigManager.java | 3 ++ .../impl/ApplicationConfigManagerImpl.java | 21 +++++++-- .../ApplicationConfigManagerTest.java | 32 +++++++++++-- 5 files changed, 106 insertions(+), 40 deletions(-) create mode 100644 openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml.versionsBackup (limited to 'openecomp-be/backend/openecomp-sdc-application-config-manager') diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml index 8d7a974828..61f5621b83 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml @@ -4,52 +4,46 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + org.openecomp.sdc + openecomp-sdc-application-config-manager + org.openecomp.sdc backend 1.1.0-SNAPSHOT + .. - org.openecomp.sdc - openecomp-sdc-application-config-manager - + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + true + + + + - com.google.code.gson - gson - 2.3.1 - test - - - org.yaml - snakeyaml - 1.14 - test - - - org.openecomp.sdc + org.openecomp.core openecomp-config-lib ${project.version} org.testng testng - 6.9.10 + ${testng.version} test + + org.openecomp.sdc + openecomp-sdc-logging-core + ${project.version} + - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - true - - - - - \ No newline at end of file + diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml.versionsBackup b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml.versionsBackup new file mode 100644 index 0000000000..a9cc7a32f6 --- /dev/null +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/pom.xml.versionsBackup @@ -0,0 +1,36 @@ + + + 4.0.0 + + org.openecomp.sdc + openecomp-sdc-application-config-manager + 1.0-SNAPSHOT + + + org.openecomp.core + openecomp-config-lib + 1.0-SNAPSHOT + + + org.testng + testng + 6.9.10 + test + + + org.openecomp.sdc + openecomp-sdc-logging-core + 1.0-SNAPSHOT + + + + + org.openecomp.sdc + backend + 1.0-SNAPSHOT + + + + \ No newline at end of file diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManager.java b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManager.java index 924401b9c1..ff95e5af3c 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManager.java +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManager.java @@ -25,6 +25,9 @@ import org.openecomp.core.utilities.applicationconfig.type.ConfigurationData; import java.util.Collection; +/** + * Created by Talio on 8/8/2016. + */ public interface ApplicationConfigManager { void insertIntoTable(String namespace, String key, String value); diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/impl/ApplicationConfigManagerImpl.java b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/impl/ApplicationConfigManagerImpl.java index b44c541261..9dbdf760de 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/impl/ApplicationConfigManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/main/java/org/openecomp/sdc/applicationconfig/impl/ApplicationConfigManagerImpl.java @@ -28,9 +28,18 @@ import org.openecomp.sdc.applicationconfig.ApplicationConfigManager; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; +import org.openecomp.sdc.datatypes.error.ErrorLevel; +import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; +import org.openecomp.sdc.logging.types.LoggerConstants; +import org.openecomp.sdc.logging.types.LoggerErrorCode; +import org.openecomp.sdc.logging.types.LoggerErrorDescription; +import org.openecomp.sdc.logging.types.LoggerTragetServiceName; import java.util.Collection; +/** + * Created by Talio on 8/8/2016. + */ public class ApplicationConfigManagerImpl implements ApplicationConfigManager { private static final String SCHEMA_GENERATOR_INITIALIZATION_ERROR = "SCHEMA_GENERATOR_INITIALIZATION_ERROR"; @@ -43,11 +52,13 @@ public class ApplicationConfigManagerImpl implements ApplicationConfigManager { try { applicationConfig.insertValue(namespace, key, value); } catch (Exception exception) { - throw new CoreException(new ErrorCode.ErrorCodeBuilder() - .withCategory(ErrorCategory.APPLICATION) - .withId(SCHEMA_GENERATOR_INITIALIZATION_ERROR) - .withMessage(SCHEMA_GENERATOR_INITIALIZATION_ERROR_MSG) - .build()); + MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB, + LoggerTragetServiceName.INSERT_INTO_APPLICATION_CONFIG, ErrorLevel.ERROR.name(), + LoggerErrorCode.DATA_ERROR.getErrorCode(), + LoggerErrorDescription.INSERT_INTO_APPLICATION_CONFIG); + throw new CoreException(new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory + .APPLICATION).withId(SCHEMA_GENERATOR_INITIALIZATION_ERROR).withMessage( + SCHEMA_GENERATOR_INITIALIZATION_ERROR_MSG).build()); } } diff --git a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java index 291ef18e19..b5ad7c1952 100644 --- a/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java +++ b/openecomp-be/backend/openecomp-sdc-application-config-manager/src/test/java/org/openecomp/sdc/applicationconfig/ApplicationConfigManagerTest.java @@ -1,15 +1,37 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + package org.openecomp.sdc.applicationconfig; -import org.openecomp.sdc.applicationconfig.impl.ApplicationConfigManagerImpl; -import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.core.utilities.applicationconfig.dao.type.ApplicationConfigEntity; import org.openecomp.core.utilities.applicationconfig.type.ConfigurationData; - +import org.openecomp.sdc.applicationconfig.impl.ApplicationConfigManagerImpl; +import org.openecomp.sdc.common.errors.CoreException; import org.testng.Assert; import org.testng.annotations.Test; import java.util.Collection; +/** + * Created by Talio on 8/9/2016. + */ public class ApplicationConfigManagerTest { public static final String TEST_NAMESPACE_1 = "test-app-namespace"; @@ -22,8 +44,8 @@ public class ApplicationConfigManagerTest { public void testInsertIntoTable() { try { applicationConfigManager.insertIntoTable(TEST_NAMESPACE_1, TEST_KEY, TEST_VALUE); - } catch (CoreException e) { - Assert.assertEquals(e.getMessage(), + } catch (CoreException exception) { + Assert.assertEquals(exception.getMessage(), "Error occurred while loading questionnaire schema templates"); } } -- cgit 1.2.3-korg