diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-04-02 19:59:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-02 19:59:53 +0000 |
| commit | d105cbfe03206ad479e474e58290db4d5b9ba511 (patch) | |
| tree | d13457fffde9a4ee6857751de9972218522471d0 /POLICY-SDK-APP/src/main | |
| parent | 1cc7a3d1ec03a9eac35c3467167be08dedd2ded8 (diff) | |
| parent | c2a62b0884e64c5dae3da64c034807cd2b98bccb (diff) | |
Merge "Support CSIT tests for OOF Policy"
Diffstat (limited to 'POLICY-SDK-APP/src/main')
2 files changed, 6 insertions, 6 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java index 4ae13443d..a45bfed57 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java @@ -97,10 +97,6 @@ public class CreateOptimizationController extends RestrictedBaseController { return commonClassDao; } - public static void setCommonClassDao(CommonClassDao commonClassDao) { - CreateOptimizationController.commonClassDao = commonClassDao; - } - private OptimizationModels newModel; private String newFile; private String directory; @@ -130,6 +126,10 @@ public class CreateOptimizationController extends RestrictedBaseController { @Autowired private CreateOptimizationController(CommonClassDao commonClassDao){ + setCommonClassDao(commonClassDao); + } + + public static void setCommonClassDao(CommonClassDao commonClassDao) { CreateOptimizationController.commonClassDao = commonClassDao; } @@ -595,7 +595,7 @@ public class CreateOptimizationController extends RestrictedBaseController { } @RequestMapping(value={"/oof_dictionary/set_ModelData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public void SetModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{ + public void setModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{ modelList = new ArrayList<>(); dirDependencyList = new ArrayList<>(); classMap = new LinkedHashMap<>(); diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js index e499c9ff5..cbd011f2e 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js @@ -73,7 +73,7 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window', console.log("failed"); }); - PolicyAppService.getData('get_PriorityValues').then(function (data) { + PolicyAppService.getData('get_DCAEPriorityValues').then(function (data) { var j = data; $scope.data = JSON.parse(j.data); console.log($scope.data); |