From 2df01453c7e4cd35c41c6185dc2ea34710b29b7f Mon Sep 17 00:00:00 2001 From: lj1412 Date: Tue, 14 Feb 2017 15:12:22 +0000 Subject: Init dcae.operation Change-Id: Ia36372d0fb3ba0b960b32a50d656a0e7035bdcac Signed-off-by: lj1412 --- .gitreview | 4 + 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 + 29 files changed, 1330 insertions(+) create mode 100644 .gitreview create mode 100644 LICENSE.txt create mode 100644 README.md create mode 100644 operation-utils/.classpath create mode 100644 operation-utils/.gitignore create mode 100644 operation-utils/.project create mode 100644 operation-utils/.settings/org.eclipse.core.resources.prefs create mode 100644 operation-utils/.settings/org.eclipse.jdt.core.prefs create mode 100644 operation-utils/.settings/org.eclipse.m2e.core.prefs create mode 100644 operation-utils/LICENSE.txt create mode 100644 operation-utils/META-INF/MANIFEST.MF create mode 100644 operation-utils/build.properties create mode 100644 operation-utils/pom.xml create mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompComponent.java create mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompOperation.java create mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompOperationEnum.java create mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompSubComponent.java create mode 100644 operation-utils/src/main/java/org/openecomp/entity/EcompSubComponentInstance.java create mode 100644 operation-utils/src/main/java/org/openecomp/logger/Catalog.java create mode 100644 operation-utils/src/main/java/org/openecomp/logger/EcompLogger.java create mode 100644 operation-utils/src/main/java/org/openecomp/logger/EcompMessageEnum.java create mode 100644 operation-utils/src/main/java/org/openecomp/logger/GenericMessageEnum.java create mode 100644 operation-utils/src/main/java/org/openecomp/utils/ConvertMessagePropertiesToYaml.java create mode 100644 operation-utils/src/main/java/org/openecomp/utils/YamlToJava.java create mode 100644 operation-utils/src/main/resources/GenericMessages.properties create mode 100644 operation-utils/src/main/resources/GenericMessages.yaml create mode 100644 operation-utils/src/main/resources/messageEnum.java_template create mode 100644 operation-utils/src/main/resources/operationEnum.java_template create mode 100644 operation-utils/src/main/resources/properties_template diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b784637 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.openecomp.org +port=29418 +project=dcae/operation.git diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..30471b5 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,22 @@ + +/*- + * ============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 new file mode 100644 index 0000000..a7f8a32 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ + +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 new file mode 100644 index 0000000..1ab68f0 --- /dev/null +++ b/operation-utils/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/operation-utils/.gitignore b/operation-utils/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/operation-utils/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/operation-utils/.project b/operation-utils/.project new file mode 100644 index 0000000..48e38d7 --- /dev/null +++ b/operation-utils/.project @@ -0,0 +1,34 @@ + + + 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 new file mode 100644 index 0000000..abdea9a --- /dev/null +++ b/operation-utils/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..6249222 --- /dev/null +++ b/operation-utils/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/operation-utils/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/operation-utils/LICENSE.txt b/operation-utils/LICENSE.txt new file mode 100644 index 0000000..30471b5 --- /dev/null +++ b/operation-utils/LICENSE.txt @@ -0,0 +1,22 @@ + +/*- + * ============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 new file mode 100644 index 0000000..65b7caa --- /dev/null +++ b/operation-utils/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..0dd4717 --- /dev/null +++ b/operation-utils/build.properties @@ -0,0 +1,4 @@ +source.. = src/main/java/,\ + src/main/resources/ +bin.includes = META-INF/,\ + . diff --git a/operation-utils/pom.xml b/operation-utils/pom.xml new file mode 100644 index 0000000..5486f67 --- /dev/null +++ b/operation-utils/pom.xml @@ -0,0 +1,140 @@ + + 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 new file mode 100644 index 0000000..b52e9ee --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/entity/EcompComponent.java @@ -0,0 +1,31 @@ + +/*- + * ============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 new file mode 100644 index 0000000..367a342 --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/entity/EcompOperation.java @@ -0,0 +1,44 @@ + +/*- + * ============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 new file mode 100644 index 0000000..94be8ee --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/entity/EcompOperationEnum.java @@ -0,0 +1,27 @@ + +/*- + * ============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 new file mode 100644 index 0000000..85dacb1 --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponent.java @@ -0,0 +1,33 @@ + +/*- + * ============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 new file mode 100644 index 0000000..9b54bdd --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/entity/EcompSubComponentInstance.java @@ -0,0 +1,63 @@ + +/*- + * ============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 new file mode 100644 index 0000000..f512a3c --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/logger/Catalog.java @@ -0,0 +1,28 @@ + +/*- + * ============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 new file mode 100644 index 0000000..254b06e --- /dev/null +++ b/operation-utils/src/main/java/org/openecomp/logger/EcompLogger.java @@ -0,0 +1,406 @@ + +/*- + * ============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 new file mode 100644 index 0000000..b7322f8 --- /dev/null +++ b/operation-utils/src/main/resources/GenericMessages.properties @@ -0,0 +1,65 @@ +######################################################################## +#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 new file mode 100644 index 0000000..df592e2 --- /dev/null +++ b/operation-utils/src/main/resources/GenericMessages.yaml @@ -0,0 +1,36 @@ +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 new file mode 100644 index 0000000..e0b3c12 --- /dev/null +++ b/operation-utils/src/main/resources/messageEnum.java_template @@ -0,0 +1,18 @@ + +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 new file mode 100644 index 0000000..9ec9d3d --- /dev/null +++ b/operation-utils/src/main/resources/operationEnum.java_template @@ -0,0 +1,13 @@ + +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 new file mode 100644 index 0000000..76b2b48 --- /dev/null +++ b/operation-utils/src/main/resources/properties_template @@ -0,0 +1,9 @@ +<% + messages.each { n, v -> +%> +$n=\\ + $v.errorCode|\\ + $v.messageFormat|\\ + $v.resolution|\\ + $v.description +<% } %> \ No newline at end of file -- cgit 1.2.3-korg