33 files changed, 2740 insertions, 1671 deletions

diff --git a/cmso-service/src/main/java/org/onap/observations/Mdc.java b/cmso-service/src/main/java/org/onap/observations/Mdc.java
index b00bed3..b9b30ea 100644
--- a/cmso-service/src/main/java/org/onap/observations/Mdc.java
+++ b/cmso-service/src/main/java/org/onap/observations/Mdc.java
@@ -1,32 +1,29 @@
 /*
  * Copyright © 2019 AT&T Intellectual Property.
- * 
- * 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
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation 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.
- * 
- * 
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *         https://creativecommons.org/licenses/by/4.0/
- * 
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
+ */
+
 package org.onap.observations;
 
 import static com.att.eelf.configuration.Configuration.MDC_BEGIN_TIMESTAMP;
@@ -45,12 +42,12 @@ import static com.att.eelf.configuration.Configuration.MDC_STATUS_CODE;
 import static com.att.eelf.configuration.Configuration.MDC_TARGET_ENTITY;
 import static com.att.eelf.configuration.Configuration.MDC_TARGET_SERVICE_NAME;
 
+import com.att.eelf.utils.Stopwatch;
 import java.net.InetAddress;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientResponseContext;
@@ -58,191 +55,261 @@ import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response.StatusType;
-
 import org.onap.optf.cmso.filters.MessageHeaders.HeadersEnum;
 import org.quartz.JobExecutionContext;
 import org.slf4j.MDC;
 
-import com.att.eelf.utils.Stopwatch;
-
 /**
- * ECOMP EELF logging MDC fields not defined in the MDC Configuration (i.e.
- * MDC_ALERT_SEVERITY)
+ * ECOMP EELF logging MDC fields not defined in the MDC Configuration (i.e. MDC_ALERT_SEVERITY)
  **/
 public class Mdc {
-	public static final String SERVICE_NAME = "CSS-Scheduler";
-	public enum Enum {
-		// BeginTimestamp,
-		// EndTimeStamp,
-		// RequestId,
-		// ServiceInstanceId,
-		VirtualServerName,
-		// ServiceName,
-		// PartnerName,
-		// StatusCOde,
-		// ResponseCode,
-		// ResponseDescription,
-		// InstanceUUID,
-		// AlertSeverity,
-		// ServerIPAddress,
-		// ElapsedTime,
-		// ServerFQDN,
-		// RemoteHost,
-		ClassName, Unused,
-		// ProcessKey,
-		CustomField1, CustomField2, CustomField3, CustomField4,
-		// TargetVirtualEntity,
-		// TargetEntity,
-		// TargetServiceName,
-		ErrorCode, ErrorDescription, Timer,
-	}
-
-	public static String getCaller(int back)
-	{
-		StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-		return stackTraceElements[back].getClassName() + "." + stackTraceElements[back].getMethodName();
-	}
-
-	public static void setCaller(int back)
-	{
-		String caller = MDC.get(Enum.ClassName.name());
-		if (caller == null)
-			MDC.put(Enum.ClassName.name(), getCaller(back));
-	}
-
-	public static void setObservation(ObservationInterface o)
-	{
-		MDC.put(Enum.CustomField4.name(), o.name());
-	}
-
-	public static void clearCaller()
-	{
-		MDC.remove(Enum.ClassName.name());
-	}
-
-	public static void quartzJobBegin(JobExecutionContext context) 
-	{
-		MDC.clear();
-		MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
-		MDC.put(MDC_INSTANCE_UUID, UUID.randomUUID().toString());
-		try{  MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName()); } catch (Exception e){ MDC.put(MDC_SERVER_FQDN, e.getMessage());}
-		try{  MDC.put(MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress()); } catch (Exception e){ MDC.put(MDC_SERVER_FQDN, e.getMessage());}
-		MDC.put(MDC_SERVICE_INSTANCE_ID, "UNKNOWN");
-		MDC.put(MDC_SERVICE_NAME, SERVICE_NAME);
-		MDC.put(Enum.ClassName.name(), getCaller(3));
-	}
-		
-	public static void quartzJobEnd(JobExecutionContext context) 
-	{
-		MDC.put(MDC_END_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
-		MDC.put(Enum.ClassName.name(), getCaller(3));
-	}
-
-	public static Map<String, String> save() 
-	{
-		Map<String, String> save = MDC.getCopyOfContextMap();
-		return save;
-	}
-
-	public static void restore(Map<String, String> mdcSave) 
-	{
-		MDC.clear();
-		for (String name : mdcSave.keySet())
-			MDC.put(name, mdcSave.get(name));
-	}
-
-
-
-	public static void setRequestIdIfNotSet(String requestId) {
-		if (MDC.get(MDC_KEY_REQUEST_ID) == null || MDC.get(MDC_KEY_REQUEST_ID).equals(""))
-	{
-			setRequestId(requestId);
-		}
-	}
-	
-	public static void setRequestId(String requestId) {
-		MDC.put(MDC_KEY_REQUEST_ID, requestId);
-	}
-		
-	public static void metricStart(ClientRequestContext requestContext) {
-		MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
-		MDC.put(MDC_END_TIMESTAMP, MDC.get(MDC_BEGIN_TIMESTAMP));
-		setPartnerTargetFromUri(requestContext.getUri());
-	}
-
-	public static void metricEnd(ClientResponseContext response) 
-	{
-		
-		Date now = new Date();
-		//MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(now));
-		MDC.put(MDC_END_TIMESTAMP, Stopwatch.isoFormatter.format(now));
-		setResponseInfo(response.getStatusInfo());
-		
-	}
-	public static void auditStart(ContainerRequestContext requestContext, HttpServletRequest servletRequest) 
-	{
-		MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
-		MDC.put(MDC_END_TIMESTAMP, MDC.get(MDC_BEGIN_TIMESTAMP));
-		MDC.put(MDC_REMOTE_HOST, servletRequest.getRemoteHost());
-		MDC.put(Enum.ClassName.name(), getCaller(4));
-		MultivaluedMap<String, String> headers = requestContext.getHeaders();
-		String transactionId = (String) headers.getFirst(HeadersEnum.TransactionID.toString());
-		if (transactionId != null)
-		{
-			setRequestId(transactionId);
-		}
-		else
-		{
-			setRequestId(UUID.randomUUID().toString());
-		}
-		
-	}
-
-	public static void auditEnd(ContainerRequestContext requestContext, ContainerResponseContext response)
-	{
-		Date now = new Date();
-		//MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(now));
-		MDC.put(MDC_END_TIMESTAMP, Stopwatch.isoFormatter.format(now));
-		MDC.put(Enum.ClassName.name(), getCaller(4));
-		
-		setResponseInfo(response.getStatusInfo());
-		
-	}
-		 
-	private static void setResponseInfo(StatusType statusInfo)
-	{
-		Integer status = statusInfo.getStatusCode();
-		String completed = "ERROR";
-		if (status >=200 && status < 300)
-		{
-			completed = "COMPLETE";
-		}
-		MDC.put(MDC_RESPONSE_CODE, status.toString());
-		MDC.put(MDC_RESPONSE_DESC, statusInfo.getReasonPhrase());
-		MDC.put(MDC_STATUS_CODE, completed);
-	}
-		
-	public static void setEvent(String requestID) {
-		MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
-		MDC.put(MDC_END_TIMESTAMP, MDC.get(MDC_BEGIN_TIMESTAMP));
-		setRequestId(requestID);
-	}
-
-	private static void setPartnerTargetFromUri(URI uri)
-	{
-		try
-		{
-			MDC.put(MDC_PARTNER_NAME, uri.getHost());
-			MDC.put(MDC_TARGET_ENTITY, uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort());
-			MDC.put(MDC_TARGET_SERVICE_NAME, uri.getPath());
-		}
-		catch (Exception e)
-		{
-			MDC.put(MDC_PARTNER_NAME, "UNKNOWN");
-			MDC.put(MDC_TARGET_ENTITY, "UNKNOWN");
-			MDC.put(MDC_TARGET_SERVICE_NAME, "UNKNOWN");
-		}
-	}
-
-
-}
\ No newline at end of file
+
+    /** The Constant SERVICE_NAME. */
+    public static final String SERVICE_NAME = "CSS-Scheduler";
+
+    /**
+     * The Enum Enum.
+     */
+    public enum Enum {
+        // BeginTimestamp,
+        // EndTimeStamp,
+        // RequestId,
+        // ServiceInstanceId,
+        VirtualServerName,
+        // ServiceName,
+        // PartnerName,
+        // StatusCOde,
+        // ResponseCode,
+        // ResponseDescription,
+        // InstanceUUID,
+        // AlertSeverity,
+        // ServerIPAddress,
+        // ElapsedTime,
+        // ServerFQDN,
+        // RemoteHost,
+        ClassName, Unused,
+        // ProcessKey,
+        CustomField1, CustomField2, CustomField3, CustomField4,
+        // TargetVirtualEntity,
+        // TargetEntity,
+        // TargetServiceName,
+        ErrorCode, ErrorDescription, Timer,
+    }
+
+    /**
+     * Gets the caller.
+     *
+     * @param back the back
+     * @return the caller
+     */
+    public static String getCaller(int back) {
+        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+        return stackTraceElements[back].getClassName() + "." + stackTraceElements[back].getMethodName();
+    }
+
+    /**
+     * Sets the caller.
+     *
+     * @param back the new caller
+     */
+    public static void setCaller(int back) {
+        String caller = MDC.get(Enum.ClassName.name());
+        if (caller == null)
+        {
+            MDC.put(Enum.ClassName.name(), getCaller(back));
+        }
+    }
+
+    /**
+     * Sets the observation.
+     *
+     * @param obs the new observation
+     */
+    public static void setObservation(ObservationInterface obs) {
+        MDC.put(Enum.CustomField4.name(), obs.name());
+    }
+
+    /**
+     * Clear caller.
+     */
+    public static void clearCaller() {
+        MDC.remove(Enum.ClassName.name());
+    }
+
+    /**
+     * Quartz job begin.
+     *
+     * @param context the context
+     */
+    public static void quartzJobBegin(JobExecutionContext context) {
+        MDC.clear();
+        MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
+        MDC.put(MDC_INSTANCE_UUID, UUID.randomUUID().toString());
+        try {
+            MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName());
+        } catch (Exception e) {
+            MDC.put(MDC_SERVER_FQDN, e.getMessage());
+        }
+        try {
+            MDC.put(MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress());
+        } catch (Exception e) {
+            MDC.put(MDC_SERVER_FQDN, e.getMessage());
+        }
+        MDC.put(MDC_SERVICE_INSTANCE_ID, "UNKNOWN");
+        MDC.put(MDC_SERVICE_NAME, SERVICE_NAME);
+        MDC.put(Enum.ClassName.name(), getCaller(3));
+    }
+
+    /**
+     * Quartz job end.
+     *
+     * @param context the context
+     */
+    public static void quartzJobEnd(JobExecutionContext context) {
+        MDC.put(MDC_END_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
+        MDC.put(Enum.ClassName.name(), getCaller(3));
+    }
+
+    /**
+     * Save.
+     *
+     * @return the map
+     */
+    public static Map<String, String> save() {
+        Map<String, String> save = MDC.getCopyOfContextMap();
+        return save;
+    }
+
+    /**
+     * Restore.
+     *
+     * @param mdcSave the mdc save
+     */
+    public static void restore(Map<String, String> mdcSave) {
+        MDC.clear();
+        for (String name : mdcSave.keySet())
+        {
+            MDC.put(name, mdcSave.get(name));
+        }
+    }
+
+
+
+    /**
+     * Sets the request id if not set.
+     *
+     * @param requestId the new request id if not set
+     */
+    public static void setRequestIdIfNotSet(String requestId) {
+        if (MDC.get(MDC_KEY_REQUEST_ID) == null || MDC.get(MDC_KEY_REQUEST_ID).equals("")) {
+            setRequestId(requestId);
+        }
+    }
+
+    /**
+     * Sets the request id.
+     *
+     * @param requestId the new request id
+     */
+    public static void setRequestId(String requestId) {
+        MDC.put(MDC_KEY_REQUEST_ID, requestId);
+    }
+
+    /**
+     * Metric start.
+     *
+     * @param requestContext the request context
+     */
+    public static void metricStart(ClientRequestContext requestContext) {
+        MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
+        MDC.put(MDC_END_TIMESTAMP, MDC.get(MDC_BEGIN_TIMESTAMP));
+        setPartnerTargetFromUri(requestContext.getUri());
+    }
+
+    /**
+     * Metric end.
+     *
+     * @param response the response
+     */
+    public static void metricEnd(ClientResponseContext response) {
+
+        Date now = new Date();
+        // MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(now));
+        MDC.put(MDC_END_TIMESTAMP, Stopwatch.isoFormatter.format(now));
+        setResponseInfo(response.getStatusInfo());
+
+    }
+
+    /**
+     * Audit start.
+     *
+     * @param requestContext the request context
+     * @param servletRequest the servlet request
+     */
+    public static void auditStart(ContainerRequestContext requestContext, HttpServletRequest servletRequest) {
+        MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
+        MDC.put(MDC_END_TIMESTAMP, MDC.get(MDC_BEGIN_TIMESTAMP));
+        MDC.put(MDC_REMOTE_HOST, servletRequest.getRemoteHost());
+        MDC.put(Enum.ClassName.name(), getCaller(4));
+        MultivaluedMap<String, String> headers = requestContext.getHeaders();
+        String transactionId = headers.getFirst(HeadersEnum.TransactionID.toString());
+        if (transactionId != null) {
+            setRequestId(transactionId);
+        } else {
+            setRequestId(UUID.randomUUID().toString());
+        }
+
+    }
+
+    /**
+     * Audit end.
+     *
+     * @param requestContext the request context
+     * @param response the response
+     */
+    public static void auditEnd(ContainerRequestContext requestContext, ContainerResponseContext response) {
+        Date now = new Date();
+        // MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(now));
+        MDC.put(MDC_END_TIMESTAMP, Stopwatch.isoFormatter.format(now));
+        MDC.put(Enum.ClassName.name(), getCaller(4));
+
+        setResponseInfo(response.getStatusInfo());
+
+    }
+
+    private static void setResponseInfo(StatusType statusInfo) {
+        Integer status = statusInfo.getStatusCode();
+        String completed = "ERROR";
+        if (status >= 200 && status < 300) {
+            completed = "COMPLETE";
+        }
+        MDC.put(MDC_RESPONSE_CODE, status.toString());
+        MDC.put(MDC_RESPONSE_DESC, statusInfo.getReasonPhrase());
+        MDC.put(MDC_STATUS_CODE, completed);
+    }
+
+    /**
+     * Sets the event.
+     *
+     * @param requestId the new event
+     */
+    public static void setEvent(String requestId) {
+        MDC.put(MDC_BEGIN_TIMESTAMP, Stopwatch.isoFormatter.format(new Date()));
+        MDC.put(MDC_END_TIMESTAMP, MDC.get(MDC_BEGIN_TIMESTAMP));
+        setRequestId(requestId);
+    }
+
+    private static void setPartnerTargetFromUri(URI uri) {
+        try {
+            MDC.put(MDC_PARTNER_NAME, uri.getHost());
+            MDC.put(MDC_TARGET_ENTITY, uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort());
+            MDC.put(MDC_TARGET_SERVICE_NAME, uri.getPath());
+        } catch (Exception e) {
+            MDC.put(MDC_PARTNER_NAME, "UNKNOWN");
+            MDC.put(MDC_TARGET_ENTITY, "UNKNOWN");
+            MDC.put(MDC_TARGET_SERVICE_NAME, "UNKNOWN");
+        }
+    }
+
+
+}
diff --git a/cmso-service/src/main/java/org/onap/observations/Observation.java b/cmso-service/src/main/java/org/onap/observations/Observation.java
index 39bc3ca..3d2d176 100644
--- a/cmso-service/src/main/java/org/onap/observations/Observation.java
+++ b/cmso-service/src/main/java/org/onap/observations/Observation.java
@@ -1,126 +1,129 @@
 /*
  * Copyright © 2019 AT&T Intellectual Property.
- * 
- * 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
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation 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.
- * 
- * 
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *         https://creativecommons.org/licenses/by/4.0/
- * 
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
+ */
+
 package org.onap.observations;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import org.apache.log4j.Level;
 import org.onap.optf.cmso.Application;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 
