Commit 7 for Define OPtimizer API mS

Multiple commits required due to commit size limitation.

Change-Id: I3e70ea869517bc5b19669adf60fb4514ba764779
Issue-ID: OPTFRA-437
Signed-off-by: Jerry Flood <jflood@att.com>

diff --git a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/HealthCheckImpl.java b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/HealthCheckImpl.java
index a1bacb9..4fae359 100644 (file)
--- a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/HealthCheckImpl.java
+++ b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/HealthCheckImpl.java
@@ -71,6 +71,7 @@ public class HealthCheckImpl implements HealthCheck {
         return response;
     }
 
+    @SuppressWarnings("unused")
     private void addToHealthCheckMessage(HealthCheckMessage hc, HealthCheckComponent hcc) {
         if (!hcc.getHealthy()) {
             hc.setHealthy(false);
@@ -85,6 +86,7 @@ public class HealthCheckImpl implements HealthCheck {
      *
      * @return the health check component
      */
+    @SuppressWarnings("unused")
     private HealthCheckComponent healthCheckDb() {
         HealthCheckComponent hcc = new HealthCheckComponent();
         hcc.setName("Database");

diff --git a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java
index c824d20..b9ab733 100644 (file)
--- a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java
+++ b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java
@@ -48,6 +48,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 @Controller
 public class TopologyInterfaceImpl implements TopologyInterface {
+    @SuppressWarnings("unused")
     private static EELFLogger debug = EELFManager.getInstance().getDebugLogger();
 
     @Autowired
@@ -73,13 +74,12 @@ public class TopologyInterfaceImpl implements TopologyInterface {
             atr.setStatus(TopologyRequestStatus.COMPLETED);
             List<ElementCriteria> elements = topologyRequest.getElements();
             // At a minimum, return the requested elements
-            for  (ElementCriteria criteria : elements)
-            {
+            for  (ElementCriteria criteria : elements) {
                 ElementInfo element = new ElementInfo();
                 element.setElementId(criteria.getElementId());
                 ElementLocation loc = new ElementLocation();
-                loc.setLat(new Float(-0.00));
-                loc.setLon(new Float(0.00));
+                loc.setLat(new Float(-74.024));
+                loc.setLon(new Float(40.177));
                 element.setElementLocation(loc);
                 atr.getElements().add(element);
             }

diff --git a/cmso-topology/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java b/cmso-topology/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java
index 3413806..ba30e4c 100644 (file)
--- a/cmso-topology/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java
+++ b/cmso-topology/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java
@@ -3,19 +3,20 @@
  * Copyright (c) 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 
+ * 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 
+ *
+ * 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.utilities;
 
 import org.onap.optf.cmso.common.PropertiesManagement;

diff --git a/pom.xml b/pom.xml
index 12f4980..3c302d7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,6 @@
     \r
     <modules>\r
         <module>cmso-database</module>\r
-        <module>cmso-service</module>\r
         <module>cmso-ticketmgt</module>\r
         <module>cmso-robot</module>\r
     </modules>\r