Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / controller / PropertyController.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/PropertyController.java b/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java
similarity index 82%
rename from vid-app-common/src/main/java/org/onap/vid/controllers/PropertyController.java
rename to vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java
index 2c82386..2f8d6e2 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controllers/PropertyController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/PropertyController.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.vid.controllers;
+package org.onap.vid.controller;
 
-import org.onap.vid.category.CategoryParametersResponse;
-import org.onap.vid.model.CategoryParameter.Family;
-import org.onap.vid.services.CategoryParameterService;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.vid.category.CategoryParametersResponse;
+import org.onap.vid.model.CategoryParameter.Family;
+import org.onap.vid.services.CategoryParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -33,9 +33,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import static org.onap.vid.utils.Logging.getMethodName;
 
@@ -48,9 +45,6 @@ public class PropertyController extends RestrictedBaseController{
 
        /** The logger. */
        private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(PropertyController.class);
-       
-       /** The Constant dateFormat. */
-       final protected static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
 
        @Autowired
        protected CategoryParameterService categoryParameterService;
@@ -64,7 +58,7 @@ public class PropertyController extends RestrictedBaseController{
         */
        @RequestMapping(value = {"/propertyhome" }, method = RequestMethod.GET)
        public ModelAndView welcome(HttpServletRequest request) {
-               LOGGER.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== PropertyController welcome start");
+               LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== PropertyController welcome start");
                return new ModelAndView(getViewName());         
        }
        
@@ -84,7 +78,7 @@ public class PropertyController extends RestrictedBaseController{
                String methodName = "getProperty";      
                ResponseEntity<String> resp = null;
                String pvalue = null;
-               LOGGER.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
+               LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + " start");
                
                try {
                        // convert "_" to "." in the property name
@@ -97,14 +91,14 @@ public class PropertyController extends RestrictedBaseController{
                        if ( ( pvalue == null ) || ( pvalue.length() == 0 ) ) {
                                pvalue = defaultvalue;
                        }
-                       resp = new ResponseEntity<String>(pvalue, HttpStatus.OK);
+                       resp = new ResponseEntity<>(pvalue, HttpStatus.OK);
                }
                catch (Exception e) {
-                       LOGGER.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
-                       LOGGER.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== " + "." + methodName + e.toString());
+                       LOGGER.info(EELFLoggerDelegate.errorLogger,  "<== " + "." + methodName + e.toString());
+                       LOGGER.debug(EELFLoggerDelegate.debugLogger,  "<== " + "." + methodName + e.toString());
                        throw e;
                }
-               LOGGER.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " returning " + pvalue);
+               LOGGER.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + " returning " + pvalue);
                return ( resp );
        }