From 26941bcd39541782b0ea2aa451e0b0982bd46b6a Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Mon, 9 Apr 2018 18:16:44 -0400 Subject: Fixes for properties files Issue-ID: AAI-1016 Change-Id: Ic640254cb0f81d9a9a5d34120431249c03878891 Signed-off-by: Jimmy Forsyth --- .../etc/appprops/methodMapper.properties | 21 ---- .../aai/modelloader/service/ModelLoaderMsgs.java | 2 +- .../modelloader/service/ModelLoaderMsgs.properties | 140 +++++++++++++++++++++ .../modelloader/service/ModelLoaderMsgs.properties | 140 --------------------- 4 files changed, 141 insertions(+), 162 deletions(-) create mode 100644 src/main/resources/org/onap/aai/modelloader/service/ModelLoaderMsgs.properties delete mode 100644 src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties diff --git a/bundleconfig-local/etc/appprops/methodMapper.properties b/bundleconfig-local/etc/appprops/methodMapper.properties index c011c4b..7b71acf 100644 --- a/bundleconfig-local/etc/appprops/methodMapper.properties +++ b/bundleconfig-local/etc/appprops/methodMapper.properties @@ -1,24 +1,3 @@ -### -# ============LICENSE_START========================================== -# org.onap.aai -# =================================================================== -# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. -# Copyright © 2017-2018 Amdocs -# =================================================================== -# 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============================================ -### - { "helloWorld": [ { diff --git a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java index ad17a43..c5f00c0 100644 --- a/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java +++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java @@ -114,7 +114,7 @@ public enum ModelLoaderMsgs implements LogMessageEnum { * Load message bundle (ModelLoaderMsgs.properties file) */ static { - EELFResourceManager.loadMessageBundle("org/onap.aai/modelloader/service/ModelLoaderMsgs"); + EELFResourceManager.loadMessageBundle("org/onap/aai/modelloader/service/ModelLoaderMsgs"); } } diff --git a/src/main/resources/org/onap/aai/modelloader/service/ModelLoaderMsgs.properties b/src/main/resources/org/onap/aai/modelloader/service/ModelLoaderMsgs.properties new file mode 100644 index 0000000..112b48c --- /dev/null +++ b/src/main/resources/org/onap/aai/modelloader/service/ModelLoaderMsgs.properties @@ -0,0 +1,140 @@ +### +# ============LICENSE_START========================================== +# org.onap.aai +# =================================================================== +# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017-2018 Amdocs +# =================================================================== +# 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============================================ +### + +#Resource key=Error Code|Message text|Resolution text |Description text +####### +#Newlines can be utilized to add some clarity ensuring continuing line +#has at least one leading space +#ResourceKey=\ +# ERR0000E\ +# Sample error msg txt\ +# Sample resolution msg\ +# Sample description txt +# +###### +#Error code classification category +#000 Info/Debug +#100 Permission errors +#200 Availability errors/Timeouts +#300 Data errors +#400 Schema Interface type/validation errors +#500 Business process errors +#900 Unknown errors +# +######################################################################## + +# INFO Level Logs +LOADING_CONFIGURATION=\ + MDLSVC0001I|\ + Loading configuration |\ + None. Attempting to load configuration|\ + Attempting to load Model Loader Service configuration.|\ + +STOPPING_CLIENT=\ + MDLSVC0002I|\ + Stopping distribution client|\ + None. Stopping service|\ + Stopping the Model Service distribution client.|\ + +DISTRIBUTION_EVENT=\ + MDLSVC0003I|\ + Distribution event: {0}|\ + None. Processing distribution.|\ + A distribution event was received from the ASDC.|\ + +AAI_REST_REQUEST_SUCCESS=\ + MDLSVC0004I|\ + Sent {0} request to {1}. Response: {2}|\ + None. Successfully sent REST request to AAI.|\ + The given request was sent to the specified endpoint.|\ + +AAI_REST_REQUEST_UNSUCCESSFUL=\ + MDLSVC0005I|\ + Sent {0} request to {1}. Response code: {2}, Response message: {3}|\ + REST request to AAI unsuccessful. Check response code, and message. |\ + The given request was unsuccessful.|\ + +DOWNLOAD_COMPLETE=\ + MDLSVC0006I|\ + Download of artifact {0} from ASDC complete. An artifact was downloaded from the ASDC. Payload: {1}|\ + +EVENT_PUBLISHED=\ + MDLSVC0007I|\ + Published {0} event for artifact {1}. Result: {2}|\ + None.|\ + An event was published to the event bus|\ + + +BABEL_REST_REQUEST_PAYLOAD=\ + MDLSVC0008I|\ + Sending request to Babel. {0}|\ + +BABEL_RESPONSE_PAYLOAD=\ + MDLSVC0009I|\ + Received response from Babel. {0}|\ + +AAI_REST_REQUEST_PAYLOAD=\ + MDLSVC0010I|\ + A&AI request payload: {0}|\ + +UNSUPPORTED_ARTIFACT_TYPE=\ + MDLSVC0011I|\ + The downloaded artifact: {0} has an unsupported type of: {1}|\ + +# ERROR Level Logs +ASDC_CONNECTION_ERROR=\ + MDLSVC2001E|\ + Unable to register with ASDC: {0}|\ + Check configuration. Check network connection to ASDC|\ + During initialization, was not able to register with the configured ASDC instance|\ + +DISTRIBUTION_EVENT_ERROR=\ + MDLSVC2002E|\ + Distribution event error: {0}|\ + Check configuration. Check network connection to ASDC and UEB|\ + A failure occurred processing a distribution event|\ + +AAI_REST_REQUEST_ERROR=\ + MDLSVC2003E|\ + Failed to send {0} request to {1}: {2}|\ + Check configuration. Check network connection to AAI.|\ + A failure occurred attempting to send a request to the AAI|\ + +ARTIFACT_PARSE_ERROR=\ + MDLSVC2004E|\ + Failed to parse artifact: {0}|\ + Check artifact. |\ + A failure occurred attempting to parse artifact from SDC|\ + +BABEL_REST_REQUEST_ERROR=\ + MDLSVC2005E|\ + Failed to send {0} request to {1}: {2}|\ + Check configuration. Check network connection to Babel.|\ + A failure occurred attempting to send a request to the Babel|\ + +# DEBUG Level Logs +INITIALIZING=\ + MDLSVC0001D|\ + init(): {0}|\ + None. Initializing service|\ + Debug information during model loader initialization|\ + + diff --git a/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties b/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties deleted file mode 100644 index 112b48c..0000000 --- a/src/main/resources/org/openecomp/modelloader/service/ModelLoaderMsgs.properties +++ /dev/null @@ -1,140 +0,0 @@ -### -# ============LICENSE_START========================================== -# org.onap.aai -# =================================================================== -# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. -# Copyright © 2017-2018 Amdocs -# =================================================================== -# 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============================================ -### - -#Resource key=Error Code|Message text|Resolution text |Description text -####### -#Newlines can be utilized to add some clarity ensuring continuing line -#has at least one leading space -#ResourceKey=\ -# ERR0000E\ -# Sample error msg txt\ -# Sample resolution msg\ -# Sample description txt -# -###### -#Error code classification category -#000 Info/Debug -#100 Permission errors -#200 Availability errors/Timeouts -#300 Data errors -#400 Schema Interface type/validation errors -#500 Business process errors -#900 Unknown errors -# -######################################################################## - -# INFO Level Logs -LOADING_CONFIGURATION=\ - MDLSVC0001I|\ - Loading configuration |\ - None. Attempting to load configuration|\ - Attempting to load Model Loader Service configuration.|\ - -STOPPING_CLIENT=\ - MDLSVC0002I|\ - Stopping distribution client|\ - None. Stopping service|\ - Stopping the Model Service distribution client.|\ - -DISTRIBUTION_EVENT=\ - MDLSVC0003I|\ - Distribution event: {0}|\ - None. Processing distribution.|\ - A distribution event was received from the ASDC.|\ - -AAI_REST_REQUEST_SUCCESS=\ - MDLSVC0004I|\ - Sent {0} request to {1}. Response: {2}|\ - None. Successfully sent REST request to AAI.|\ - The given request was sent to the specified endpoint.|\ - -AAI_REST_REQUEST_UNSUCCESSFUL=\ - MDLSVC0005I|\ - Sent {0} request to {1}. Response code: {2}, Response message: {3}|\ - REST request to AAI unsuccessful. Check response code, and message. |\ - The given request was unsuccessful.|\ - -DOWNLOAD_COMPLETE=\ - MDLSVC0006I|\ - Download of artifact {0} from ASDC complete. An artifact was downloaded from the ASDC. Payload: {1}|\ - -EVENT_PUBLISHED=\ - MDLSVC0007I|\ - Published {0} event for artifact {1}. Result: {2}|\ - None.|\ - An event was published to the event bus|\ - - -BABEL_REST_REQUEST_PAYLOAD=\ - MDLSVC0008I|\ - Sending request to Babel. {0}|\ - -BABEL_RESPONSE_PAYLOAD=\ - MDLSVC0009I|\ - Received response from Babel. {0}|\ - -AAI_REST_REQUEST_PAYLOAD=\ - MDLSVC0010I|\ - A&AI request payload: {0}|\ - -UNSUPPORTED_ARTIFACT_TYPE=\ - MDLSVC0011I|\ - The downloaded artifact: {0} has an unsupported type of: {1}|\ - -# ERROR Level Logs -ASDC_CONNECTION_ERROR=\ - MDLSVC2001E|\ - Unable to register with ASDC: {0}|\ - Check configuration. Check network connection to ASDC|\ - During initialization, was not able to register with the configured ASDC instance|\ - -DISTRIBUTION_EVENT_ERROR=\ - MDLSVC2002E|\ - Distribution event error: {0}|\ - Check configuration. Check network connection to ASDC and UEB|\ - A failure occurred processing a distribution event|\ - -AAI_REST_REQUEST_ERROR=\ - MDLSVC2003E|\ - Failed to send {0} request to {1}: {2}|\ - Check configuration. Check network connection to AAI.|\ - A failure occurred attempting to send a request to the AAI|\ - -ARTIFACT_PARSE_ERROR=\ - MDLSVC2004E|\ - Failed to parse artifact: {0}|\ - Check artifact. |\ - A failure occurred attempting to parse artifact from SDC|\ - -BABEL_REST_REQUEST_ERROR=\ - MDLSVC2005E|\ - Failed to send {0} request to {1}: {2}|\ - Check configuration. Check network connection to Babel.|\ - A failure occurred attempting to send a request to the Babel|\ - -# DEBUG Level Logs -INITIALIZING=\ - MDLSVC0001D|\ - init(): {0}|\ - None. Initializing service|\ - Debug information during model loader initialization|\ - - -- cgit 1.2.3-korg