Merge from ECOMP's repository

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

diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/FeatureTogglingController.java b/vid-app-common/src/main/java/org/onap/vid/controller/FeatureTogglingController.java
similarity index 89%
rename from vid-app-common/src/main/java/org/onap/vid/controllers/FeatureTogglingController.java
rename to vid-app-common/src/main/java/org/onap/vid/controller/FeatureTogglingController.java
index 36dfdaa..a90e71d 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controllers/FeatureTogglingController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/FeatureTogglingController.java
@@ -1,7 +1,7 @@
-package org.onap.vid.controllers;
+package org.onap.vid.controller;
 
-import org.onap.vid.properties.Features;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.vid.properties.Features;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -18,7 +18,7 @@ public class FeatureTogglingController extends RestrictedBaseController {
     @RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public @ResponseBody Map<String,Boolean> getFeatureToggles()
     {
-        HashMap<String,Boolean> flags = new HashMap <String, Boolean>();
+        HashMap<String,Boolean> flags = new HashMap <>();
         for(Features flag : Features.values()){
             flags.put(flag.name(), flag.isActive());
         }