From 3ea6e9821960070ac9e4acb4bea4b7339849a579 Mon Sep 17 00:00:00 2001 From: lj1412 Date: Wed, 15 Feb 2017 12:47:53 +0000 Subject: move code to dcae/operation/utils Change-Id: I6279867e9df674ab30681d419bed88ffc8effae5 Signed-off-by: lj1412 --- LICENSE.txt | 22 -- README.md | 7 - operation-utils/.classpath | 32 -- operation-utils/.gitignore | 1 - operation-utils/.project | 34 -- .../.settings/org.eclipse.core.resources.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 12 - .../.settings/org.eclipse.m2e.core.prefs | 4 - operation-utils/LICENSE.txt | 22 -- operation-utils/META-INF/MANIFEST.MF | 8 - operation-utils/build.properties | 4 - operation-utils/pom.xml | 140 ------- .../java/org/openecomp/entity/EcompComponent.java | 31 -- .../java/org/openecomp/entity/EcompOperation.java | 44 --- .../org/openecomp/entity/EcompOperationEnum.java | 27 -- .../org/openecomp/entity/EcompSubComponent.java | 33 -- .../entity/EcompSubComponentInstance.java | 63 ---- .../main/java/org/openecomp/logger/Catalog.java | 28 -- .../java/org/openecomp/logger/EcompLogger.java | 406 --------------------- .../org/openecomp/logger/EcompMessageEnum.java | 28 -- .../org/openecomp/logger/GenericMessageEnum.java | 38 -- .../utils/ConvertMessagePropertiesToYaml.java | 63 ---- .../main/java/org/openecomp/utils/YamlToJava.java | 134 ------- .../src/main/resources/GenericMessages.properties | 65 ---- .../src/main/resources/GenericMessages.yaml | 36 -- .../src/main/resources/messageEnum.java_template | 18 - .../src/main/resources/operationEnum.java_template | 13 - .../src/main/resources/properties_template | 9 - 28 files changed, 1326 deletions(-) delete mode 100644 LICENSE.txt delete mode 100644 README.md delete mode 100644 operation-utils/.classpath delete mode 100644 operation-utils/.gitignore delete mode 100644 operation-utils/.project delete mode 100644 operation-utils/.settings/org.eclipse.core.resources.prefs delete mode 100644 operation-utils/.settings/org.eclipse.jdt.core.prefs delete mode 100644 operation-utils/.settings/org.eclipse.m2e.core.prefs delete mode 100644 operation-utils/LICENSE.txt delete mode 100644 operation-utils/META-INF/MANIFEST.MF delete mode 100644 operation-utils/build.properties delete mode 100644 operation-utils/pom.xml delete mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompComponent.java delete mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompOperation.java delete mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompOperationEnum.java delete mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompSubComponent.java delete mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompSubComponentInstance.java delete mode 100644 operation-utils/src/main/java/org/openecomp/logger/Catalog.java delete mode 100644 operation-utils/src/main/java/org/openecomp/logger/EcompLogger.java delete mode 100644 operation-utils/src/main/java/org/openecomp/logger/EcompMessageEnum.java delete mode 100644 operation-utils/src/main/java/org/openecomp/logger/GenericMessageEnum.java delete mode 100644 operation-utils/src/main/java/org/openecomp/utils/ConvertMessagePropertiesToYaml.java delete mode 100644 operation-utils/src/main/java/org/openecomp/utils/YamlToJava.java delete mode 100644 operation-utils/src/main/resources/GenericMessages.properties delete mode 100644 operation-utils/src/main/resources/GenericMessages.yaml delete mode 100644 operation-utils/src/main/resources/messageEnum.java_template delete mode 100644 operation-utils/src/main/resources/operationEnum.java_template delete mode 100644 operation-utils/src/main/resources/properties_template diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 30471b5..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,22 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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============================================ - */ - -ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property. diff --git a/README.md b/README.md deleted file mode 100644 index a7f8a32..0000000 --- a/README.md +++ /dev/null @@ -1,7 +0,0 @@ - -Some OpenECOMP utilities. ECOMP Logging. - -# Build instructions - -1. Clone the repository -2. Build using Maven: mvn clean install diff --git a/operation-utils/.classpath b/operation-utils/.classpath deleted file mode 100644 index 1ab68f0..0000000 --- a/operation-utils/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/operation-utils/.gitignore b/operation-utils/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/operation-utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/operation-utils/.project b/operation-utils/.project deleted file mode 100644 index 48e38d7..0000000 --- a/operation-utils/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - operation-utils - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature - - diff --git a/operation-utils/.settings/org.eclipse.core.resources.prefs b/operation-utils/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9a..0000000 --- a/operation-utils/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/operation-utils/.settings/org.eclipse.jdt.core.prefs b/operation-utils/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6249222..0000000 --- a/operation-utils/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/operation-utils/.settings/org.eclipse.m2e.core.prefs b/operation-utils/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/operation-utils/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/operation-utils/LICENSE.txt b/operation-utils/LICENSE.txt deleted file mode 100644 index 30471b5..0000000 --- a/operation-utils/LICENSE.txt +++ /dev/null @@ -1,22 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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============================================ - */ - -ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property. diff --git a/operation-utils/META-INF/MANIFEST.MF b/operation-utils/META-INF/MANIFEST.MF deleted file mode 100644 index 65b7caa..0000000 --- a/operation-utils/META-INF/MANIFEST.MF +++ /dev/null @@ -1,8 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: operation-utils -Bundle-SymbolicName: operation-utils -Bundle-Version: 0.1.0.qualifier -Export-Package: org.openecomp.entity, - org.openecomp.logger, - org.openecomp.utils diff --git a/operation-utils/build.properties b/operation-utils/build.properties deleted file mode 100644 index 0dd4717..0000000 --- a/operation-utils/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/main/java/,\ - src/main/resources/ -bin.includes = META-INF/,\ - . diff --git a/operation-utils/pom.xml b/operation-utils/pom.xml deleted file mode 100644 index 5486f67..0000000 --- a/operation-utils/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ - - 4.0.0 - org.openecomp.dcae.operation - operation-utils - 0.1.0-SNAPSHOT - - - UTF-8 - 1.7 - 1.7 - - - - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - Restlet - Restlet Repository - http://maven.restlet.com - - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - - - - - com.att.eelf - eelf-core - 0.0.1 - - - org.slf4j - slf4j-api - 1.7.6 - - - - - org.yaml - snakeyaml - 1.15 - - - - - - org.openecomp.ncomp.utils - ncomp-utils-java - ${project.version} - - - org.codehaus.groovy - groovy-all - 2.4.3 - - - - - org.openecomp.ncomp.maven - ncomp-maven-base - 0.1.0-SNAPSHOT - ../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base - - diff --git a/operation-utils/src/main/java/org/openecomp/entity/EcompComponent.java b/operation-utils/src/main/java/org/openecomp/entity/EcompComponent.java deleted file mode 100644 index b52e9ee..0000000 --- a/operation-utils/src/main/java/org/openecomp/entity/EcompComponent.java +++ /dev/null @@ -1,31 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.entity; - -public class EcompComponent { - - public static void initialize(String string) { - // TODO Auto-generated method stub - - } - -} diff --git a/operation-utils/src/main/java/org/openecomp/entity/EcompOperation.java b/operation-utils/src/main/java/org/openecomp/entity/EcompOperation.java deleted file mode 100644 index 367a342..0000000 --- a/operation-utils/src/main/java/org/openecomp/entity/EcompOperation.java +++ /dev/null @@ -1,44 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.entity; - -public class EcompOperation { - private String requestId; - private String serviceInstanceId; - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getServiceInstanceId() { - return serviceInstanceId; - } - - public void setServiceInstanceId(String serviceInstanceId) { - this.serviceInstanceId = serviceInstanceId; - } - -} diff --git a/operation-utils/src/main/java/org/openecomp/entity/EcompOperationEnum.java b/operation-utils/src/main/java/org/openecomp/entity/EcompOperationEnum.java deleted file mode 100644 index 94be8ee..0000000 --- a/operation-utils/src/main/java/org/openecomp/entity/EcompOperationEnum.java +++ /dev/null @@ -1,27 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.entity; - - -public interface EcompOperationEnum { - -} diff --git a/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponent.java b/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponent.java deleted file mode 100644 index 85dacb1..0000000 --- a/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponent.java +++ /dev/null @@ -1,33 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.entity; - -public class EcompSubComponent { - - static String name = "NON-SET"; - - public static void initialize(String name1) { - name = name1; - EcompSubComponentInstance.initialize(); - } - -} diff --git a/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponentInstance.java b/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponentInstance.java deleted file mode 100644 index 9b54bdd..0000000 --- a/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponentInstance.java +++ /dev/null @@ -1,63 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.entity; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class EcompSubComponentInstance { - private static final Logger logger = Logger.getLogger(EcompSubComponentInstance.class.getName()); - - static String uuid = "???"; - public static String getServerIP() { - initialize(); - return serverIP; - } - - public static String getServerName() { - initialize(); - return serverName; - } - - private static String serverIP, serverName; - - public static String getUuid() { - return uuid; - } - - public static void initialize() { - if (serverIP == null || serverName == null || ("").equals(serverIP) || ("").equals(serverName)) { - try { - InetAddress server = InetAddress.getLocalHost(); - serverIP = server.getHostAddress(); - serverName = server.getCanonicalHostName(); - } catch (UnknownHostException e) { - logger.log(Level.SEVERE, "Could not get local hostname", e); - serverIP = ""; - serverName = ""; - } - } - } -} diff --git a/operation-utils/src/main/java/org/openecomp/logger/Catalog.java b/operation-utils/src/main/java/org/openecomp/logger/Catalog.java deleted file mode 100644 index f512a3c..0000000 --- a/operation-utils/src/main/java/org/openecomp/logger/Catalog.java +++ /dev/null @@ -1,28 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.logger; - -public class Catalog { - - - -} diff --git a/operation-utils/src/main/java/org/openecomp/logger/EcompLogger.java b/operation-utils/src/main/java/org/openecomp/logger/EcompLogger.java deleted file mode 100644 index 254b06e..0000000 --- a/operation-utils/src/main/java/org/openecomp/logger/EcompLogger.java +++ /dev/null @@ -1,406 +0,0 @@ - -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * 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.logger; - - - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Date; -import java.util.UUID; -import java.util.logging.Logger; - -import org.slf4j.MDC; - -import org.openecomp.entity.EcompOperation; -import org.openecomp.entity.EcompOperationEnum; -import org.openecomp.entity.EcompSubComponentInstance; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; -import com.att.eelf.configuration.SLF4jWrapper; - -/** - * Simple wrapper around the EELF Logger class for MSO usage. - * This class supports all of the normal logging functions (debug, info, etc.), - * prepending a string of format "[| m = (Map) y.load(FileUtils.filename2stream(yamlFileName, null)); - File f = new File(yamlFileName); - String name = f.getName().replace(".yaml", ""); - m.put("name", name); - m.put("packageName", packageName); - String ofile1 = outputSourceRootDir + "/" + name + ".properties"; - OutputStreamWriter w; - SimpleTemplateEngine engine = new SimpleTemplateEngine(); - if (m.containsKey("messages")) { - w = FileUtils.filename2writer(ofile1); - w.append(engine.createTemplate(getTemplate("properties_template")).make(m).toString()); - w.close(); - String ofile2 = outputSourceRootDir + "/" + name + "MessageEnum.java"; - w = FileUtils.filename2writer(ofile2); - w.append(engine.createTemplate(getTemplate("messageEnum.java_template")).make(m).toString()); - w.close(); - } - if (m.containsKey("operations")) { - String ofile3 = outputSourceRootDir + "/" + name + "OperationEnum.java"; - w = FileUtils.filename2writer(ofile3); - w.append(engine.createTemplate(getTemplate("operationEnum.java_template")).make(m).toString()); - w.close(); - } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - private static String getTemplate(String res) throws IOException { - InputStream in = YamlToJava.class.getClassLoader().getResourceAsStream(res); - if (in == null) { - throw new RuntimeException("Unable to find resource: " + res); - } - ByteArrayOutputStream o = new ByteArrayOutputStream(); - FileUtils.copyStream(in, o); - return o.toString(); -} - - public static void main(String[] args) throws IOException { - - Properties props = new Properties(); - String pname = "GenericMessages.properties"; - String fname = "src/main/resources/GenericMessages.yaml"; - props.load(YamlToJava.class.getClassLoader().getResourceAsStream(pname)); - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - Yaml y = new Yaml(options); - JSONObject j = new JSONObject(); - for (Object k : props.keySet()) { - String a[] = props.getProperty((String) k).split("\\|"); - JSONObject j1 = new JSONObject(); - j.put((String) k, j1); - j1.put("errorCode", a[0]); - j1.put("messageFormat", a[1]); - j1.put("resolution", a[2]); - j1.put("description", a[3].trim()); - } - - Object data = y.load(j.toString()); - OutputStreamWriter w = FileUtils.filename2writer(fname); - w.append(y.dump(data) + "\n"); - w.close(); - } -} diff --git a/operation-utils/src/main/resources/GenericMessages.properties b/operation-utils/src/main/resources/GenericMessages.properties deleted file mode 100644 index b7322f8..0000000 --- a/operation-utils/src/main/resources/GenericMessages.properties +++ /dev/null @@ -1,65 +0,0 @@ -######################################################################## -#Resource key=Error Code|Message text|Resolution text |Description text -####### -# {component}-{subcomponent}-{4-digit code}{classification} -#Newlines can be utilized to add some clarity ensuring continuing line -#has atleast one leading space -#ResourceKey=\ -# ERR0000E\ -# Sample error msg txt\ -# Sample resolution msg\ -# Sample description txt -# -####### -#Error code classification category for other components -#1400-1499 Security/Permission Related -#2400-2499 Availability/Timeout Related -#3400-3499 Data Access/Integrity Related -#4400-4499 Schema Interface Type/Validation -#5400-5499 Business/Flow Processing Related -#6400-6499 Reserved \u2013 do not use -#9400-9499 Unknown Errors -# -###### -#{classification} description -# I = Information -# W = Warning -# E = Error -# F = Fatal -######################################################################## -GENERAL_INFO=\ - ECOMP-GENERAL-INFO-5401|\ - {0}|\ - Please check other logs for more detailed info|\ - General info -GENERAL_WARNING=\ - ECOMP-GENERAL-WARNING-5402|\ - {0}|\ - Please check other logs for more detailed info|\ - General warning -GENERAL_ERROR=\ - ECOMP-GENERAL-ERROR-5403|\ - {0}|\ - Please check other logs for more detailed info|\ - General error -AUDIT_BEGIN=\ - ECOMP-GENERAL-5403|\ - Entering method|\ - No resolution needed|\ - Entering method -AUDIT_END=\ - ECOMP-GENERAL-5404|\ - Exiting method|\ - No resolution needed|\ - Exiting method -METRICS_BEGIN=\ - ECOMP-GENERAL-5403|\ - Entering method|\ - No resolution needed|\ - Entering method -METRICS_END=\ - ECOMP-GENERAL-5404|\ - Exiting method|\ - No resolution needed|\ - Exiting method - diff --git a/operation-utils/src/main/resources/GenericMessages.yaml b/operation-utils/src/main/resources/GenericMessages.yaml deleted file mode 100644 index df592e2..0000000 --- a/operation-utils/src/main/resources/GenericMessages.yaml +++ /dev/null @@ -1,36 +0,0 @@ -GENERAL_ERROR: - errorCode: ECOMP-GENERAL-ERROR-5403 - messageFormat: '{0}' - resolution: Please check other logs for more detailed info - description: General error -GENERAL_INFO: - errorCode: ECOMP-GENERAL-INFO-5401 - messageFormat: '{0}' - resolution: Please check other logs for more detailed info - description: General info -GENERAL_WARNING: - errorCode: ECOMP-GENERAL-WARNING-5402 - messageFormat: '{0}' - resolution: Please check other logs for more detailed info - description: General warning -METRICS_END: - errorCode: ECOMP-GENERAL-5404 - messageFormat: Exiting method - resolution: No resolution needed - description: Exiting method -AUDIT_END: - errorCode: ECOMP-GENERAL-5404 - messageFormat: Exiting method - resolution: No resolution needed - description: Exiting method -AUDIT_BEGIN: - errorCode: ECOMP-GENERAL-5403 - messageFormat: Entering method - resolution: No resolution needed - description: Entering method -METRICS_BEGIN: - errorCode: ECOMP-GENERAL-5403 - messageFormat: Entering method - resolution: No resolution needed - description: Entering method - diff --git a/operation-utils/src/main/resources/messageEnum.java_template b/operation-utils/src/main/resources/messageEnum.java_template deleted file mode 100644 index e0b3c12..0000000 --- a/operation-utils/src/main/resources/messageEnum.java_template +++ /dev/null @@ -1,18 +0,0 @@ - -package $packageName; - -import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.logger.EcompMessageEnum; - -public enum ${name}MessageEnum implements EcompMessageEnum { -<% -def last -messages.each { n, v -> last = n } -messages.each { n, v -> %> - $n${n==last ? ";" : ","}\ -<% } %> - - static { - EELFResourceManager.loadMessageBundle("${packageName}.$name"); - } -} diff --git a/operation-utils/src/main/resources/operationEnum.java_template b/operation-utils/src/main/resources/operationEnum.java_template deleted file mode 100644 index 9ec9d3d..0000000 --- a/operation-utils/src/main/resources/operationEnum.java_template +++ /dev/null @@ -1,13 +0,0 @@ - -package $packageName; - -import org.openecomp.entity.EcompOperationEnum; - -public enum ${name}OperationEnum implements EcompOperationEnum { -<% -def last -operations.each { n, v -> last = n } -operations.each { n, v -> %> - $n${n==last ? ";" : ","}\ -<% } %> -} diff --git a/operation-utils/src/main/resources/properties_template b/operation-utils/src/main/resources/properties_template deleted file mode 100644 index 76b2b48..0000000 --- a/operation-utils/src/main/resources/properties_template +++ /dev/null @@ -1,9 +0,0 @@ -<% - messages.each { n, v -> -%> -$n=\\ - $v.errorCode|\\ - $v.messageFormat|\\ - $v.resolution|\\ - $v.description -<% } %> \ No newline at end of file -- cgit 1.2.3-korg