From: Jorge Hernandez Date: Mon, 15 Jan 2018 23:35:51 +0000 (+0000) Subject: Merge "Fixed as per Java Code Conventions" X-Git-Tag: v1.2.0~186 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6d3cc4662712bb636b83f8a4da9938afe192a64a;hp=fb3cc27605623672fb8971bd9030872f117c7af8;p=policy%2Fengine.git Merge "Fixed as per Java Code Conventions" --- diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java index 1a43c7646..4893522ef 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AdminTabController.java @@ -55,23 +55,23 @@ public class AdminTabController extends RestrictedBaseController{ private static CommonClassDao commonClassDao; - public static CommonClassDao getCommonClassDao() { - return commonClassDao; + public AdminTabController() { + //default constructor } - public static void setCommonClassDao(CommonClassDao commonClassDao) { - AdminTabController.commonClassDao = commonClassDao; - } - @Autowired private AdminTabController(CommonClassDao commonClassDao){ AdminTabController.commonClassDao = commonClassDao; } - - public AdminTabController() { - //default constructor + + public static CommonClassDao getCommonClassDao() { + return commonClassDao; } + public static void setCommonClassDao(CommonClassDao commonClassDao) { + AdminTabController.commonClassDao = commonClassDao; + } + @RequestMapping(value={"/get_LockDownData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getAdminTabEntityData(HttpServletRequest request, HttpServletResponse response){ try{