+/**
+ * The Class Observation.
+ */
+public class Observation {
+    private static EELFLogger log = EELFManager.getInstance().getLogger(Application.class);
+    private static EELFLogger metrics = EELFManager.getInstance().getMetricsLogger();
+    private static EELFLogger audit = EELFManager.getInstance().getAuditLogger();
+    private static EELFLogger errors = EELFManager.getInstance().getErrorLogger();
+    private static EELFLogger debug = EELFManager.getInstance().getDebugLogger();
+
+    /**
+     * Report.
+     *
+     * @param obs the o
+     * @param execpt the e
+     * @param arguments the arguments
+     */
+    // *************************************************************************************************
+    public static void report(ObservationInterface obs, Exception execpt, String... arguments) {
+        Mdc.setCaller(4);
+        Mdc.setObservation(obs);
+        if (obs.getAudit()) {
+            audit.info(obs, execpt, arguments);
+        }
+        if (obs.getMetric()) {
+            metrics.info(obs, execpt, arguments);
+        }
+        Level lev = obs.getLevel();
+        switch (lev.toInt()) {
+            case Level.WARN_INT:
+                errors.warn(obs, arguments);
+                debug.debug(obs, execpt, arguments);
+                break;
+            case Level.INFO_INT:
+                log.info(obs, execpt, arguments);
+                debug.debug(obs, execpt, arguments);
+                break;
+            case Level.ERROR_INT:
+                errors.error(obs, arguments);
+                debug.debug(obs, execpt, arguments);
+                break;
+            case Level.TRACE_INT:
+                debug.trace(obs, execpt, arguments);
+                break;
+            case Level.DEBUG_INT:
+                debug.debug(obs, execpt, arguments);
+                break;
+            default:
+                log.info(obs, execpt, arguments);
+        }
+        Mdc.clearCaller();
+    }
 
-public class Observation 
-{
-	private static EELFLogger log = EELFManager.getInstance().getLogger(Application.class);
-	private static EELFLogger metrics = EELFManager.getInstance().getMetricsLogger();
-	private static EELFLogger audit = EELFManager.getInstance().getAuditLogger();
-	private static EELFLogger errors = EELFManager.getInstance().getErrorLogger();
-	private static EELFLogger debug = EELFManager.getInstance().getDebugLogger();
-	
-	//*************************************************************************************************
-	public static void report(ObservationInterface o, Exception e, String ...arguments) 
-	{
-		Mdc.setCaller(4);
-		Mdc.setObservation(o);
-		if (o.getAudit())
-		{
-			audit.info(o, e, arguments);
-		}
-		if (o.getMetric())
-		{
-			metrics.info(o, e, arguments);
-		}
-		Level l = o.getLevel();
-		switch (l.toInt())
-		{
-		case Level.WARN_INT:
-			errors.warn(o, arguments);
-			debug.debug(o, e, arguments);
-			break;
-		case Level.INFO_INT:
-			log.info(o, e, arguments);
-			debug.debug(o, e, arguments);
-			break;
-		case Level.ERROR_INT:
-			errors.error(o, arguments);
-			debug.debug(o, e, arguments);
-			break;
-		case Level.TRACE_INT:
-			debug.trace(o, e, arguments);
-			break;
-		case Level.DEBUG_INT:
-			debug.debug(o, e, arguments);
-			break;
-		default:
-			log.info(o, e, arguments);
-		}
-		Mdc.clearCaller();
-	}
-	
-	public static void report(ObservationInterface o, String ...arguments) 
-	{
-		Mdc.setCaller(4);
-		Mdc.setObservation(o);
-		if (o.getAudit())
-		{
-			audit.info(o, arguments);
-		}
-		if (o.getMetric())
-		{
-			metrics.info(o, arguments);
-		}
-		Level l = o.getLevel();
-		switch (l.toInt())
-		{
-		case Level.WARN_INT:
-			errors.warn(o, arguments);
-			debug.debug(o, arguments);
-			break;
-		case Level.INFO_INT:
-			log.info(o, arguments);
-			debug.debug(o, arguments);
-			break;
-		case Level.ERROR_INT:
-			errors.error(o, arguments);
-			debug.debug(o, arguments);
-			break;
-		case Level.TRACE_INT:
-			debug.debug(o, arguments);
-			break;
-		case Level.DEBUG_INT:
-			debug.debug(o, arguments);
-			break;
-		default:
-			log.info(o, arguments);
-		}
-		Mdc.clearCaller();
-	}
+    /**
+     * Report.
+     *
+     * @param obs the o
+     * @param arguments the arguments
+     */
+    public static void report(ObservationInterface obs, String... arguments) {
+        Mdc.setCaller(4);
+        Mdc.setObservation(obs);
+        if (obs.getAudit()) {
+            audit.info(obs, arguments);
+        }
+        if (obs.getMetric()) {
+            metrics.info(obs, arguments);
+        }
+        Level levl = obs.getLevel();
+        switch (levl.toInt()) {
+            case Level.WARN_INT:
+                errors.warn(obs, arguments);
+                debug.debug(obs, arguments);
+                break;
+            case Level.INFO_INT:
+                log.info(obs, arguments);
+                debug.debug(obs, arguments);
+                break;
+            case Level.ERROR_INT:
+                errors.error(obs, arguments);
+                debug.debug(obs, arguments);
+                break;
+            case Level.TRACE_INT:
+                debug.debug(obs, arguments);
+                break;
+            case Level.DEBUG_INT:
+                debug.debug(obs, arguments);
+                break;
+            default:
+                log.info(obs, arguments);
+        }
+        Mdc.clearCaller();
+    }
 
 }
diff --git a/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java b/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java
index 16305bc..0dce93d 100644
--- a/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java
+++ b/cmso-service/src/main/java/org/onap/observations/ObservationInterface.java
@@ -1,48 +1,49 @@
 /*
  * Copyright © 2019 AT&T Intellectual Property.
- * 
- * 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
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation 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.
- * 
- * 
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *         https://creativecommons.org/licenses/by/4.0/
- * 
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
+ */
+
 package org.onap.observations;
 
+import com.att.eelf.i18n.EELFResolvableErrorEnum;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.log4j.Level;
 
-import com.att.eelf.i18n.EELFResolvableErrorEnum;
+public interface ObservationInterface extends EELFResolvableErrorEnum {
+    public Enum<?> getValue();
+
+    public Level getLevel();
+
+    public String getMessage();
+
+    public Status getStatus();
+
+    public String getDomain();
+
+    public String name();
+
+    public Boolean getAudit();
 
-public interface ObservationInterface extends EELFResolvableErrorEnum
-{
-	public Enum<?> getValue();
-	public Level getLevel();
-	public String getMessage();
-	public Status getStatus();
-	public String getDomain();
-	public String name();
-	public Boolean getAudit();
-	public Boolean getMetric();
-}
\ No newline at end of file
+    public Boolean getMetric();
+}
diff --git a/cmso-service/src/main/java/org/onap/observations/ObservationObject.java b/cmso-service/src/main/java/org/onap/observations/ObservationObject.java
index 639db76..17bd939 100644
--- a/cmso-service/src/main/java/org/onap/observations/ObservationObject.java
+++ b/cmso-service/src/main/java/org/onap/observations/ObservationObject.java
@@ -1,109 +1,198 @@
 /*
  * Copyright © 2019 AT&T Intellectual Property.
- * 
- * 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
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation 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.
- * 
- * 
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *         https://creativecommons.org/licenses/by/4.0/
- * 
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
+ */
+
 package org.onap.observations;
 
+import com.att.eelf.i18n.EELFResolvableErrorEnum;
+import com.att.eelf.i18n.EELFResourceManager;
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.log4j.Level;
 
-import com.att.eelf.i18n.EELFResolvableErrorEnum;
-import com.att.eelf.i18n.EELFResourceManager;
 
+/**
+ * The Class ObservationObject.
+ */
+public class ObservationObject implements ObservationInterface {
+
+    // *************************************************************************************************
+    // Interface class that matches the ObservationInteface pattern
+    // This will be used in case we decide to provide external overrides and we need to instantiate
+    // For now, we'll just use the Enum itself.
+    //
+    //
+    private Enum<?> value = null;
+
+    private Level level = null;;
+    private String message = null;
+    private Status status = null;
+    private String domain = null;
+    private Boolean metric = false;
+    private Boolean audit = false;
+
+    /**
+     * Instantiates a new observation object.
+     *
+     * @param obs the o
+     */
+    public ObservationObject(ObservationInterface obs) {
+        this.value   = obs.getValue();
+        this.level   = obs.getLevel();
+        this.message = obs.getMessage();
+        this.status  = obs.getStatus();
+        this.domain  = obs.getDomain();
+        this.metric  = obs.getMetric();
+        this.audit   = obs.getAudit();
+
+    }
+
+    /**
+     * Gets the value.
+     *
+     * @return the value
+     */
+    @Override
+    public Enum<?> getValue() {
+        return value;
+    }
+
+    /**
+     * Gets the message.
+     *
+     * @return the message
+     */
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Gets the status.
+     *
+     * @return the status
+     */
+    @Override
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * Gets the domain.
+     *
+     * @return the domain
+     */
+    @Override
+    public String getDomain() {
+        return domain;
+    }
+
+    /**
+     * Gets the level.
+     *
+     * @return the level
+     */
+    @Override
+    public Level getLevel() {
+        return level;
+    }
+
+    /**
+     * Name.
+     *
+     * @return the string
+     */
+    @Override
+    public String name() {
+        return value.name();
+    }
+
+    /**
+     * Gets the audit.
+     *
+     * @return the audit
+     */
+    @Override
+    public Boolean getAudit() {
+        return audit;
+    }
+
+    /**
+     * Gets the metric.
+     *
+     * @return the metric
+     */
+    @Override
+    public Boolean getMetric() {
+        return metric;
+    }
+
+    /**
+     * Gets the message.
+     *
+     * @param arguments the arguments
+     * @return the message
+     */
+    public String getMessagef(String... arguments) {
+        return EELFResourceManager.format((EELFResolvableErrorEnum) value, arguments);
+    }
+
+    /**
+     * Sets the value.
+     *
+     * @param value the new value
+     */
+    public void setValue(Enum<?> value) {
+        this.value = value;
+    }
+
+    /**
+     * Sets the level.
+     *
+     * @param level the new level
+     */
+    public void setLevel(Level level) {
+        this.level = level;
+    }
+
+    /**
+     * Sets the message.
+     *
+     * @param message the new message
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
 
-public class ObservationObject implements ObservationInterface
-{
-	
-	//*************************************************************************************************
-	// Interface class that matches the ObservationInteface  pattern
-	// This will be used in case we decide to provide external overrides and we need to instantiate
-	// For now, we'll just use the Enum itself.
-	//
-	// 
-	private Enum<?> value = null;
-	private Level level = null;;
-	private String message = null;
-	private Status status = null;
-	private String domain = null;
-	private Boolean metric = false;
-	private Boolean audit = false;
-	public ObservationObject(ObservationInterface o)
-	{
-		this.value = o.getValue();
-		this.level = o.getLevel();
-		this.message = o.getMessage();
-		this.status = o.getStatus();
-		this.domain = o.getDomain();
-		this.metric = o.getMetric();
-		this.audit = o.getAudit();
-		
-	}
-	public Enum<?> getValue() {return value;}
-	@Override
-	public String getMessage() {return message;}
-	@Override
-	public Status getStatus() {return status;}
-	@Override
-	public String getDomain() {return domain;}
-
-	@Override
-	public Level getLevel() {
-		return level;
-	}
-	@Override
-	public String name() {
-		return value.name();
-	}
-	@Override
-	public Boolean getAudit() {
-		return audit;
-	}
-	@Override
-	public Boolean getMetric() {
-		return metric;
-	}
-
-	public String getMessage(String ...arguments) {
-		return EELFResourceManager.format((EELFResolvableErrorEnum)value,  arguments);
-	}
-	public void setValue(Enum<?> value) {
-		this.value = value;
-	}
-	public void setLevel(Level level) {
-		this.level = level;
-	}
-	public void setMessage(String message) {
-		this.message = message;
-	}
-	public void setStatus(Status status) {
-		this.status = status;
-	}
+    /**
+     * Sets the status.
+     *
+     * @param status the new status
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
 
 
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java b/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java
index 9189326..46db256 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/JerseyConfiguration.java
@@ -40,10 +40,10 @@ import org.glassfish.jersey.logging.LoggingFeature;
 import org.glassfish.jersey.server.ResourceConfig;

 import org.glassfish.jersey.servlet.ServletProperties;

 import org.onap.optf.cmso.dispatcher.rs.DispatcherServiceImpl;

-import org.onap.optf.cmso.filters.CMSOContainerFilters;

+import org.onap.optf.cmso.filters.CmsoContainerFilters;

 import org.onap.optf.cmso.service.rs.AdminToolImpl;

-import org.onap.optf.cmso.service.rs.CMSOOptimizerCallbackImpl;

-import org.onap.optf.cmso.service.rs.CMSOServiceImpl;

+import org.onap.optf.cmso.service.rs.CmsoOptimizerCallbackImpl;

+import org.onap.optf.cmso.service.rs.CmsoServiceImpl;

 import org.onap.optf.cmso.service.rs.HealthCheckImpl;

 import org.onap.optf.cmso.test.loopback.SchedulerTestLoopbackServiceImpl;

 import org.onap.optf.cmso.test.loopback.TicketMgtLoopbackServiceImpl;

@@ -75,8 +75,8 @@ public class JerseyConfiguration extends ResourceConfig {
 

     @Autowired

     public JerseyConfiguration( /* LogRequestFilter lrf */ ) {

-        register(CMSOServiceImpl.class);

-        register(CMSOOptimizerCallbackImpl.class);

+        register(CmsoServiceImpl.class);

+        register(CmsoOptimizerCallbackImpl.class);

         register(SchedulerTestLoopbackServiceImpl.class);

         register(TicketMgtLoopbackServiceImpl.class);

         register(HealthCheckImpl.class);

@@ -89,7 +89,7 @@ public class JerseyConfiguration extends ResourceConfig {
 

         // TODO: Examine which logging features to enable

         register(new LoggingFeature(log));

-        register(CMSOContainerFilters.class);

+        register(CmsoContainerFilters.class);

     }

 

     @Bean

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthorizationFilter.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthorizationFilter.java
index 25a1e77..f3b36f5 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthorizationFilter.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthorizationFilter.java
@@ -1,32 +1,40 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ * 
  * 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
- *
+ * 
+ *         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=========================================================
- */
+ * 
+ * 
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *         https://creativecommons.org/licenses/by/4.0/
+ * 
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ ******************************************************************************/
 package org.onap.optf.cmso.aaf;
 
 import java.io.IOException;
 import java.util.List;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.onap.aaf.cadi.CadiWrap;
 import org.onap.aaf.cadi.Permission;
 import org.onap.observations.Observation;
@@ -39,53 +47,46 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 /**
- * AAF authorization filter
+ * AAF authorization filter.
  */
 
 @Component
 @Profile(SpringProfiles.AAF_AUTHENTICATION)
-public class AafAuthorizationFilter extends  OrderedRequestContextFilter {
+public class AafAuthorizationFilter extends OrderedRequestContextFilter {
 
-	@Autowired
-	AafUserRoleProperties userRoleProperties;
-	
+    @Autowired
+    AafUserRoleProperties userRoleProperties;
+
+    /**
+     * Instantiates a new aaf authorization filter.
+     */
     public AafAuthorizationFilter() {
         this.setOrder(FilterPriority.AAF_AUTHORIZATION.getPriority());
 
-    	
+
     }
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws IOException, ServletException {
-    	try
-    	{
-	        if (request instanceof CadiWrap)
-	        {
-	        	CadiWrap cw = (CadiWrap)request;
-	        	List<Permission> perms = cw.getPermissions(cw.getUserPrincipal());
-	        	if (userRoleProperties.processPermissions(request, perms))
-	        	{
-	        		filterChain.doFilter(request,response);
-	        	}
-	        	else
-	        	{
-	            	Observation.report(LogMessages.UNAUTHORIZED);
-	        		ResponseFormatter.errorResponse(request, response, 
-	            		new CMSException(LogMessages.UNAUTHORIZED.getStatus(), 
-	            		LogMessages.UNAUTHORIZED, ""));
-		        }
-	        }
-	        else
-	        {
-	        	throw new Exception();
-	        }
-    	}
-    	catch (Exception e)
-    	{
-        	Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.getMessage());
-    		ResponseFormatter.errorResponse(request, response, 
-            		new CMSException(LogMessages.UNAUTHORIZED.getStatus(), 
-            		LogMessages.UNAUTHORIZED, ""));
-    	}
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+                    throws IOException, ServletException {
+        try {
+            if (request instanceof CadiWrap) {
+                CadiWrap cw = (CadiWrap) request;
+                List<Permission> perms = cw.getPermissions(cw.getUserPrincipal());
+                if (userRoleProperties.processPermissions(request, perms)) {
+                    filterChain.doFilter(request, response);
+                } else {
+                    Observation.report(LogMessages.UNAUTHORIZED);
+                    ResponseFormatter.errorResponse(request, response, new CMSException(
+                                    LogMessages.UNAUTHORIZED.getStatus(), LogMessages.UNAUTHORIZED, ""));
+                }
+            } else {
+                throw new Exception();
+            }
+        } catch (Exception e) {
+            Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.getMessage());
+            ResponseFormatter.errorResponse(request, response,
+                            new CMSException(LogMessages.UNAUTHORIZED.getStatus(), LogMessages.UNAUTHORIZED, ""));
+        }
     }
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafFilter.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafFilter.java
index 1bdebdd..586822f 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafFilter.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafFilter.java
@@ -1,33 +1,41 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ *
  * 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
+ *         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.onap.optf.cmso.aaf;
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ ******************************************************************************/
 
+package org.onap.optf.cmso.aaf;
 
 import java.io.IOException;
 import java.util.Properties;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.filter.CadiFilter;
 import org.onap.observations.Observation;
@@ -40,7 +48,7 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 /**
- * AAF authentication filter
+ * AAF authentication filter.
  */
 
 @Component
@@ -49,6 +57,12 @@ public class AafFilter extends OrderedRequestContextFilter {
 
     private final CadiFilter cadiFilter;
 
+    /**
+     * Instantiates a new aaf filter.
+     *
+     * @throws IOException Signals that an I/O exception has occurred.
+     * @throws ServletException the servlet exception
+     */
     public AafFilter() throws IOException, ServletException {
         Properties cadiProperties = new Properties();
         cadiProperties.load(Application.class.getClassLoader().getResourceAsStream("cadi.properties"));
@@ -57,13 +71,13 @@ public class AafFilter extends OrderedRequestContextFilter {
     }
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws IOException, ServletException {
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+                    throws IOException, ServletException {
         cadiFilter.doFilter(request, response, filterChain);
-        if(response.getStatus() ==401){
-        	Observation.report(LogMessages.UNAUTHENTICATED);
-            ResponseFormatter.errorResponse(request, response, 
-            		new CMSException(LogMessages.UNAUTHENTICATED.getStatus(), 
-            		LogMessages.UNAUTHENTICATED, ""));
+        if (response.getStatus() == 401) {
+            Observation.report(LogMessages.UNAUTHENTICATED);
+            ResponseFormatter.errorResponse(request, response,
+                            new CMSException(LogMessages.UNAUTHENTICATED.getStatus(), LogMessages.UNAUTHENTICATED, ""));
         }
     }
 
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafPerm.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafPerm.java
index ea9d324..db58156 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafPerm.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafPerm.java
@@ -1,78 +1,137 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 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
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ *
+ * 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.
+ *
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
  *
- * 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
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation 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.onap.optf.cmso.aaf;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import org.onap.aaf.cadi.aaf.AAFPermission;
 
 
-public class AafPerm 
-{
-	private String type;
-	private String instance;
-	private String action;
-	private Set<String> actions = new HashSet<>();
-	
-	public String getAction() {
-		return action;
-	}
-	public void setAction(String action) {
-		this.action = action;
-		String list[] = action.split(",");
-		for (String a : list)
-			actions.add(a);
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getInstance() {
-		return instance;
-	}
-	public void setInstance(String instance) {
-		this.instance = instance;
-	}
-	
-	public Set<String> getActions() {
-		return actions;
-	}
-	public void setActions(Set<String> actions) {
-		this.actions = actions;
-	}
-	public boolean matches(AAFPermission userPerm)
-	{
-		if (type.equals(userPerm.getType()))
-		{
-			if (userPerm.getInstance().equals("*") || instance.equals("*") || userPerm.getInstance().equals(instance))
-			{
-				for (String userAction : userPerm.getAction().split(","))
-				{
-					if (userAction.equals("*") || actions.contains("*") || actions.contains(userAction))
-						return true;
-				}
-			}
-		}
-		return false;
-	}
+/**
+ * The Class AafPerm.
+ */
+public class AafPerm {
+    private String type;
+    private String instance;
+    private String action;
+    private Set<String> actions = new HashSet<>();
+
+    /**
+     * Gets the action.
+     *
+     * @return the action
+     */
+    public String getAction() {
+        return action;
+    }
+
+    /**
+     * Sets the action.
+     *
+     * @param action the new action
+     */
+    public void setAction(String action) {
+        this.action = action;
+        String[] list = action.split(",");
+        for (String a : list) {
+            actions.add(a);
+        }
+    }
+
+    /**
+     * Gets the type.
+     *
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type.
+     *
+     * @param type the new type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Gets the single instance of AafPerm.
+     *
+     * @return single instance of AafPerm
+     */
+    public String getInstance() {
+        return instance;
+    }
+
+    /**
+     * Sets the instance.
+     *
+     * @param instance the new instance
+     */
+    public void setInstance(String instance) {
+        this.instance = instance;
+    }
+
+    /**
+     * Gets the actions.
+     *
+     * @return the actions
+     */
+    public Set<String> getActions() {
+        return actions;
+    }
+
+    /**
+     * Sets the actions.
+     *
+     * @param actions the new actions
+     */
+    public void setActions(Set<String> actions) {
+        this.actions = actions;
+    }
+
+    /**
+     * Matches.
+     *
+     * @param userPerm the user perm
+     * @return true, if successful
+     */
+    public boolean matches(AAFPermission userPerm) {
+        if (type.equals(userPerm.getType())) {
+            if (userPerm.getInstance().equals("*") || instance.equals("*") || userPerm.getInstance().equals(instance)) {
+                for (String userAction : userPerm.getAction().split(",")) {
+                    if (userAction.equals("*") || actions.contains("*") || actions.contains(userAction)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafSecurityConfig.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafSecurityConfig.java
index cb00a90..068e6c3 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafSecurityConfig.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafSecurityConfig.java
@@ -1,32 +1,33 @@
 /*
  * Copyright © 2019 AT&T Intellectual Property.
- * 
+ *
  * 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.
- * 
- * 
+ *
+ *
  * Unless otherwise specified, all documentation contained herein is licensed
  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *         https://creativecommons.org/licenses/by/4.0/
- * 
+ *
  * Unless required by applicable law or agreed to in writing, documentation
  * 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.
 */
+
 package org.onap.optf.cmso.aaf;
 
 import org.onap.optf.cmso.SpringProfiles;
@@ -43,17 +44,17 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 @ComponentScan("org.onap.optf")
 @Profile(SpringProfiles.AAF_AUTHENTICATION)
 public class AafSecurityConfig extends WebSecurityConfigurerAdapter {
-  
- 
+
+
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-  
+
     }
- 
+
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-    	
+
         http.csrf().disable();
-        
+
     }
 }
\ No newline at end of file
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRole.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRole.java
index 762cf3c..f9351b2 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRole.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRole.java
@@ -1,127 +1,177 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 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
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * https://creativecommons.org/licenses/by/4.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
+ * Unless required by applicable law or agreed to in writing, documentation 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.onap.optf.cmso.aaf;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AafUserRole 
-{
-	private String url = "";
-	private String pathParts[] = {};
-	private String perm  = "";
-	private String method = "";
-	private List<AafPerm>  aafPerms = new ArrayList<>(); 
-	
-	public AafUserRole(String url, String perm)
-	{
-		this.setUrl(url);
-		this.setPerm(perm);
-		pathParts = url.split("\\/");
-		
-		String[] perms = perm.split(",");
-		for (String p : perms)
-		{
-			String parts[] = p.split(" ");
-			if (parts.length == 2)
-				method = parts[1];
-			else
-				method = "ALL";
-			
-			String[] list = parts[0].split("\\|");
-			if (list.length == 3)
-			{
-				AafPerm aafPerm = new AafPerm();
-				aafPerm.setAction(list[2]);
-				aafPerm.setInstance(list[1]);
-				aafPerm.setType(list[0]);
-				aafPerms.add(aafPerm);
-			}
-		}
-	}
-	public String getUrl() {
-		return url;
-	}
-	public void setUrl(String url) {
-		this.url = url;
-	}
-	public String getPerm() {
-		return perm;
-	}
-	public void setPerm(String perm) {
-		this.perm = perm;
-	}
-	public List<AafPerm> getAafPerms() {
-		return aafPerms;
-	}
-	public void setAafPerms(List<AafPerm> aafPerms) {
-		this.aafPerms = aafPerms;
-	}
-
-	public boolean matches(String path, String matchMethod)
-	{
-		if (!this.method.equalsIgnoreCase("ALL") 
-			&& !this.method.equals("*")
-			&& !this.method.equals(matchMethod))
-			return false;
-		List<String> inNodes = new ArrayList<>();
-		List<String> matchNodes = new ArrayList<>();
-		String[] pathList = path.split("\\/");
-		for (String n : pathList)
-		{
-			inNodes.add(n);
-		}
-		for (String n : pathParts)
-		{
-			matchNodes.add(n);
-		}
-		
-		while (!inNodes.isEmpty() && !matchNodes.isEmpty())
-		{
-			String inNode = inNodes.remove(0);
-			String matchNode = matchNodes.get(0);
-			if (matchNode.equals(inNode) || matchNode.equals("*"))
-			{
-				matchNodes.remove(0);
-			}
-			else
-			{	
-				if (!matchNode.equals("**"))
-				{
-					return false;
-				}
-			}
-		}
-		
-		// 
-		if (inNodes.isEmpty() && matchNodes.isEmpty())
-			return true;
-		
-		// We have incoming nodes remaining, see if we can wildcard them
-		if (matchNodes.size() == 1)
-		{
-			if (matchNodes.get(0).equals("**"))
-				return true;
-			if (inNodes.size() == 1 && matchNodes.get(0).equals("*"))
-				return true;
-		}
-		return false;
-	}
+/**
+ * The Class AafUserRole.
+ */
+public class AafUserRole {
+    private String url = "";
+    private String pathParts[] = {};
+    private String perm = "";
+    private String method = "";
+    private List<AafPerm> aafPerms = new ArrayList<>();
+
+    /**
+     * Instantiates a new aaf user role.
+     *
+     * @param url the url
+     * @param perm the perm
+     */
+    public AafUserRole(String url, String perm) {
+        this.setUrl(url);
+        this.setPerm(perm);
+        pathParts = url.split("\\/");
+
+        String[] perms = perm.split(",");
+        for (String p : perms) {
+            String[] parts = p.split(" ");
+            if (parts.length == 2) {
+                method = parts[1];
+            }
+            else {
+                method = "ALL";
+            }
+
+            String[] list = parts[0].split("\\|");
+            if (list.length == 3) {
+                AafPerm aafPerm = new AafPerm();
+                aafPerm.setAction(list[2]);
+                aafPerm.setInstance(list[1]);
+                aafPerm.setType(list[0]);
+                aafPerms.add(aafPerm);
+            }
+        }
+    }
+
+    /**
+     * Gets the url.
+     *
+     * @return the url
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Sets the url.
+     *
+     * @param url the new url
+     */
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * Gets the perm.
+     *
+     * @return the perm
+     */
+    public String getPerm() {
+        return perm;
+    }
+
+    /**
+     * Sets the perm.
+     *
+     * @param perm the new perm
+     */
+    public void setPerm(String perm) {
+        this.perm = perm;
+    }
+
+    /**
+     * Gets the aaf perms.
+     *
+     * @return the aaf perms
+     */
+    public List<AafPerm> getAafPerms() {
+        return aafPerms;
+    }
+
+    /**
+     * Sets the aaf perms.
+     *
+     * @param aafPerms the new aaf perms
+     */
+    public void setAafPerms(List<AafPerm> aafPerms) {
+        this.aafPerms = aafPerms;
+    }
+
+    /**
+     * Matches.
+     *
+     * @param path the path
+     * @param matchMethod the match method
+     * @return true, if successful
+     */
+    public boolean matches(String path, String matchMethod) {
+        if (!this.method.equalsIgnoreCase("ALL") && !this.method.equals("*") && !this.method.equals(matchMethod)) {
+            return false;
+        }
+        List<String> inNodes = new ArrayList<>();
+        List<String> matchNodes = new ArrayList<>();
+        String[] pathList = path.split("\\/");
+        for (String n : pathList) {
+            inNodes.add(n);
+        }
+        for (String n : pathParts) {
+            matchNodes.add(n);
+        }
+
+        while (!inNodes.isEmpty() && !matchNodes.isEmpty()) {
+            String inNode = inNodes.remove(0);
+            String matchNode = matchNodes.get(0);
+            if (matchNode.equals(inNode) || matchNode.equals("*")) {
+                matchNodes.remove(0);
+            } else {
+                if (!matchNode.equals("**")) {
+                    return false;
+                }
+            }
+        }
+
+        //
+        if (inNodes.isEmpty() && matchNodes.isEmpty()) {
+            return true;
+        }
+
+        // We have incoming nodes remaining, see if we can wildcard them
+        if (matchNodes.size() == 1) {
+            if (matchNodes.get(0).equals("**")) {
+                return true;
+            }
+            if (inNodes.size() == 1 && matchNodes.get(0).equals("*")) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRoleProperties.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRoleProperties.java
index 7a7598d..d9a419d 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRoleProperties.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafUserRoleProperties.java
@@ -1,33 +1,43 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ *
  * 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
+ *         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=========================================================
- */
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ ******************************************************************************/
+
 package org.onap.optf.cmso.aaf;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
-
 import org.onap.aaf.cadi.Permission;
 import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.observations.Observation;
@@ -38,91 +48,92 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 /**
- * 
- * This class uses a properties file to map URL patterns/method to AAF Permissions (AafPerm)
+ * This class uses a properties file to map URL patterns/method to AAF Permissions (AafPerm).
+ *
  * @author jf9860
  *
  */
 @Component
 @Profile(SpringProfiles.AAF_AUTHENTICATION)
-public class AafUserRoleProperties 
-{
-	@Autowired
-	Environment env;
-	
-	private List<AafUserRole> list = new ArrayList<>();
-	
-	@PostConstruct
-	public void initializePermissions()
-	{
-		String userRolePropertiesName = env.getProperty("aaf.user.roles", "src/main/resources/aaf/AAFUserRoles.properties");
-		Properties props = new Properties();
-		try
-		{
-			props.load(new FileInputStream(new File(userRolePropertiesName)));
-		}
-		catch (Exception e)
-		{
-			Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.getMessage());
-		}
-		for (Object url : props.keySet())
-		{
-			Object value = props.get(url);
-			list.add(new AafUserRole((String)url, (String)value));
-		}
-	}
+public class AafUserRoleProperties {
+    @Autowired
+    Environment env;
+
+    private List<AafUserRole> list = new ArrayList<>();
+
+    /**
+     * Initialize permissions.
+     */
+    @PostConstruct
+    public void initializePermissions() {
+        String userRolePropertiesName =
+                        env.getProperty("aaf.user.roles", "src/main/resources/aaf/AAFUserRoles.properties");
+        Properties props = new Properties();
+        try {
+            props.load(new FileInputStream(new File(userRolePropertiesName)));
+        } catch (Exception e) {
+            Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.getMessage());
+        }
+        for (Object url : props.keySet()) {
+            Object value = props.get(url);
+            list.add(new AafUserRole((String) url, (String) value));
+        }
+    }
+
+    /**
+     * Gets the for url method.
+     *
+     * @param url the url
+     * @param method the method
+     * @return the for url method
+     */
+    public List<AafUserRole> getForUrlMethod(String url, String method) {
+        List<AafUserRole> userRoleList = new ArrayList<>();
+        for (AafUserRole aur : list) {
+            if (aur.matches(url, method)) {
+                userRoleList.add(aur);
+            }
+        }
+        return userRoleList;
+    }
 
-	public List<AafUserRole> getForUrlMethod(String url, String method)
-	{
-		List<AafUserRole> userRoleList = new ArrayList<>();
-		for (AafUserRole aur : list)
-		{
-			if (aur.matches(url, method))
-			{
-				userRoleList.add(aur);
-			}
-		}
-		return userRoleList;
-	}
+    /**
+     * Process permissions.
+     *
+     * @param request the request
+     * @param userPerms the user perms
+     * @return true, if successful
+     */
+    public boolean processPermissions(HttpServletRequest request, List<Permission> userPerms) {
+        try {
+            // Get list of perms that match incoming URL. May be more than 1...
+            // Users perms must match all that match URL
+            List<AafUserRole> perms = getForUrlMethod(request.getRequestURI(), request.getMethod());
+            int tested = 0;
+            int passed = 0;
+            for (AafUserRole perm : perms) {
+                for (AafPerm test : perm.getAafPerms()) {
+                    tested++;
+                    for (Permission userPerm : userPerms) {
 
-	public boolean processPermissions(HttpServletRequest request, List<Permission> userPerms) 
-	{
-		try
-		{
-			// Get list of perms that match incoming URL. May be more than 1...
-			// Users perms must match all that match URL
-			List<AafUserRole> perms = getForUrlMethod(request.getRequestURI(), request.getMethod());
-			ObjectMapper om = new ObjectMapper();
-			int tested = 0;
-			int passed = 0;
-			for (AafUserRole perm : perms)
-			{
-				for (AafPerm test : perm.getAafPerms())
-				{
-					tested++;
-					for (Permission userPerm: userPerms)
-					{
-						
-						if (test.matches((AAFPermission)userPerm))
-						{
-							passed++;
-							break;
-						}
-					}
-				}
-			}
-			// All permissions must be OK
-			if (tested > 0 && tested == passed)
-				return true;
-			else
-				return false;
-		}
-		catch (Exception e) 
-		{
-			Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.getMessage());
-		}
-		return false;
-	}
+                        if (test.matches((AAFPermission) userPerm)) {
+                            passed++;
+                            break;
+                        }
+                    }
+                }
+            }
+            // All permissions must be OK
+            if (tested > 0 && tested == passed) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        } catch (Exception e) {
+            Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.getMessage());
+        }
+        return false;
+    }
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/FilterPriority.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/FilterPriority.java
index 39981c7..e973a4f 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/FilterPriority.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/FilterPriority.java
@@ -1,35 +1,46 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ *
  * 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
+ *         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=========================================================
- */
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ ******************************************************************************/
+
 package org.onap.optf.cmso.aaf;
 
 import org.springframework.core.Ordered;
 
 public enum FilterPriority {
-    AAF_AUTHENTICATION(Ordered.HIGHEST_PRECEDENCE),
-    AAF_AUTHORIZATION(Ordered.HIGHEST_PRECEDENCE + 1); //higher number = lower priority
-
+    AAF_AUTHENTICATION(Ordered.HIGHEST_PRECEDENCE), AAF_AUTHORIZATION(Ordered.HIGHEST_PRECEDENCE + 1);
     private final int priority;
 
-    FilterPriority(final int p) {
-        priority = p;
+    FilterPriority(final int ppri) {
+        priority = ppri;
     }
 
-    public int getPriority() { return priority; }
+    public int getPriority() {
+        return priority;
+    }
 }
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/ResponseFormatter.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/ResponseFormatter.java
index 769262b..e7ddcdf 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/ResponseFormatter.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/ResponseFormatter.java
@@ -1,38 +1,45 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.optf.cmso
- * ================================================================================
- * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*******************************************************************************
+ * Copyright © 2019 AT&T Intellectual Property.
+ *
  * 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
+ *         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=========================================================
- */
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+ ******************************************************************************/
+
 package org.onap.optf.cmso.aaf;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.MediaType;
-
 import org.onap.optf.cmso.common.exceptions.CMSException;
 
 class ResponseFormatter {
 
-    private static final String ACCEPT_HEADER = "accept";
 
-    static void errorResponse(HttpServletRequest request, HttpServletResponse response, CMSException error) throws IOException {
-        String accept = request.getHeader(ACCEPT_HEADER) == null ? MediaType.APPLICATION_JSON : request.getHeader(ACCEPT_HEADER);
+    static void errorResponse(HttpServletRequest request, HttpServletResponse response, CMSException error)
+                    throws IOException {
         response.setStatus(error.getStatus().getStatusCode());
         response.getWriter().write(error.getRequestError().toString());
         response.getWriter().flush();
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalStatusEnum.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalStatusEnum.java
index 0069f26..db48437 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalStatusEnum.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalStatusEnum.java
@@ -1,36 +1,34 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright � 2017-2018 AT&T Intellectual Property. Modifications Copyright � 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.common;

 

+/**

+ * The Enum ApprovalStatusEnum.

+ */

 public enum ApprovalStatusEnum {

     Accepted("Accepted"), Rejected("Rejected"),;

 

@@ -40,6 +38,12 @@ public enum ApprovalStatusEnum {
         this.text = text;

     }

 

+    /**

+     * To string.

+     *

+     * @return the string

+     */

+    @Override

     public String toString() {

         return text;

     }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalTypesEnum.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalTypesEnum.java
index 927dbf1..97e33d5 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalTypesEnum.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/ApprovalTypesEnum.java
@@ -1,33 +1,28 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright � 2017-2018 AT&T Intellectual Property. Modifications Copyright � 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.common;

 

@@ -40,6 +35,7 @@ public enum ApprovalTypesEnum {
         this.text = text;

     }

 

+    @Override

     public String toString() {

         return text;

     }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/CMSStatusEnum.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/CMSStatusEnum.java
index de1e701..5b0a539 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/CMSStatusEnum.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/CMSStatusEnum.java
@@ -1,102 +1,95 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * 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.

-*/

+ */

 

 package org.onap.optf.cmso.common;

 

 public enum CMSStatusEnum {

-    PendingSchedule("Pending Schedule",

-            "Schedule request as been accepted. Pending determination of recommended schedule."), SchedulingFailed(

-                    "Scheduling Failed", "Failed to determine recommended schedule."), ScheduleFailed("Schedule Failed",

-                            "Determination of recommended schedule failed."), OptimizationInProgress(

-                                    "Optimization In Progress",

-                                    "Determination of recommended schedule is in progress."), PendingApproval(

-                                            "Pending Approval",

-                                            "Pending approval of the recommended schedule."), OptimizationFailed(

-                                                    "Optimization Failed",

-                                                    "Unable to determine recommended schedule."), Accepted("Accepted",

-                                                            "Recommended schedule has been accepted."), Scheduled(

-                                                                    "Scheduled",

-                                                                    "All approvals received. Recommended schedule is pending execution."), ScheduledImmediate(

-                                                                            "Scheduled Immediate",

-                                                                            "All approvals received. Event is scheduled for immediate execution."), Triggered(

-                                                                                    "Triggered",

-                                                                                    "Scheduled event has been triggered."), ApprovalRejected(

-                                                                                            "Approval Rejected",

-                                                                                            "Recommended schedule has been rejected."), PastDue(

-                                                                                                    "Past due",

-                                                                                                    "Scheduled event time has passed. Queued event was not dispatched."), Error(

-                                                                                                            "Error",

-                                                                                                            "Attempt to displatch event failed."), Failed(

-                                                                                                                    "Failed",

-                                                                                                                    "Triggered event reported a failure."), Rejected(

-                                                                                                                            "Rejected",

-                                                                                                                            "Recommended schedule has been rejected."), NotificationsInitiated(

-                                                                                                                                    "Notifications Initiated",

-                                                                                                                                    "Notifications of scheduled events has been initiated."), Completed(

-                                                                                                                                            "Completed",

-                                                                                                                                            "Notification of all scheduled events have been sent."), CompletedWithError(

-                                                                                                                                                    "Completed with error(s)",

-                                                                                                                                                    "All scheduled events have completed, some with errors."), Deleted(

-                                                                                                                                                            "Deleted",

-                                                                                                                                                            "Schedule deleted prior to acceptance or after execution."), Cancelled(

-                                                                                                                                                                    "Cancelled",

-                                                                                                                                                                    "Scheduled event cancelled before execution."),;

+  PendingSchedule(

+      "Pending Schedule",

+      "Schedule request as been accepted. Pending determination of recommended schedule."),

+  SchedulingFailed("Scheduling Failed", "Failed to determine recommended schedule."),

+  ScheduleFailed("Schedule Failed", "Determination of recommended schedule failed."),

+  OptimizationInProgress(

+      "Optimization In Progress", "Determination of recommended schedule is in progress."),

+  PendingApproval("Pending Approval", "Pending approval of the recommended schedule."),

+  OptimizationFailed("Optimization Failed", "Unable to determine recommended schedule."),

+  Accepted("Accepted", "Recommended schedule has been accepted."),

+  Scheduled("Scheduled", "All approvals received. Recommended schedule is pending execution."),

+  ScheduledImmediate(

+      "Scheduled Immediate", "All approvals received. Event is scheduled for immediate execution."),

+  Triggered("Triggered", "Scheduled event has been triggered."),

+  ApprovalRejected("Approval Rejected", "Recommended schedule has been rejected."),

+  PastDue("Past due", "Scheduled event time has passed. Queued event was not dispatched."),

+  Error("Error", "Attempt to displatch event failed."),

+  Failed("Failed", "Triggered event reported a failure."),

+  Rejected("Rejected", "Recommended schedule has been rejected."),

+  NotificationsInitiated(

+      "Notifications Initiated", "Notifications of scheduled events has been initiated."),

+  Completed("Completed", "Notification of all scheduled events have been sent."),

+  CompletedWithError(

+      "Completed with error(s)", "All scheduled events have completed, some with errors."),

+  Deleted("Deleted", "Schedule deleted prior to acceptance or after execution."),

+  Cancelled("Cancelled", "Scheduled event cancelled before execution."),

+  NotScheduled("Not scheduled by optimizer", "Element not included in the schedule by optimizer."),

+  ;

 

-    private final String text;

-    private final String description;

+  private final String text;

+  private final String description;

 

-    private CMSStatusEnum(String text, String description) {

-        this.text = text;

-        this.description = description;

-    }

+  private CMSStatusEnum(String text, String description) {

+    this.text = text;

+    this.description = description;

+  }

 

-    public String toString() {

-        return text;

-    }

+  @Override

+  public String toString() {

+    return text;

+  }

 

-    public CMSStatusEnum fromString(String text) {

-        for (CMSStatusEnum e : CMSStatusEnum.values())

-            if (e.text.equals(text))

-                return e;

-        return null;

-    }

-

-    // To include in the AID.

-    public static void main(String argv[]) {

-        StringBuilder sb = new StringBuilder();

-        sb.append("<html><body><table border=\"1\">\n");

-        for (CMSStatusEnum v : CMSStatusEnum.values())

-            sb.append("<tr><td>").append(v.text).append("</td><td>").append(v.description).append("</td></tr>\n");

-        sb.append("</table></body></html>\n");

-        System.out.println(sb.toString());

-    }

+  public CMSStatusEnum fromString(String text) {

+    for (CMSStatusEnum e : CMSStatusEnum.values()) if (e.text.equals(text)) return e;

+    return null;

+  }

 

+  // To include in the AID.

+  public static void main(String argv[]) {

+    StringBuilder sb = new StringBuilder();

+    sb.append("<html><body><table border=\"1\">\n");

+    for (CMSStatusEnum v : CMSStatusEnum.values())

+      sb.append("<tr><td>")

+          .append(v.text)

+          .append("</td><td>")

+          .append(v.description)

+          .append("</td></tr>\n");

+    sb.append("</table></body></html>\n");

+    System.out.println(sb.toString());

+  }

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java
index 832acb7..c5ff7f0 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java
@@ -1,27 +1,27 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -33,12 +33,13 @@ package org.onap.optf.cmso.common;
 

 import java.util.List;

 import org.onap.optf.cmso.model.DomainData;

+import org.onap.optf.cmso.model.ElementData;

 import org.onap.optf.cmso.model.Schedule;

 import org.onap.optf.cmso.service.rs.models.CmDomainDataEnum;

 

 /**

  * Collection of commann static helper methods for CHangeManagement

- * 

+ *

  * @author jf9860

  *

  */

@@ -56,4 +57,16 @@ public class CmHelpers {
         return null;

     }

 

+  public static String getEventData(Schedule schedule, CmDomainDataEnum key) {

+      return getDomainData(schedule.getDomainData(), key);

+  }

+

+  public static String getElementData(List<ElementData> eventData, CmDomainDataEnum key) {

+      for (ElementData map : eventData) {

+          if (map.getName().equals(key.toString()))

+              return map.getValue();

+      }

+      return null;

+  }

+

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
index efb4dd0..3fd6cc8 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
@@ -1,237 +1,315 @@
 /*

- * Copyright © 2017-2019 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright © 2017-2019 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.common;

 

+import com.att.eelf.configuration.EELFManager;

+import com.att.eelf.i18n.EELFResourceManager;

 import java.io.IOException;

 import java.nio.file.Files;

 import java.nio.file.Paths;

-

 import javax.ws.rs.core.Response.Status;

-

 import org.apache.log4j.Level;

 import org.onap.observations.ObservationInterface;

 

-import com.att.eelf.configuration.EELFManager;

-import com.att.eelf.i18n.EELFResourceManager;

-

+/**

+ * The Enum LogMessages.

+ */

 public enum LogMessages implements ObservationInterface {

 

-	SEARCH_SCHEDULE_REQUEST_DETAILS("Search Schedule Request Details {0} from {1}: {2}", Status.OK, Level.INFO),

-	SEARCH_SCHEDULE_REQUEST("Search Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	CREATE_SCHEDULE_REQUEST("Create Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	DELETE_SCHEDULE_REQUEST("Delete Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	GET_SCHEDULE_REQUEST_INFO("Get Schedule Request Info {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	PROCESS_OPTIMIZER_CALLBACK("Change management optimizer callback {0} from {1}: {2} ", Status.OK, Level.INFO),

-	APPROVE_SCHEDULE_REQUEST("Approve Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	SCHEDULE_ALREADY_EXISTS("Schedule already exists domain={0} schedule id={1}", Status.OK, Level.INFO),

-	SCHEDULE_NOT_FOUND("Schedule not found domain={0} schedule id={1}", Status.BAD_REQUEST, Level.INFO),

-	INVALID_ATTRIBUTE("Invalid attribute {0}={1}", Status.BAD_REQUEST, Level.INFO),

-	MISSING_REQUIRED_ATTRIBUTE("Missing required attribute '{0}'", Status.BAD_REQUEST, Level.INFO),

-	INVALID_REQUEST("The input data structure is incorrect", Status.BAD_REQUEST, Level.INFO),

-	REQUEST_TIMED_OUT("Request timed out.", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	UNEXPECTED_EXCEPTION("Unexpected exception encountered during processing. Please contact support : {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	UNDEFINED_DOMAIN_DATA_ATTRIBUTE("Domain data attribute not defined domain={0} name={1} value={2}", Status.BAD_REQUEST, Level.INFO),

-	UNDEFINED_FILTER_ATTRIBUTE("Undefined filter attribute {0}", Status.BAD_REQUEST, Level.INFO),

-	INVALID_DATE_FILTER("Invalid date filter provided {0}=(1}", Status.BAD_REQUEST, Level.INFO),

-	OPTIMIZER_QUARTZ_JOB("Quartz scheduling of OptimizerQuartzJob: {0}", Status.OK, Level.INFO),

-	OPTIMIZER_EXCEPTION("Exception making client call to optimizer {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	OPTIMIZER_CALLBACK_STATE_ERROR("Optimizer callback on schedule in invalid state. Should be {0} but was {1}.", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	CHANGE_MANAGEMENT_GROUP_NOT_FOUND("ChangeManagementGroup not found on optimizer callback scheduleId={0} groupId={1}", Status.NOT_FOUND, Level.INFO),

-	INCOMING_MESSAGE("Incoming message method={0} path={1}", Status.OK, Level.INFO, true, false),

-	INCOMING_MESSAGE_RESPONSE("Message response method={0} path={1} status={2}", Status.OK, Level.INFO, true, false),

-	OUTGOING_MESSAGE("Outgoing message method={0} path={1}", Status.OK, Level.INFO, true, false),

-	OUTGOING_MESSAGE_RETURNED("Outgoing message returned method={0} path={1} status={2}", Status.OK, Level.INFO, true, false),

-

-    // TODO: Review the status and level of the remaining enums	

-	UNABLE_TO_ALLOCATE_VNF_TIMESLOTS("Unable to allocate VNF timeslots with Optimizer results startTime={0}, latestStartTime={1}, totalDuration={2}, concurrency={3} nvfs={4}", Status.OK, Level.INFO),

-	UNABLE_TO_LOCATE_SCHEDULE_DETAIL("Unable to locate ChangeManagementSchedule for VNF. scheduleId={0}, groupId={1}, vnfName={2}", Status.OK, Level.INFO),

-	CM_JOB("Quartz scheduling of CmJob: {0}", Status.OK, Level.INFO),

-	CM_QUARTZ_JOB("Quartz scheduling of CmQuartzJob: {0}", Status.OK, Level.INFO),

-	NOT_PENDING_APPROVAL("Approval request received for schedule that is not in Pending Approval state: domain={0} scheduleId={1} state={3}", Status.OK, Level.INFO),

-	SCHEDULE_PAST_DUE("Attempt to dispatch an event that is Past due scheduleId={0}, vnf={1}, now={2}, startTime={3}", Status.OK, Level.INFO),

-	MSO_POLLING_MISSING_SCHEDULE("Attempt to poll MSO for request id {1} for missing ChangeManagementSchedule id={0}", Status.OK, Level.INFO),

-	MSO_STATUS_JOB("Polling MSO {0} for requestId={1} for id={2}", Status.OK, Level.INFO),

-	UNEXPECTED_RESPONSE("Unexpected response from {0} HTTP Status={1} : {2}", Status.OK, Level.INFO),

-	SCHEDULE_STATUS_JOB("Quartz scheduling of ScheduleStatusJob: {0}", Status.OK, Level.INFO),

-	CM_TICKET_NOT_APPROVED("Attempt to dispatch a change management event that has no TM Ticket approved. scheduleId={0} VNF Name={1} TM ChangeId={2} Status={3} Approval Status={4}", Status.OK, Level.INFO),

-	MULTIPLE_GROUPS_NOT_SUPPORTED("Multiple groups not supported on immediate requests", Status.OK, Level.INFO),

-	TM_CREATE_CHANGE_RECORD("TM Create Change Record:{0} : Schedule ID: {1}", Status.OK, Level.INFO),

-	TM_LIST("TM list:{0} : URL : {1}", Status.OK, Level.INFO),

-	TM_API("TM API Call: URL : {0}", Status.OK, Level.INFO),

-	UNABLE_TO_CREATE_CHANGE_TICKET("Unable to create change ticket in TM: Schedule ID: {0} : Reason : {1}", Status.OK, Level.INFO),

-	TM_UPDATE_CHECKLIST("TM Fetch Checklist:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK, Level.INFO),

-	OPTIMIZER_REQUEST("Optimi Request:{0} : Schedule ID: {1} : URL : {2}", Status.OK, Level.INFO),

-	TM_CLOSE_CHANGE_RECORD("TM Close Change Record:{0} : Schedule ID: {1} : Change Id : {2}", Status.OK, Level.INFO),

-	UNABLE_TO_CLOSE_CHANGE_TICKET("Unable to close change ticket in TM:  Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK, Level.INFO),

-	CANNOT_CANCEL_IN_PROGRESS("Cannot delete/cancel a schedule with events in progress.", Status.OK, Level.INFO),

-	UNABLE_TO_PARSE_SCHEDULING_INFO("Cannot parse scheduling info.", Status.OK, Level.INFO),

-	UNABLE_TO_LOCATE_CHANGE_RECORD("Unable to locate TM change record {2} to check status before displacth of {1} for schedulId={0}", Status.OK, Level.INFO),

-	INVALID_CHANGE_WINDOW("Change window end time {1} must be after start time {0}", Status.OK, Level.INFO),

-	NODE_LIST_CONTAINS_EMTPY_NODE("vnfDetails node list contains at least one empty node.", Status.OK, Level.INFO),

-	SO_API("SO Poll Request {0}", Status.OK, Level.INFO),

-	EXPECTED_EXCEPTION("Expected exception encountered during processing. {0}", Status.OK, Level.INFO),

-	TM_UPDATE_CHANGE_RECORD("TM Update Change Record:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK, Level.INFO),

-	UNABLE_TO_UPDATE_CHANGE_TICKET("Unable to update change ticket in TM: Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK, Level.INFO),

-	UNAUTHORIZED("Authorization failed.", Status.FORBIDDEN, Level.INFO),

-	UNAUTHENTICATED("Authentication failed.", Status.UNAUTHORIZED, Level.INFO), 

-	UNRECOGNIZED_MSO_STATUS("Unrecognized status returned by MSO {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	UNABLE_TO_PARSE_MSO_RESPONSE("Unable to parse status message from MSO {0} : {1}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	;

-	private final String defaultId;

-	private final String defaultMessage;

-	private final String defaultResolution;

-	private final String defaultAction;

-

-	private final Status status;

-	private final Level level;

-	private final Boolean audit;

-	private final Boolean metric;

-

-	

-	private LogMessages(String message, Status code, Level l)

-	{

-		defaultMessage = message;

-		level=l;

-		status = code;

-		this.defaultId = this.name();

-		this.defaultResolution = "No resolution needed";

-		this.defaultAction = "No action is required";

-		this.audit = false;

-		this.metric = false;

-	}

-

-	private LogMessages(String message, Status code, Level l, Boolean audit, Boolean metric)

-	{

-		defaultMessage = message;

-		level=l;

-		status = code;

-		this.audit = audit;

-		this.metric = metric;

-		this.defaultId = this.name();

-		this.defaultResolution = "No resolution needed";

-		this.defaultAction = "No action is required";

-	}

-	

-	private LogMessages(String message, Status code, Level l, String id, String resolution, String action)

-	{

-		level=l;

-		status = code;

-		defaultMessage = message;

-		this.defaultId = id;

-		this.defaultResolution = resolution;

-		this.defaultAction = action;

-		this.audit = false;

-		this.metric = false;

-	}

-	

-	static {

-		EELFResourceManager.loadMessageBundle("logmessages");

-	}

-	

-	public String genProperties()

-	{

-		// Use this to regenerate properties file. The desire to change messages without updating code is

-		// well understood, but the developer should be able to code the defaults without having to update 2 different files and 

-		// get it wrong. 

-		StringBuilder sb = new StringBuilder();

-		sb.append("# Generated from ").append(this.getClass().getName()).append("\n");

-		for (LogMessages lm : values())

-		{

-			sb.append(lm.name());

-			sb.append(" ").append(lm.defaultId);

-			sb.append("|").append(lm.defaultMessage);

-			sb.append("|").append(lm.defaultResolution);

-			sb.append("|").append(lm.defaultAction);

-			sb.append("\n");

-		}

-		return sb.toString();

-	}

-

-	

-	// interface methods

-	@Override

-	public Level getLevel() {return level;}

-	@Override

-	public String getMessage() {return defaultMessage;}

-	@Override

-	public Status getStatus() {return status;}

-	@Override

-	public Enum<?> getValue() {return this;}

-	@Override

-	public String getDomain() {return this.getClass().getSimpleName();}

-	@Override

-	public Boolean getAudit() { return audit; }

-	@Override

-	public Boolean getMetric() { return metric; }

-	

-	public static void main(String argv[])

-	{

-		System.out.println(LogMessages.UNEXPECTED_EXCEPTION.genProperties());

-		try 

-		{

-			Files.write(Paths.get("src/main/resources/logmessages.properties"), LogMessages.UNEXPECTED_EXCEPTION.genProperties().getBytes());

-		} 

-		catch (IOException e) 

-		{

-			EELFManager.getInstance().getDebugLogger().debug("Failed to update properties file.", e);

-

-		}

-		StringBuilder sb = new StringBuilder();

-		sb.append("<html><body><h1>Cell Site Selection Scheduler mS Observations</h1>\n<table border=\"1\">\n<tr>");

-		sb.append("<td>Code</td> ");

-		sb.append("<td>Log Level</td> ");

-		sb.append("<td>Message</td> ");

-		sb.append("</tr>\n");

-		for (LogMessages m : LogMessages.values())

-		{

-			if (m.level == Level.ERROR || m.level == Level.WARN || m.level == Level.FATAL)

-			{

-				sb.append("<tr>");

-				sb.append("<td>").append(m.name()).append("</td> ");

-				sb.append("<td>").append(m.level).append("</td> ");

-				sb.append("<td>").append(m.defaultMessage).append("</td> ");

-				sb.append("</tr>\n");

-			}

-		}

-		try 

-		{

-			Files.write(Paths.get("logmessages.html"), sb.toString().getBytes());

-		} 

-		catch (IOException e) 

-		{

-			EELFManager.getInstance().getDebugLogger().debug("Failed to update properties html file.", e);

-

-		}

-				

-	}

+    SEARCH_SCHEDULE_REQUEST_DETAILS("Search Schedule Request Details {0} from {1}: {2}", Status.OK, Level.INFO),

+    SEARCH_SCHEDULE_REQUEST("Search Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    CREATE_SCHEDULE_REQUEST("Create Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    DELETE_SCHEDULE_REQUEST("Delete Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    GET_SCHEDULE_REQUEST_INFO("Get Schedule Request Info {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    PROCESS_OPTIMIZER_CALLBACK("Change management optimizer callback {0} from {1}: {2} ", Status.OK, Level.INFO),

+    APPROVE_SCHEDULE_REQUEST("Approve Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    SCHEDULE_ALREADY_EXISTS("Schedule already exists domain={0} schedule id={1}", Status.OK, Level.INFO),

+    SCHEDULE_NOT_FOUND("Schedule not found domain={0} schedule id={1}", Status.BAD_REQUEST, Level.INFO),

+    INVALID_ATTRIBUTE("Invalid attribute {0}={1}", Status.BAD_REQUEST, Level.INFO),

+    MISSING_REQUIRED_ATTRIBUTE("Missing required attribute '{0}'", Status.BAD_REQUEST, Level.INFO),

+    INVALID_REQUEST("The input data structure is incorrect", Status.BAD_REQUEST, Level.INFO),

+    REQUEST_TIMED_OUT("Request timed out.", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    UNEXPECTED_EXCEPTION("Unexpected exception encountered during processing. Please contact support : {0}",

+                    Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    UNDEFINED_DOMAIN_DATA_ATTRIBUTE("Domain data attribute not defined domain={0} name={1} value={2}",

+                    Status.BAD_REQUEST, Level.INFO),

+    UNDEFINED_FILTER_ATTRIBUTE("Undefined filter attribute {0}", Status.BAD_REQUEST, Level.INFO),

+    INVALID_DATE_FILTER("Invalid date filter provided {0}=(1}", Status.BAD_REQUEST, Level.INFO),

+    OPTIMIZER_QUARTZ_JOB("Quartz scheduling of OptimizerQuartzJob: {0}", Status.OK, Level.INFO),

+    OPTIMIZER_EXCEPTION("Exception making client call to optimizer {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    OPTIMIZER_CALLBACK_STATE_ERROR("Optimizer callback on schedule in invalid state. Should be {0} but was {1}.",

+                    Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    CHANGE_MANAGEMENT_GROUP_NOT_FOUND(

+                    "ChangeManagementGroup not found on optimizer callback scheduleId={0} groupId={1}",

+                    Status.NOT_FOUND, Level.INFO),

+    INCOMING_MESSAGE("Incoming message method={0} path={1}", Status.OK, Level.INFO, true, false),

+    INCOMING_MESSAGE_RESPONSE("Message response method={0} path={1} status={2}", Status.OK, Level.INFO, true, false),

+    OUTGOING_MESSAGE("Outgoing message method={0} path={1}", Status.OK, Level.INFO, true, false),

+    OUTGOING_MESSAGE_RETURNED("Outgoing message returned method={0} path={1} status={2}", Status.OK, Level.INFO, true,

+                    false),

+

+    // TODO: Review the status and level of the remaining enums

+    UNABLE_TO_ALLOCATE_VNF_TIMESLOTS(

+                    "Unable to allocate VNF timeslots with Optimizer results startTime={0},"

+                    + " latestStartTime={1}, totalDuration={2}, concurrency={3} nvfs={4}",

+                    Status.OK, Level.INFO),

+    UNABLE_TO_LOCATE_SCHEDULE_DETAIL(

+                    "Unable to locate ChangeManagementSchedule for VNF. scheduleId={0}, groupId={1}, vnfName={2}",

+                    Status.OK, Level.INFO),

+    CM_JOB("Quartz scheduling of CmJob: {0}", Status.OK, Level.INFO),

+    CM_QUARTZ_JOB("Quartz scheduling of CmQuartzJob: {0}", Status.OK, Level.INFO),

+    NOT_PENDING_APPROVAL(

+                    "Approval request received for schedule that is not in Pending Approval state:"

+                    + " domain={0} scheduleId={1} state={3}",

+                    Status.OK, Level.INFO),

+    SCHEDULE_PAST_DUE("Attempt to dispatch an event that is Past due scheduleId={0}, vnf={1}, now={2}, startTime={3}",

+                    Status.OK, Level.INFO),

+    MSO_POLLING_MISSING_SCHEDULE("Attempt to poll MSO for request id {1} for missing ChangeManagementSchedule id={0}",

+                    Status.OK, Level.INFO),

+    MSO_STATUS_JOB("Polling MSO {0} for requestId={1} for id={2}", Status.OK, Level.INFO),

+    UNEXPECTED_RESPONSE("Unexpected response from {0} HTTP Status={1} : {2}", Status.OK, Level.INFO),

+    SCHEDULE_STATUS_JOB("Quartz scheduling of ScheduleStatusJob: {0}", Status.OK, Level.INFO),

+    CM_TICKET_NOT_APPROVED(

+                    "Attempt to dispatch a change management event that has no TM Ticket approved."

+                    + "scheduleId={0} VNF Name={1} TM ChangeId={2} Status={3} Approval Status={4}",

+                    Status.OK, Level.INFO),

+    MULTIPLE_GROUPS_NOT_SUPPORTED("Multiple groups not supported on immediate requests", Status.OK, Level.INFO),

+    TM_CREATE_CHANGE_RECORD("TM Create Change Record:{0} : Schedule ID: {1}", Status.OK, Level.INFO),

+    TM_LIST("TM list:{0} : URL : {1}", Status.OK, Level.INFO),

+    TM_API("TM API Call: URL : {0}", Status.OK, Level.INFO),

+    UNABLE_TO_CREATE_CHANGE_TICKET("Unable to create change ticket in TM: Schedule ID: {0} : Reason : {1}", Status.OK,

+                    Level.INFO),

+    TM_UPDATE_CHECKLIST("TM Fetch Checklist:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK,

+                    Level.INFO),

+    OPTIMIZER_REQUEST("Optimi Request:{0} : Schedule ID: {1} : URL : {2}", Status.OK, Level.INFO),

+    TM_CLOSE_CHANGE_RECORD("TM Close Change Record:{0} : Schedule ID: {1} : Change Id : {2}", Status.OK, Level.INFO),

+    UNABLE_TO_CLOSE_CHANGE_TICKET(

+                    "Unable to close change ticket in TM:  Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK,

+                    Level.INFO),

+    CANNOT_CANCEL_IN_PROGRESS("Cannot delete/cancel a schedule with events in progress.", Status.OK, Level.INFO),

+    UNABLE_TO_PARSE_SCHEDULING_INFO("Cannot parse scheduling info.", Status.OK, Level.INFO),

+    UNABLE_TO_LOCATE_CHANGE_RECORD(

+                    "Unable to locate TM change record {2} to check status before displacth of {1} for schedulId={0}",

+                    Status.OK, Level.INFO),

+    INVALID_CHANGE_WINDOW("Change window end time {1} must be after start time {0}", Status.OK, Level.INFO),

+    NODE_LIST_CONTAINS_EMTPY_NODE("vnfDetails node list contains at least one empty node.", Status.OK, Level.INFO),

+    SO_API("SO Poll Request {0}", Status.OK, Level.INFO),

+    EXPECTED_EXCEPTION("Expected exception encountered during processing. {0}", Status.OK, Level.INFO),

+    TM_UPDATE_CHANGE_RECORD("TM Update Change Record:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK,

+                    Level.INFO),

+    UNABLE_TO_UPDATE_CHANGE_TICKET(

+                    "Unable to update change ticket in TM: Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK,

+                    Level.INFO),

+    UNAUTHORIZED("Authorization failed.", Status.FORBIDDEN, Level.INFO),

+    UNAUTHENTICATED("Authentication failed.", Status.UNAUTHORIZED, Level.INFO),

+    UNRECOGNIZED_MSO_STATUS("Unrecognized status returned by MSO {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    UNABLE_TO_PARSE_MSO_RESPONSE("Unable to parse status message from MSO {0} : {1}", Status.INTERNAL_SERVER_ERROR,

+                    Level.ERROR),

+    MISSING_VALID_GROUP_FOR_ELEMENT("Element {0} returned by optimizer has invalid group id",

+                    Status.INTERNAL_SERVER_ERROR, Level.ERROR),;

+    private final String defaultId;

+    private final String defaultMessage;

+    private final String defaultResolution;

+    private final String defaultAction;

+

+    private final Status status;

+    private final Level level;

+    private final Boolean audit;

+    private final Boolean metric;

+

+

+    private LogMessages(String message, Status code, Level lev) {

+        defaultMessage         = message;

+        level                  = lev;

+        status                 = code;

+        this.defaultId         = this.name();

+        this.defaultResolution = "No resolution needed";

+        this.defaultAction     = "No action is required";

+        this.audit             = false;

+        this.metric            = false;

+    }

+

+    private LogMessages(String message, Status code, Level lev, Boolean audit, Boolean metric) {

+        defaultMessage         = message;

+        level                  = lev;

+        status                 = code;

+        this.audit             = audit;

+        this.metric            = metric;

+        this.defaultId         = this.name();

+        this.defaultResolution = "No resolution needed";

+        this.defaultAction     = "No action is required";

+    }

+

+    private LogMessages(String message, Status code, Level lev, String id, String resolution, String action) {

+        level                  = lev;

+        status                 = code;

+        defaultMessage         = message;

+        this.defaultId         = id;

+        this.defaultResolution = resolution;

+        this.defaultAction     = action;

+        this.audit             = false;

+        this.metric            = false;

+    }

+

+    static {

+        EELFResourceManager.loadMessageBundle("logmessages");

+    }

+

+    /**

+     * Gen properties.

+     *

+     * @return the string

+     */

+    public String genProperties() {

+        // Use this to regenerate properties file. The desire to change messages without updating code is

+        // well understood, but the developer should be able to code the defaults without having to update 2

+        // different files and

+        // get it wrong.

+        StringBuilder sb = new StringBuilder();

+        sb.append("# Generated from ").append(this.getClass().getName()).append("\n");

+        for (LogMessages lm : values()) {

+            sb.append(lm.name());

+            sb.append(" ").append(lm.defaultId);

+            sb.append("|").append(lm.defaultMessage);

+            sb.append("|").append(lm.defaultResolution);

+            sb.append("|").append(lm.defaultAction);

+            sb.append("\n");

+        }

+        return sb.toString();

+    }

+

+

+    /**

+     * Gets the level.

+     *

+     * @return the level

+     */

+    // interface methods

+    @Override

+    public Level getLevel() {

+        return level;

+    }

+

+    /**

+     * Gets the message.

+     *

+     * @return the message

+     */

+    @Override

+    public String getMessage() {

+        return defaultMessage;

+    }

+

+    /**

+     * Gets the status.

+     *

+     * @return the status

+     */

+    @Override

+    public Status getStatus() {

+        return status;

+    }

+

+    /**

+     * Gets the value.

+     *

+     * @return the value

+     */

+    @Override

+    public Enum<?> getValue() {

+        return this;

+    }

+

+    /**

+     * Gets the domain.

+     *

+     * @return the domain

+     */

+    @Override

+    public String getDomain() {

+        return this.getClass().getSimpleName();

+    }

+

+    /**

+     * Gets the audit.

+     *

+     * @return the audit

+     */

+    @Override

+    public Boolean getAudit() {

+        return audit;

+    }

+

+    /**

+     * Gets the metric.

+     *

+     * @return the metric

+     */

+    @Override

+    public Boolean getMetric() {

+        return metric;

+    }

+

+    /**

+     * The main method.

+     *

+     * @param argv the arguments

+     */

+    public static void main(String[] argv) {

+        System.out.println(LogMessages.UNEXPECTED_EXCEPTION.genProperties());

+        try {

+            Files.write(Paths.get("src/main/resources/logmessages.properties"),

+                            LogMessages.UNEXPECTED_EXCEPTION.genProperties().getBytes());

+        } catch (IOException e) {

+            EELFManager.getInstance().getDebugLogger().debug("Failed to update properties file.", e);

+

+        }

+        StringBuilder sb = new StringBuilder();

+        sb.append("<html><body><h1>Cell Site Selection Scheduler mS Observations</h1>\n<table border=\"1\">\n<tr>");

+        sb.append("<td>Code</td> ");

+        sb.append("<td>Log Level</td> ");

+        sb.append("<td>Message</td> ");

+        sb.append("</tr>\n");

+        for (LogMessages m : LogMessages.values()) {

+            if (m.level == Level.ERROR || m.level == Level.WARN || m.level == Level.FATAL) {

+                sb.append("<tr>");

+                sb.append("<td>").append(m.name()).append("</td> ");

+                sb.append("<td>").append(m.level).append("</td> ");

+                sb.append("<td>").append(m.defaultMessage).append("</td> ");

+                sb.append("</tr>\n");

+            }

+        }

+        try {

+            Files.write(Paths.get("logmessages.html"), sb.toString().getBytes());

+        } catch (IOException e) {

+            EELFManager.getInstance().getDebugLogger().debug("Failed to update properties html file.", e);

+

+        }

+

+    }

 

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java
index 19927ad..d726107 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java
@@ -1,27 +1,27 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -31,6 +31,10 @@
 

 package org.onap.optf.cmso.dispatcher;

 

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

+import com.fasterxml.jackson.databind.JsonNode;

+import com.fasterxml.jackson.databind.ObjectMapper;

 import javax.ws.rs.ProcessingException;

 import javax.ws.rs.client.Client;

 import javax.ws.rs.client.ClientBuilder;

@@ -42,16 +46,14 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;

 import org.onap.optf.cmso.common.BasicAuthenticatorFilter;

 import org.onap.optf.cmso.common.CMSStatusEnum;

-import org.onap.optf.cmso.common.CmHelpers;

 import org.onap.optf.cmso.common.LogMessages;

 import org.onap.optf.cmso.common.PropertiesManagement;

-import org.onap.optf.cmso.filters.CMSOClientFilters;

+import org.onap.optf.cmso.filters.CmsoClientFilters;

 import org.onap.optf.cmso.model.ChangeManagementSchedule;

 import org.onap.optf.cmso.model.Schedule;

 import org.onap.optf.cmso.model.dao.ChangeManagementGroupDAO;

 import org.onap.optf.cmso.model.dao.ChangeManagementScheduleDAO;

 import org.onap.optf.cmso.model.dao.ScheduleDAO;

-import org.onap.optf.cmso.service.rs.models.CmDomainDataEnum;

 import org.onap.optf.cmso.ticketmgt.TmClient;

 import org.onap.optf.cmso.wf.bean.WfChangeManagementResponse;

 import org.onap.optf.cmso.wf.bean.WfVidCmResponse;

@@ -60,10 +62,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;

 import org.springframework.stereotype.Component;

 import org.springframework.transaction.annotation.Transactional;

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-import com.fasterxml.jackson.databind.JsonNode;

-import com.fasterxml.jackson.databind.ObjectMapper;

 

 @Component

 public class CMSOClient {

@@ -81,6 +79,7 @@ public class CMSOClient {
     @Autowired

     ScheduleDAO scheduleDAO;

 

+

     @Autowired

     Environment env;

 

@@ -97,13 +96,13 @@ public class CMSOClient {
             if (!url.endsWith("/"))

                 url += "/";

             url = url + "schedule/" + cmSchedule.getVnfName();

-            String callbackData = CmHelpers.getDomainData(schedule, CmDomainDataEnum.CallbackData);

+            String callbackData = cmSchedule.getRequest();

             String user = env.getProperty("so.user", "");

             String pass = pm.getProperty("so.pass", "");

             Client client = ClientBuilder.newClient();

             if (!user.equals(""))

                 client.register(new BasicAuthenticatorFilter(user, pass));

-            client.register(new CMSOClientFilters());

+            client.register(new CmsoClientFilters());

             WebTarget target = client.target(url);

             ObjectMapper om = new ObjectMapper();

             JsonNode jsonEntity = om.readTree(callbackData);

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java
index f29d6c6..8766eee 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java
@@ -46,7 +46,7 @@ import org.onap.optf.cmso.common.BasicAuthenticatorFilter;
 import org.onap.optf.cmso.common.LogMessages;

 import org.onap.optf.cmso.common.PropertiesManagement;

 import org.onap.optf.cmso.eventq.DispatchedEventList;

-import org.onap.optf.cmso.filters.CMSOClientFilters;

+import org.onap.optf.cmso.filters.CmsoClientFilters;

 import org.onap.optf.cmso.model.dao.ChangeManagementGroupDAO;

 import org.onap.optf.cmso.model.dao.ChangeManagementScheduleDAO;

 import org.onap.optf.cmso.model.dao.ScheduleDAO;

@@ -126,7 +126,7 @@ public class CmJob implements Job {
             String pass = pm.getProperty("mechid.pass", "");

             Client client = ClientBuilder.newClient();

             client.register(new BasicAuthenticatorFilter(user, pass));

-			client.register(new CMSOClientFilters());

+			client.register(new CmsoClientFilters());

             WebTarget target = client.target(url);

             Invocation.Builder invocationBuilder = target.request(MediaType.APPLICATION_JSON);

             Response response = null;

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java
index feea350..92bb3f3 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java
@@ -1,27 +1,27 @@
 /*

  * Copyright © 2017-2019 AT&T Intellectual Property.

  * Modifications Copyright © 2018 IBM.

- * 

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -31,24 +31,21 @@
 

 package org.onap.optf.cmso.dispatcher.rs;

 

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 import java.util.UUID;

-

 import javax.servlet.http.HttpServletRequest;

 import javax.ws.rs.core.Response;

 import javax.ws.rs.core.UriInfo;

-

 import org.onap.optf.cmso.common.LogMessages;

 import org.onap.optf.cmso.dispatcher.DispatchJob;

-import org.onap.optf.cmso.optimizer.CMSOptimizerClient;

+import org.onap.optf.cmso.optimizer.CmsoOptimizerClient;

 import org.onap.optf.cmso.sostatus.MsoStatusClient;

 import org.onap.optf.cmso.ticketmgt.TmStatusClient;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Controller;

 import org.springframework.transaction.annotation.Transactional;

 

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-

 @Controller

 public class DispatcherServiceImpl implements DispacherService {

     private static EELFLogger log = EELFManager.getInstance().getLogger(DispatcherServiceImpl.class);

@@ -60,7 +57,7 @@ public class DispatcherServiceImpl implements DispacherService {
     DispatchJob dispatchJob;

 

     @Autowired

-    CMSOptimizerClient optimizerClient;

+    CmsoOptimizerClient optimizerClient;

 

     @Autowired

     TmStatusClient tmStatusClient;

@@ -95,7 +92,7 @@ public class DispatcherServiceImpl implements DispacherService {
             debug.error(e.getMessage(), e);

         }

         Response response = Response.ok().build();

-        audit.info("dispatchSNIRO");

+        audit.info("dispatchOptimizer");

         return response;

     }

 

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CMSOClientFilters.java b/cmso-service/src/main/java/org/onap/optf/cmso/filters/CMSOClientFilters.java
deleted file mode 100644
index 5e29607..0000000
--- a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CMSOClientFilters.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- * Copyright © 2017-2019 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

-

-package org.onap.optf.cmso.filters;

-

-import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;

-

-import java.io.IOException;

-

-import javax.ws.rs.client.ClientRequestContext;

-import javax.ws.rs.client.ClientRequestFilter;

-import javax.ws.rs.client.ClientResponseContext;

-import javax.ws.rs.client.ClientResponseFilter;

-import javax.ws.rs.core.MultivaluedMap;

-

-import org.onap.observations.Mdc;

-import org.onap.observations.Observation;

-import org.onap.optf.cmso.common.LogMessages;

-import org.onap.optf.cmso.filters.MessageHeaders.HeadersEnum;

-import org.onap.optf.cmso.service.rs.CMSOServiceImpl;

-import org.slf4j.MDC;

-import org.springframework.stereotype.Component;

-

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-

-// @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")

-@Component

-public class CMSOClientFilters implements ClientRequestFilter, ClientResponseFilter {

-

-    private static EELFLogger log = EELFManager.getInstance().getLogger(CMSOServiceImpl.class);

-    private static String appId = "cmso";

-

-    @Override

-    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {

-		// On the way back

-		Mdc.metricEnd(responseContext);

-		Mdc.setCaller(17);

-		Observation.report(LogMessages.OUTGOING_MESSAGE_RETURNED, 

-				requestContext.getMethod(),

-				requestContext.getUri().getPath().toString(),

-				responseContext.getStatusInfo().toString());

-    }

-

-    @Override

-    public void filter(ClientRequestContext requestContext) throws IOException {

-		// On the way out 

-		Mdc.metricStart(requestContext);

-		Mdc.setCaller(17);

-		Observation.report(LogMessages.OUTGOING_MESSAGE, 

-				requestContext.getMethod(),

-				requestContext.getUri().getPath().toString());

-        MultivaluedMap<String, Object> headers = requestContext.getHeaders();

-

-        String transactionId = (String) headers.getFirst(MessageHeaders.HeadersEnum.TransactionID.toString());

-        String mdcId = MDC.get(MDC_KEY_REQUEST_ID);

-        if (transactionId == null || transactionId.equals(""))

-            if (mdcId != null)

-                headers.add(HeadersEnum.TransactionID.toString(), mdcId);

-        headers.add(HeadersEnum.FromAppID.toString(), appId);

-    }

-

-}

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementDetail.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementDetail.java
index 4f0e804..304eb03 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementDetail.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementDetail.java
@@ -1,52 +1,46 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import io.swagger.annotations.ApiModel;

+import io.swagger.annotations.ApiModelProperty;

 import java.util.UUID;

-

 import javax.persistence.Column;

 import javax.persistence.Entity;

 import javax.persistence.Id;

 import javax.persistence.Lob;

 import javax.persistence.Transient;

-

 import org.joda.time.format.ISODateTimeFormat;

 

-import com.fasterxml.jackson.annotation.JsonIgnore;

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-import io.swagger.annotations.ApiModel;

-import io.swagger.annotations.ApiModelProperty;

-

+/**

+ * The Class ChangeManagementDetail.

+ */

 @Entity

 

 // @NamedNativeQueries({

@@ -58,7 +52,7 @@ import io.swagger.annotations.ApiModelProperty;
 // ),

 // })

 @ApiModel(value = "Change Management Details",

-        description = "VNF information  returned for Change Management Schedule Search request")

+                description = "VNF information  returned for Change Management Schedule Search request")

 public class ChangeManagementDetail {

     @Id

     @JsonIgnore

@@ -93,7 +87,9 @@ public class ChangeManagementDetail {
     private Long startTimeMillis;

 

     @ApiModelProperty(

-            value = "Start time of this VNF workflow assigned by Scheduler based upon the group start time returned by the optimizer and concurrency.")

+                    value = "Start time of this VNF workflow"

+                                    + " assigned by Scheduler based upon the"

+                                    + " group start time returned by the optimizer and concurrency.")

     @JsonProperty

     @Transient

     private String startTime;

@@ -173,216 +169,479 @@ public class ChangeManagementDetail {
     @Column(name = "schedules_uuid")

     private UUID schedulesUuid;

 

+    /**

+     * Gets the vnf name.

+     *

+     * @return the vnf name

+     */

     public String getVnfName() {

         return vnfName;

     }

 

+    /**

+     * Sets the vnf name.

+     *

+     * @param vnfName the new vnf name

+     */

     public void setVnfName(String vnfName) {

         this.vnfName = vnfName;

     }

 

+    /**

+     * Gets the vnf id.

+     *

+     * @return the vnf id

+     */

     public String getVnfId() {

         return vnfId;

     }

 

+    /**

+     * Sets the vnf id.

+     *

+     * @param vnfId the new vnf id

+     */

     public void setVnfId(String vnfId) {

         this.vnfId = vnfId;

     }

 

+    /**

+     * Gets the status.

+     *

+     * @return the status

+     */

     public String getStatus() {

         return status;

     }

 

+    /**

+     * Sets the status.

+     *

+     * @param status the new status

+     */

     public void setStatus(String status) {

         this.status = status;

     }

 

+    /**

+     * Gets the tm change id.

+     *

+     * @return the tm change id

+     */

     public String getTmChangeId() {

         return tmChangeId;

     }

 

+    /**

+     * Sets the tm change id.

+     *

+     * @param tmChangeId the new tm change id

+     */

     public void setTmChangeId(String tmChangeId) {

         this.tmChangeId = tmChangeId;

     }

 

+    /**

+     * Gets the start time.

+     *

+     * @return the start time

+     */

     public String getStartTime() {

         if (startTimeMillis != null)

             return ISODateTimeFormat.dateTimeNoMillis().print(startTimeMillis);

         return null;

     }

 

+    /**

+     * Sets the start time.

+     *

+     * @param startTime the new start time

+     */

     public void setStartTime(String startTime) {}

 

+    /**

+     * Gets the finish time.

+     *

+     * @return the finish time

+     */

     public String getFinishTime() {

         if (finishTimeMillis != null)

             return ISODateTimeFormat.dateTimeNoMillis().print(finishTimeMillis);

         return null;

     }

 

+    /**

+     * Sets the finish time.

+     *

+     * @param finishTime the new finish time

+     */

     public void setFinishTime(String finishTime) {}

 

+    /**

+     * Gets the group id.

+     *

+     * @return the group id

+     */

     public String getGroupId() {

         return groupId;

     }

 

+    /**

+     * Sets the group id.

+     *

+     * @param groupId the new group id

+     */

     public void setGroupId(String groupId) {

         this.groupId = groupId;

     }

 

+    /**

+     * Gets the last instance start time.

+     *

+     * @return the last instance start time

+     */

     public String getLastInstanceStartTime() {

-        if (lastInstanceStartTimeMillis != null)

+        if (lastInstanceStartTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(lastInstanceStartTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the last instance start time.

+     *

+     * @param lastInstanceStartTime the new last instance start time

+     */

     public void setLastInstanceStartTime(String lastInstanceStartTime) {}

 

+    /**

+     * Gets the policy id.

+     *

+     * @return the policy id

+     */

     public String getPolicyId() {

         return policyId;

     }

 

+    /**

+     * Sets the policy id.

+     *

+     * @param policyId the new policy id

+     */

     public void setPolicyId(String policyId) {

         this.policyId = policyId;

     }

 

 

+    /**

+     * Gets the uuid.

+     *

+     * @return the uuid

+     */

     public UUID getUuid() {

-		return uuid;

-	}

-

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+        return uuid;

+    }

 

+    /**

+     * Sets the uuid.

+     *

+     * @param uuid the new uuid

+     */

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

 

 

-	public UUID getSchedulesUuid() {

-		return schedulesUuid;

-	}

+    /**

+     * Gets the schedules uuid.

+     *

+     * @return the schedules uuid

+     */

+    public UUID getSchedulesUuid() {

+        return schedulesUuid;

+    }

 

-	public void setSchedulesUuid(UUID schedulesUuid) {

-		this.schedulesUuid = schedulesUuid;

-	}

+    /**

+     * Sets the schedules uuid.

+     *

+     * @param schedulesUuid the new schedules uuid

+     */

+    public void setSchedulesUuid(UUID schedulesUuid) {

+        this.schedulesUuid = schedulesUuid;

+    }

 

-	public Long getStartTimeMillis() {

+    /**

+     * Gets the start time millis.

+     *

+     * @return the start time millis

+     */

+    public Long getStartTimeMillis() {

         return startTimeMillis;

     }

 

+    /**

+     * Sets the start time millis.

+     *

+     * @param startTimeMillis the new start time millis

+     */

     public void setStartTimeMillis(Long startTimeMillis) {

         this.startTimeMillis = startTimeMillis;

     }

 

+    /**

+     * Gets the finish time millis.

+     *

+     * @return the finish time millis

+     */

     public Long getFinishTimeMillis() {

         return finishTimeMillis;

     }

 

+    /**

+     * Sets the finish time millis.

+     *

+     * @param finishTimeMillis the new finish time millis

+     */

     public void setFinishTimeMillis(Long finishTimeMillis) {

         this.finishTimeMillis = finishTimeMillis;

     }

 

+    /**

+     * Gets the last instance start time millis.

+     *

+     * @return the last instance start time millis

+     */

     public Long getLastInstanceStartTimeMillis() {

         return lastInstanceStartTimeMillis;

     }

 

+    /**

+     * Sets the last instance start time millis.

+     *

+     * @param lastInstanceStartTimeMillis the new last instance start time millis

+     */

     public void setLastInstanceStartTimeMillis(Long lastInstanceStartTimeMillis) {

         this.lastInstanceStartTimeMillis = lastInstanceStartTimeMillis;

     }

 

+    /**

+     * Gets the tm status.

+     *

+     * @return the tm status

+     */

     public String getTmStatus() {

         return tmStatus;

     }

 

+    /**

+     * Sets the tm status.

+     *

+     * @param tmStatus the new tm status

+     */

     public void setTmStatus(String tmStatus) {

         this.tmStatus = tmStatus;

     }

 

+    /**

+     * Gets the tm approval status.

+     *

+     * @return the tm approval status

+     */

     public String getTmApprovalStatus() {

         return tmApprovalStatus;

     }

 

+    /**

+     * Sets the tm approval status.

+     *

+     * @param tmApprovalStatus the new tm approval status

+     */

     public void setTmApprovalStatus(String tmApprovalStatus) {

         this.tmApprovalStatus = tmApprovalStatus;

     }

 

+    /**

+     * Gets the mso request id.

+     *

+     * @return the mso request id

+     */

     public String getMsoRequestId() {

         return msoRequestId;

     }

 

+    /**

+     * Sets the mso request id.

+     *

+     * @param msoRequestId the new mso request id

+     */

     public void setMsoRequestId(String msoRequestId) {

         this.msoRequestId = msoRequestId;

     }

 

+    /**

+     * Gets the mso status.

+     *

+     * @return the mso status

+     */

     public String getMsoStatus() {

         return msoStatus;

     }

 

+    /**

+     * Sets the mso status.

+     *

+     * @param msoStatus the new mso status

+     */

     public void setMsoStatus(String msoStatus) {

         this.msoStatus = msoStatus;

     }

 

+    /**

+     * Gets the mso message.

+     *

+     * @return the mso message

+     */

     public String getMsoMessage() {

         return msoMessage;

     }

 

+    /**

+     * Sets the mso message.

+     *

+     * @param msoMessage the new mso message

+     */

     public void setMsoMessage(String msoMessage) {

         this.msoMessage = msoMessage;

     }

 

+    /**

+     * Gets the dispatch time millis.

+     *

+     * @return the dispatch time millis

+     */

     public Long getDispatchTimeMillis() {

         return dispatchTimeMillis;

     }

 

+    /**

+     * Sets the dispatch time millis.

+     *

+     * @param dispatchTimeMillis the new dispatch time millis

+     */

     public void setDispatchTimeMillis(Long dispatchTimeMillis) {

         this.dispatchTimeMillis = dispatchTimeMillis;

     }

 

+    /**

+     * Gets the dispatch time.

+     *

+     * @return the dispatch time

+     */

     public String getDispatchTime() {

-        if (dispatchTimeMillis != null)

+        if (dispatchTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(dispatchTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the dispatch time.

+     *

+     * @param dispatchTime the new dispatch time

+     */

     public void setDispatchTime(String dispatchTime) {}

 

+    /**

+     * Gets the execution completed time millis.

+     *

+     * @return the execution completed time millis

+     */

     public Long getExecutionCompletedTimeMillis() {

         return executionCompletedTimeMillis;

     }

 

+    /**

+     * Sets the execution completed time millis.

+     *

+     * @param executionCompletedTimeMillis the new execution completed time millis

+     */

     public void setExecutionCompletedTimeMillis(Long executionCompletedTimeMillis) {

         this.executionCompletedTimeMillis = executionCompletedTimeMillis;

     }

 

+    /**

+     * Gets the execution completed time.

+     *

+     * @return the execution completed time

+     */

     public String getExecutionCompletedTime() {

-        if (executionCompletedTimeMillis != null)

+        if (executionCompletedTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(executionCompletedTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the execution completed time.

+     *

+     * @param executionCompletedTime the new execution completed time

+     */

     public void setExecutionCompletedTime(String executionCompletedTime) {}

 

+    /**

+     * Gets the status message.

+     *

+     * @return the status message

+     */

     public String getStatusMessage() {

         return statusMessage;

     }

 

+    /**

+     * Sets the status message.

+     *

+     * @param statusMessage the new status message

+     */

     public void setStatusMessage(String statusMessage) {

         this.statusMessage = statusMessage;

     }

 

+    /**

+     * Gets the mso time millis.

+     *

+     * @return the mso time millis

+     */

     public Long getMsoTimeMillis() {

         return msoTimeMillis;

     }

 

+    /**

+     * Sets the mso time millis.

+     *

+     * @param msoTimeMillis the new mso time millis

+     */

     public void setMsoTimeMillis(Long msoTimeMillis) {

         this.msoTimeMillis = msoTimeMillis;

     }

 

+    /**

+     * Gets the mso time.

+     *

+     * @return the mso time

+     */

     public String getMsoTime() {

-        if (msoTimeMillis != null)

+        if (msoTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(msoTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the mso time.

+     *

+     * @param msoTime the new mso time

+     */

     public void setMsoTime(String msoTime) {}

 

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementGroup.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementGroup.java
index 39efb3f..2d4790d 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementGroup.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementGroup.java
@@ -1,58 +1,49 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import io.swagger.annotations.ApiModel;

+import io.swagger.annotations.ApiModelProperty;

 import java.io.Serializable;

 import java.util.List;

 import java.util.UUID;

-

 import javax.persistence.Column;

 import javax.persistence.Entity;

 import javax.persistence.Id;

 import javax.persistence.NamedQuery;

 import javax.persistence.Table;

 import javax.persistence.Transient;

-

 import org.joda.time.format.ISODateTimeFormat;

 

-import com.fasterxml.jackson.annotation.JsonIgnore;

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-import io.swagger.annotations.ApiModel;

-import io.swagger.annotations.ApiModelProperty;

-

 /**

  * The persistent class for the change_management_groups database table.

- * 

+ *

  */

 @Entity

 @Table(name = "CHANGE_MANAGEMENT_GROUPS")

@@ -113,7 +104,8 @@ public class ChangeManagementGroup implements Serializable {
     private Integer normalDurationInSecs;

 

     @ApiModelProperty(

-            value = "The name of the schedule optimization policy used by the change management schedule optimizer.")

+                    value = "The name of the schedule optimization policy "

+                                    + "used by the change management schedule optimizer.")

     @Column(name = "policy_id")

     private String policyId;

 

@@ -122,124 +114,270 @@ public class ChangeManagementGroup implements Serializable {
     @Transient

     private List<ChangeManagementSchedule> changeManagementSchedules;

 

+    /**

+     * Instantiates a new change management group.

+     */

     public ChangeManagementGroup() {}

 

 

+    /**

+     * Gets the finish time.

+     *

+     * @return the finish time

+     */

     public String getFinishTime() {

-        if (finishTimeMillis != null)

+        if (finishTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(this.finishTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the finish time.

+     *

+     * @param finishTime the new finish time

+     */

     public void setFinishTime(String finishTime) {}

 

+    /**

+     * Gets the group id.

+     *

+     * @return the group id

+     */

     public String getGroupId() {

         return this.groupId;

     }

 

+    /**

+     * Sets the group id.

+     *

+     * @param groupId the new group id

+     */

     public void setGroupId(String groupId) {

         this.groupId = groupId;

     }

 

+    /**

+     * Gets the last instance start time.

+     *

+     * @return the last instance start time

+     */

     public String getLastInstanceStartTime() {

-        if (lastInstanceStartTimeMillis != null)

+        if (lastInstanceStartTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(this.lastInstanceStartTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the last instance start time.

+     *

+     * @param lastInstanceStartTime the new last instance start time

+     */

     public void setLastInstanceStartTime(String lastInstanceStartTime) {}

 

+    /**

+     * Gets the start time.

+     *

+     * @return the start time

+     */

     public String getStartTime() {

-        if (startTimeMillis != null)

+        if (startTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(this.startTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the start time.

+     *

+     * @param startTime the new start time

+     */

     public void setStartTime(String startTime) {}

 

 

+    /**

+     * Gets the additional duration in secs.

+     *

+     * @return the additional duration in secs

+     */

     public Integer getAdditionalDurationInSecs() {

         return additionalDurationInSecs;

     }

 

+    /**

+     * Sets the additional duration in secs.

+     *

+     * @param additionalDurationInSecs the new additional duration in secs

+     */

     public void setAdditionalDurationInSecs(Integer additionalDurationInSecs) {

         this.additionalDurationInSecs = additionalDurationInSecs;

     }

 

+    /**

+     * Gets the concurrency limit.

+     *

+     * @return the concurrency limit

+     */

     public Integer getConcurrencyLimit() {

         return concurrencyLimit;

     }

 

+    /**

+     * Sets the concurrency limit.

+     *

+     * @param concurrencyLimit the new concurrency limit

+     */

     public void setConcurrencyLimit(Integer concurrencyLimit) {

         this.concurrencyLimit = concurrencyLimit;

     }

 

+    /**

+     * Gets the normal duration in secs.

+     *

+     * @return the normal duration in secs

+     */

     public Integer getNormalDurationInSecs() {

         return normalDurationInSecs;

     }

 

+    /**

+     * Sets the normal duration in secs.

+     *

+     * @param normalDurationInSecs the new normal duration in secs

+     */

     public void setNormalDurationInSecs(Integer normalDurationInSecs) {

         this.normalDurationInSecs = normalDurationInSecs;

     }

 

+    /**

+     * Gets the policy id.

+     *

+     * @return the policy id

+     */

     public String getPolicyId() {

         return policyId;

     }

 

+    /**

+     * Sets the policy id.

+     *

+     * @param policyId the new policy id

+     */

     public void setPolicyId(String policyId) {

         this.policyId = policyId;

     }

 

+    /**

+     * Gets the finish time millis.

+     *

+     * @return the finish time millis

+     */

     public Long getFinishTimeMillis() {

         return finishTimeMillis;

     }

 

+    /**

+     * Sets the finish time millis.

+     *

+     * @param finishTimeMillis the new finish time millis

+     */

     public void setFinishTimeMillis(Long finishTimeMillis) {

         this.finishTimeMillis = finishTimeMillis;

     }

 

+    /**

+     * Gets the last instance start time millis.

+     *

+     * @return the last instance start time millis

+     */

     public Long getLastInstanceStartTimeMillis() {

         return lastInstanceStartTimeMillis;

     }

 

+    /**

+     * Sets the last instance start time millis.

+     *

+     * @param lastInstanceStartTimeMillis the new last instance start time millis

+     */

     public void setLastInstanceStartTimeMillis(Long lastInstanceStartTimeMillis) {

         this.lastInstanceStartTimeMillis = lastInstanceStartTimeMillis;

     }

 

+    /**

+     * Gets the start time millis.

+     *

+     * @return the start time millis

+     */

     public Long getStartTimeMillis() {

         return startTimeMillis;

     }

 

+    /**

+     * Sets the start time millis.

+     *

+     * @param startTimeMillis the new start time millis

+     */

     public void setStartTimeMillis(Long startTimeMillis) {

         this.startTimeMillis = startTimeMillis;

     }

 

+    /**

+     * Gets the change management schedules.

+     *

+     * @return the change management schedules

+     */

     public List<ChangeManagementSchedule> getChangeManagementSchedules() {

         return changeManagementSchedules;

     }

 

+    /**

+     * Sets the change management schedules.

+     *

+     * @param changeManagementSchedules the new change management schedules

+     */

     public void setChangeManagementSchedules(List<ChangeManagementSchedule> changeManagementSchedules) {

         this.changeManagementSchedules = changeManagementSchedules;

     }

 

 

-	public UUID getUuid() {

-		return uuid;

-	}

+    /**

+     * Gets the uuid.

+     *

+     * @return the uuid

+     */

+    public UUID getUuid() {

+        return uuid;

+    }

 

 

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+    /**

+     * Sets the uuid.

+     *

+     * @param uuid the new uuid

+     */

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

 

-	public UUID getSchedulesUuid() {

-		return schedulesUuid;

-	}

+    /**

+     * Gets the schedules uuid.

+     *

+     * @return the schedules uuid

+     */

+    public UUID getSchedulesUuid() {

+        return schedulesUuid;

+    }

 

 

-	public void setSchedulesUuid(UUID schedulesUuid) {

-		this.schedulesUuid = schedulesUuid;

-	}

+    /**

+     * Sets the schedules uuid.

+     *

+     * @param schedulesUuid the new schedules uuid

+     */

+    public void setSchedulesUuid(UUID schedulesUuid) {

+        this.schedulesUuid = schedulesUuid;

+    }

 

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementSchedule.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementSchedule.java
index 680fc99..f9dd418 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementSchedule.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/ChangeManagementSchedule.java
@@ -1,39 +1,37 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import io.swagger.annotations.ApiModel;

+import io.swagger.annotations.ApiModelProperty;

 import java.io.Serializable;

 import java.util.UUID;

-

 import javax.persistence.Column;

 import javax.persistence.Entity;

 import javax.persistence.Id;

@@ -41,18 +39,11 @@ import javax.persistence.Lob;
 import javax.persistence.NamedQuery;

 import javax.persistence.Table;

 import javax.persistence.Transient;

-

 import org.joda.time.format.ISODateTimeFormat;

 

-import com.fasterxml.jackson.annotation.JsonIgnore;

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-import io.swagger.annotations.ApiModel;

-import io.swagger.annotations.ApiModelProperty;

-

 /**

  * The persistent class for the change_management_schedules database table.

- * 

+ *

  */

 @Entity

 @Table(name = "CHANGE_MANAGEMENT_SCHEDULES")

@@ -92,7 +83,9 @@ public class ChangeManagementSchedule implements Serializable {
     private Long startTimeMillis;

 

     @ApiModelProperty(

-            value = "Start time of this VNF workflow assigned by Scheduler based upon the group start time returned by the optimizer and concurrency.")

+                    value = "Start time of this VNF workflow assigned by "

+                                    + "Scheduler based upon the group start"

+                                    + " time returned by the optimizer and concurrency.")

     @JsonProperty

     @Transient

     private String startTime;

@@ -162,192 +155,448 @@ public class ChangeManagementSchedule implements Serializable {
     @Transient

     private String msoTime;

 

+    @ApiModelProperty(value = "Change equest.")

+    @Lob

+    @Column(name = "request")

+    private String request;

+

+    /**

+     * Instantiates a new change management schedule.

+     */

     public ChangeManagementSchedule() {}

 

+    /**

+     * Gets the finish time.

+     *

+     * @return the finish time

+     */

     public String getFinishTime() {

-        if (finishTimeMillis != null)

+        if (finishTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(finishTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the finish time.

+     *

+     * @param finishTime the new finish time

+     */

     public void setFinishTime(String finishTime) {}

 

+    /**

+     * Gets the start time.

+     *

+     * @return the start time

+     */

     public String getStartTime() {

-        if (startTimeMillis != null)

+        if (startTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(startTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the start time.

+     *

+     * @param startTime the new start time

+     */

     public void setStartTime(String startTime) {}

 

+    /**

+     * Gets the status.

+     *

+     * @return the status

+     */

     public String getStatus() {

         return this.status;

     }

 

+    /**

+     * Sets the status.

+     *

+     * @param status the new status

+     */

     public void setStatus(String status) {

         this.status = status;

     }

 

+    /**

+     * Gets the vnf id.

+     *

+     * @return the vnf id

+     */

     public String getVnfId() {

         return this.vnfId;

     }

 

+    /**

+     * Sets the vnf id.

+     *

+     * @param vnfId the new vnf id

+     */

     public void setVnfId(String vnfId) {

         this.vnfId = vnfId;

     }

 

+    /**

+     * Gets the vnf name.

+     *

+     * @return the vnf name

+     */

     public String getVnfName() {

         return this.vnfName;

     }

 

+    /**

+     * Sets the vnf name.

+     *

+     * @param vnfName the new vnf name

+     */

     public void setVnfName(String vnfName) {

         this.vnfName = vnfName;

     }

 

+    /**

+     * Gets the tm change id.

+     *

+     * @return the tm change id

+     */

     public String getTmChangeId() {

         return tmChangeId;

     }

 

+    /**

+     * Sets the tm change id.

+     *

+     * @param tmChangeId the new tm change id

+     */

     public void setTmChangeId(String tmChangeId) {

         this.tmChangeId = tmChangeId;

     }

 

 

+    /**

+     * Gets the uuid.

+     *

+     * @return the uuid

+     */

     public UUID getUuid() {

-		return uuid;

-	}

+        return uuid;

+    }

 

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+    /**

+     * Sets the uuid.

+     *

+     * @param uuid the new uuid

+     */

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

 

-	public UUID getChangeManagementGroupUuid() {

-		return changeManagementGroupUuid;

-	}

+    /**

+     * Gets the change management group uuid.

+     *

+     * @return the change management group uuid

+     */

+    public UUID getChangeManagementGroupUuid() {

+        return changeManagementGroupUuid;

+    }

 

-	public void setChangeManagementGroupUuid(UUID changeManagementGroupUuid) {

-		this.changeManagementGroupUuid = changeManagementGroupUuid;

-	}

+    /**

+     * Sets the change management group uuid.

+     *

+     * @param changeManagementGroupUuid the new change management group uuid

+     */

+    public void setChangeManagementGroupUuid(UUID changeManagementGroupUuid) {

+        this.changeManagementGroupUuid = changeManagementGroupUuid;

+    }

 

-	public String getDispatchTime() {

-        if (dispatchTimeMillis != null)

+    /**

+     * Gets the dispatch time.

+     *

+     * @return the dispatch time

+     */

+    public String getDispatchTime() {

+        if (dispatchTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(dispatchTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the dispatch time.

+     *

+     * @param dispatchTime the new dispatch time

+     */

     public void setDispatchTime(String dispatchTime) {}

 

+    /**

+     * Gets the dispatcher instance.

+     *

+     * @return the dispatcher instance

+     */

     public String getDispatcherInstance() {

         return dispatcherInstance;

     }

 

+    /**

+     * Sets the dispatcher instance.

+     *

+     * @param dispatcherInstance the new dispatcher instance

+     */

     public void setDispatcherInstance(String dispatcherInstance) {

         this.dispatcherInstance = dispatcherInstance;

     }

 

+    /**

+     * Gets the execution completed time.

+     *

+     * @return the execution completed time

+     */

     public String getExecutionCompletedTime() {

-        if (executionCompletedTimeMillis != null)

+        if (executionCompletedTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(executionCompletedTimeMillis);

+        }

         return null;

     }

 

+    /**

+     * Sets the execution completed time.

+     *

+     * @param executionCompletedTime the new execution completed time

+     */

     public void setExecutionCompletedTime(String executionCompletedTime) {}

 

+    /**

+     * Gets the mso request id.

+     *

+     * @return the mso request id

+     */

     public String getMsoRequestId() {

         return msoRequestId;

     }

 

+    /**

+     * Sets the mso request id.

+     *

+     * @param msoRequestId the new mso request id

+     */

     public void setMsoRequestId(String msoRequestId) {

         this.msoRequestId = msoRequestId;

     }

 

+    /**

+     * Gets the status message.

+     *

+     * @return the status message

+     */

     public String getStatusMessage() {

         return statusMessage;

     }

 

+    /**

+     * Sets the status message.

+     *

+     * @param statusMessage the new status message

+     */

     public void setStatusMessage(String statusMessage) {

         this.statusMessage = statusMessage;

     }

 

+    /**

+     * Gets the finish time millis.

+     *

+     * @return the finish time millis

+     */

     public Long getFinishTimeMillis() {

         return finishTimeMillis;

     }

 

+    /**

+     * Sets the finish time millis.

+     *

+     * @param finishTimeMillis the new finish time millis

+     */

     public void setFinishTimeMillis(Long finishTimeMillis) {

         this.finishTimeMillis = finishTimeMillis;

     }

 

+    /**

+     * Gets the start time millis.

+     *

+     * @return the start time millis

+     */

     public Long getStartTimeMillis() {

         return startTimeMillis;

     }

 

+    /**

+     * Sets the start time millis.

+     *

+     * @param startTimeMillis the new start time millis

+     */

     public void setStartTimeMillis(Long startTimeMillis) {

         this.startTimeMillis = startTimeMillis;

     }

 

+    /**

+     * Gets the dispatch time millis.

+     *

+     * @return the dispatch time millis

+     */

     public Long getDispatchTimeMillis() {

         return dispatchTimeMillis;

     }

 

+    /**

+     * Sets the dispatch time millis.

+     *

+     * @param dispatchTimeMillis the new dispatch time millis

+     */

     public void setDispatchTimeMillis(Long dispatchTimeMillis) {

         this.dispatchTimeMillis = dispatchTimeMillis;

     }

 

+    /**

+     * Gets the execution completed time millis.

+     *

+     * @return the execution completed time millis

+     */

     public Long getExecutionCompletedTimeMillis() {

         return executionCompletedTimeMillis;

     }

 

+    /**

+     * Sets the execution completed time millis.

+     *

+     * @param executionCompletedTimeMillis the new execution completed time millis

+     */

     public void setExecutionCompletedTimeMillis(Long executionCompletedTimeMillis) {

         this.executionCompletedTimeMillis = executionCompletedTimeMillis;

     }

 

+    /**

+     * Gets the mso status.

+     *

+     * @return the mso status

+     */

     public String getMsoStatus() {

         return msoStatus;

     }

 

+    /**

+     * Sets the mso status.

+     *

+     * @param msoStatus the new mso status

+     */

     public void setMsoStatus(String msoStatus) {

         this.msoStatus = msoStatus;

     }

 

+    /**

+     * Gets the mso message.

+     *

+     * @return the mso message

+     */

     public String getMsoMessage() {

         return msoMessage;

     }

 

+    /**

+     * Sets the mso message.

+     *

+     * @param msoMessage the new mso message

+     */

     public void setMsoMessage(String msoMessage) {

         this.msoMessage = msoMessage;

     }

 

+    /**

+     * Gets the mso time millis.

+     *

+     * @return the mso time millis

+     */

     public Long getMsoTimeMillis() {

         return msoTimeMillis;

     }

 

+    /**

+     * Sets the mso time millis.

+     *

+     * @param msoTimeMillis the new mso time millis

+     */

     public void setMsoTimeMillis(Long msoTimeMillis) {

         this.msoTimeMillis = msoTimeMillis;

     }

 

+    /**

+     * Gets the mso time.

+     *

+     * @return the mso time

+     */

     public String getMsoTime() {

-        if (msoTimeMillis != null)

+        if (msoTimeMillis != null) {

             return ISODateTimeFormat.dateTimeNoMillis().print(msoTimeMillis);

+        }

         return null;

     }

 

     protected void setMsoTime(String msoTime) {}

 

+    /**

+     * Gets the tm status.

+     *

+     * @return the tm status

+     */

     public String getTmStatus() {

         return tmStatus;

     }

 

+    /**

+     * Sets the tm status.

+     *

+     * @param tmStatus the new tm status

+     */

     public void setTmStatus(String tmStatus) {

         this.tmStatus = tmStatus;

     }

 

+    /**

+     * Gets the tm approval status.

+     *

+     * @return the tm approval status

+     */

     public String getTmApprovalStatus() {

         return tmApprovalStatus;

     }

 

+    /**

+     * Sets the tm approval status.

+     *

+     * @param tmApprovalStatus the new tm approval status

+     */

     public void setTmApprovalStatus(String tmApprovalStatus) {

         this.tmApprovalStatus = tmApprovalStatus;

     }

 

+    /**

+     * Gets the request.

+     *

+     * @return the request

+     */

+    public String getRequest() {

+        return request;

+    }

+

+    /**

+     * Sets the request.

+     *

+     * @param request the new request

+     */

+    public void setRequest(String request) {

+        this.request = request;

+    }

+

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/Domain.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/Domain.java
index c7af7c5..c8f7e85 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/Domain.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/Domain.java
@@ -1,33 +1,28 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright � 2017-2018 AT&T Intellectual Property. Modifications Copyright � 2018 IBM.

  * 

- * 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

+ * 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

+ * 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.

+ * 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.

  * 

  * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

  * 

- *         https://creativecommons.org/licenses/by/4.0/

+ * https://creativecommons.org/licenses/by/4.0/

  * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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

+ * Unless required by applicable law or agreed to in writing, documentation 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/DomainData.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/DomainData.java
index 3bb0bea..b08bde9 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/DomainData.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/DomainData.java
@@ -1,39 +1,35 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

  * 

- * 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

+ * 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

+ * 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.

+ * 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.

  * 

  * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

  * 

- *         https://creativecommons.org/licenses/by/4.0/

+ * https://creativecommons.org/licenses/by/4.0/

  * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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

+ * Unless required by applicable law or agreed to in writing, documentation 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import io.swagger.annotations.ApiModel;

 import java.io.Serializable;

 import java.util.UUID;

-

 import javax.persistence.Entity;

 import javax.persistence.Id;

 import javax.persistence.JoinColumn;

@@ -41,10 +37,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;

 import javax.persistence.Table;

 

-import com.fasterxml.jackson.annotation.JsonIgnore;

-

-import io.swagger.annotations.ApiModel;

-

 /**

  * The persistent class for the domain_data database table.

  * 

@@ -58,7 +50,7 @@ public class DomainData implements Serializable {
 

     @JsonIgnore

     @Id

-   private UUID uuid;

+    private UUID uuid;

 

     private String name;

 

@@ -73,16 +65,16 @@ public class DomainData implements Serializable {
 

 

     public UUID getUuid() {

-		return uuid;

-	}

+        return uuid;

+    }

 

 

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

 

-	public String getName() {

+    public String getName() {

         return this.name;

     }

 

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/ElementData.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/ElementData.java
new file mode 100644
index 0000000..b4114a8
--- /dev/null
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/ElementData.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative
+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation 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.
+ */
+
+package org.onap.optf.cmso.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import java.io.Serializable;
+import java.util.UUID;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+/**
+ * The persistent class for the domain_data database table.
+ *
+ */
+@Entity
+@Table(name = "ELEMENT_DATA")
+@NamedQuery(name = "ElementData.findAll", query = "SELECT d FROM ElementData d")
+@ApiModel(value = "Element data", description = "Element data represented as name/value pairs")
+public class ElementData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonIgnore
+    @Id
+    private UUID uuid;
+
+    private String name;
+
+    private String value;
+
+    private UUID changeManagementSchedulesUuid;
+
+    public ElementData() {}
+
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+
+    public UUID getChangeManagementSchedulesUuid() {
+        return changeManagementSchedulesUuid;
+    }
+
+
+    public void setChangeManagementSchedulesUuid(UUID changeManagementSchedulesUuid) {
+        this.changeManagementSchedulesUuid = changeManagementSchedulesUuid;
+    }
+
+
+}
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/Schedule.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/Schedule.java
index 624e376..200e641 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/Schedule.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/Schedule.java
@@ -1,41 +1,38 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

  * 

- * 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

+ * 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

+ * 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.

+ * 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.

  * 

  * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

  * 

- *         https://creativecommons.org/licenses/by/4.0/

+ * https://creativecommons.org/licenses/by/4.0/

  * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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

+ * Unless required by applicable law or agreed to in writing, documentation 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import io.swagger.annotations.ApiModelProperty;

 import java.io.Serializable;

 import java.util.ArrayList;

 import java.util.List;

 import java.util.UUID;

-

 import javax.persistence.CascadeType;

 import javax.persistence.Column;

 import javax.persistence.Entity;

@@ -45,16 +42,10 @@ import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;

 import javax.persistence.Table;

 import javax.persistence.Transient;

-

 import org.hibernate.annotations.LazyCollection;

 import org.hibernate.annotations.LazyCollectionOption;

 import org.joda.time.format.ISODateTimeFormat;

 

-import com.fasterxml.jackson.annotation.JsonIgnore;

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-import io.swagger.annotations.ApiModelProperty;

-

 /**

  * The persistent class for the schedules database table.

  * 

@@ -163,22 +154,22 @@ public class Schedule implements Serializable {
     public Schedule() {}

 

     public UUID getUuid() {

-		return uuid;

-	}

+        return uuid;

+    }

 

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

-	public void setDomainData(List<DomainData> domainData) {

-		this.domainData = domainData;

-	}

+    public void setDomainData(List<DomainData> domainData) {

+        this.domainData = domainData;

+    }

 

-	public void setScheduleApprovals(List<ScheduleApproval> scheduleApprovals) {

-		this.scheduleApprovals = scheduleApprovals;

-	}

+    public void setScheduleApprovals(List<ScheduleApproval> scheduleApprovals) {

+        this.scheduleApprovals = scheduleApprovals;

+    }

 

-	public String getCreateDateTime() {

+    public String getCreateDateTime() {

         if (createDateTimeMillis != null)

             return ISODateTimeFormat.dateTimeNoMillis().print(this.createDateTimeMillis);

         return null;

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleApproval.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleApproval.java
index 3239ae3..588aede 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleApproval.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleApproval.java
@@ -1,39 +1,37 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

  * 

- * 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

+ * 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

+ * 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.

+ * 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.

  * 

  * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

  * 

- *         https://creativecommons.org/licenses/by/4.0/

+ * https://creativecommons.org/licenses/by/4.0/

  * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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

+ * Unless required by applicable law or agreed to in writing, documentation 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

+import com.fasterxml.jackson.annotation.JsonIgnore;

+import com.fasterxml.jackson.annotation.JsonProperty;

+import io.swagger.annotations.ApiModel;

+import io.swagger.annotations.ApiModelProperty;

 import java.io.Serializable;

 import java.util.UUID;

-

 import javax.persistence.Column;

 import javax.persistence.Entity;

 import javax.persistence.Id;

@@ -42,15 +40,8 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;

 import javax.persistence.Table;

 import javax.persistence.Transient;

-

 import org.joda.time.format.ISODateTimeFormat;

 

-import com.fasterxml.jackson.annotation.JsonIgnore;

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-import io.swagger.annotations.ApiModel;

-import io.swagger.annotations.ApiModelProperty;

-

 /**

  * The persistent class for the schedule_approvals database table.

  * 

@@ -137,24 +128,24 @@ public class ScheduleApproval implements Serializable {
     }

 

 

-	public UUID getUuid() {

-		return uuid;

-	}

+    public UUID getUuid() {

+        return uuid;

+    }

 

 

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

 

-	public UUID getApprovalTypesUuid() {

-		return approvalTypesUuid;

-	}

+    public UUID getApprovalTypesUuid() {

+        return approvalTypesUuid;

+    }

 

 

-	public void setApprovalTypesUuid(UUID approvalTypesUuid) {

-		this.approvalTypesUuid = approvalTypesUuid;

-	}

+    public void setApprovalTypesUuid(UUID approvalTypesUuid) {

+        this.approvalTypesUuid = approvalTypesUuid;

+    }

 

 

 

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleQuery.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleQuery.java
index 628fc6f..24caf1e 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleQuery.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/ScheduleQuery.java
@@ -1,38 +1,32 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

+ * Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

  * 

- * 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

+ * 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

+ * 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.

+ * 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.

  * 

  * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

  * 

- *         https://creativecommons.org/licenses/by/4.0/

+ * https://creativecommons.org/licenses/by/4.0/

  * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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

+ * Unless required by applicable law or agreed to in writing, documentation 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.

-*/

+ */

 

 package org.onap.optf.cmso.model;

 

 import java.util.UUID;

-

 import javax.persistence.Column;

 import javax.persistence.Entity;

 import javax.persistence.Id;

@@ -43,13 +37,13 @@ public class ScheduleQuery {
     @Column(name = "uuid")

     private UUID uuid;

 

-	public UUID getUuid() {

-		return uuid;

-	}

+    public UUID getUuid() {

+        return uuid;

+    }

 

-	public void setUuid(UUID uuid) {

-		this.uuid = uuid;

-	}

+    public void setUuid(UUID uuid) {

+        this.uuid = uuid;

+    }

 

 

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ChangeManagementScheduleDAO.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ChangeManagementScheduleDAO.java
index ad01a34..27a5029 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ChangeManagementScheduleDAO.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ChangeManagementScheduleDAO.java
@@ -1,27 +1,27 @@
 /*

  * Copyright © 2017-2018 AT&T Intellectual Property.

  * Modifications Copyright © 2018 IBM.

- * 

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -34,9 +34,7 @@ package org.onap.optf.cmso.model.dao;
 import java.util.List;

 import java.util.Optional;

 import java.util.UUID;

-

 import javax.persistence.LockModeType;

-

 import org.onap.optf.cmso.model.ChangeManagementSchedule;

 import org.springframework.data.jpa.repository.Lock;

 import org.springframework.data.jpa.repository.Modifying;

@@ -44,10 +42,13 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;

 

 public interface ChangeManagementScheduleDAO extends PagingAndSortingRepository<ChangeManagementSchedule, UUID> {

+    @Override
     Optional<ChangeManagementSchedule> findById(UUID id);

 

+    @Override
     ChangeManagementSchedule save(ChangeManagementSchedule persisted);

 

+    @Override
     void delete(ChangeManagementSchedule toDelete);

 

     @Query(value = "SELECT d FROM ChangeManagementSchedule d WHERE d.changeManagementGroupUuid = ?1")

@@ -58,7 +59,15 @@ public interface ChangeManagementScheduleDAO extends PagingAndSortingRepository<
     public int deleteByChangeManagementGroupsId(UUID id);

 

     @Query(value = "SELECT d FROM ChangeManagementSchedule d WHERE d.changeManagementGroupUuid = ?1 AND d.vnfName = ?2")

-    ChangeManagementSchedule findOneByGroupIDAndVnfName(UUID id, String vnfName);

+    ChangeManagementSchedule findOneByGroupUuidAndVnfName(UUID id, String vnfName);

+

+    @Query(value = "SELECT d FROM ChangeManagementSchedule d, ChangeManagementGroup g"

+            + " WHERE g.schedulesUuid = ?1"

+            + " AND g.groupId = ?2"

+            + " AND d.changeManagementGroupUuid = g.uuid"

+            + " AND d.vnfName = ?3")

+    ChangeManagementSchedule findOneByScheduleUUIDGroupIdAndVnfName(UUID id, String groupId, String vnfName);

+

 

     @Query(value = "SELECT d FROM ChangeManagementSchedule d WHERE (d.status = ?1 AND d.startTimeMillis <= ?2) or d.status = 'Scheduled Immediate' order by d.startTimeMillis")

     List<ChangeManagementSchedule> findByStatusAndEndTime(String status, Long date);

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ElementDataDAO.java b/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ElementDataDAO.java
new file mode 100644
index 0000000..dada4e1
--- /dev/null
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/model/dao/ElementDataDAO.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
+ * 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.
+ *
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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.
+*/
+
+package org.onap.optf.cmso.model.dao;
+
+import java.util.Optional;
+import java.util.UUID;
+import org.onap.optf.cmso.model.ElementData;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface ElementDataDAO extends PagingAndSortingRepository<ElementData, UUID> {
+    @Override
+    Optional<ElementData> findById(UUID id);
+
+    @Override
+    ElementData save(ElementData persisted);
+
+    @Override
+    void delete(ElementData toDelete);
+
+}