Revision 60960
Added by Konstantina Galouni almost 3 years ago
IndicatorController.java | ||
---|---|---|
268 | 268 |
} |
269 | 269 |
//if (indicatorPath.getParameters().size() != indicatorPathBasedOnDefault.getParameters().size()) { |
270 | 270 |
//log.debug("Different number of parameters"); |
271 |
for (Map.Entry<String, String> parameter : indicatorPath.getParameters().entrySet()) { |
|
272 |
log.debug("\nindicatorPath: parameter.getKey(): "+parameter.getKey()+" - value: "+parameter.getValue() |
|
273 |
+"\nindicatorPathBasedOnDefault:parameters:key: "+ indicatorPathBasedOnDefault.getParameters().get(parameter.getKey()) |
|
274 |
+"\noldIndicatorPath:parameters:key: "+ (oldIndicatorPath.getParameters() == null ? "null" : oldIndicatorPath.getParameters().get(parameter.getKey()))); |
|
275 |
if (!indicatorPathBasedOnDefault.getParameters().containsKey(parameter.getKey()) |
|
276 |
|| (oldIndicatorPath.getParameters() == null |
|
277 |
|| (oldIndicatorPath.getParameters().get(parameter.getKey()).equals(indicatorPathBasedOnDefault.getParameters().get(parameter.getKey())) |
|
278 |
&& !parameter.getValue().equals(indicatorPathBasedOnDefault.getParameters().get(parameter.getKey())))) |
|
279 |
) { |
|
280 |
indicatorPathBasedOnDefault.getParameters().put(parameter.getKey(), parameter.getValue()); |
|
281 |
changed = true; |
|
271 |
for (Map.Entry<String, String> parameter : indicatorPath.getParameters().entrySet()) { |
|
272 |
log.debug("\nindicatorPath: parameter.getKey(): "+parameter.getKey()+" - value: "+parameter.getValue() |
|
273 |
+"\nindicatorPathBasedOnDefault:parameters:key: "+ indicatorPathBasedOnDefault.getParameters().get(parameter.getKey()) |
|
274 |
+"\noldIndicatorPath:parameters:key: "+ (oldIndicatorPath.getParameters() == null ? "null" : oldIndicatorPath.getParameters().get(parameter.getKey()))); |
|
275 |
if (!indicatorPathBasedOnDefault.getParameters().containsKey(parameter.getKey()) |
|
276 |
|| (oldIndicatorPath.getParameters() == null || oldIndicatorPath.getParameters().get(parameter.getKey()) == null |
|
277 |
|| (oldIndicatorPath.getParameters().get(parameter.getKey()).equals(indicatorPathBasedOnDefault.getParameters().get(parameter.getKey())) |
|
278 |
&& !parameter.getValue().equals(indicatorPathBasedOnDefault.getParameters().get(parameter.getKey())))) |
|
279 |
) { |
|
280 |
indicatorPathBasedOnDefault.getParameters().put(parameter.getKey(), parameter.getValue()); |
|
281 |
changed = true; |
|
282 |
} |
|
283 |
// else if(parameter.getKey().equals("type")) { |
|
284 |
// indicatorPathBasedOnDefault.getParameters().put(parameter.getKey(), parameter.getValue()); |
|
285 |
// changed = true; |
|
286 |
// } |
|
287 |
} |
|
288 |
|
|
289 |
// When deleting indicator path parameters in a default profile, delete them also from all children profiles |
|
290 |
if(oldIndicatorPath.getParameters() != null && indicatorPath.getParameters().size() < oldIndicatorPath.getParameters().size()) { |
|
291 |
for (Map.Entry<String, String> parameter : oldIndicatorPath.getParameters().entrySet()) { |
|
292 |
if(!indicatorPath.getParameters().containsKey(parameter.getKey())) { |
|
293 |
indicatorPathBasedOnDefault.getParameters().remove(parameter.getKey()); |
|
282 | 294 |
} |
283 |
// else if(parameter.getKey().equals("type")) { |
|
284 |
// indicatorPathBasedOnDefault.getParameters().put(parameter.getKey(), parameter.getValue()); |
|
285 |
// changed = true; |
|
286 |
// } |
|
287 | 295 |
} |
288 |
// TODO when deleting indicator path parameters... ???
|
|
296 |
}
|
|
289 | 297 |
parameterMapping(indicatorPathBasedOnDefault, stakeholder); |
290 | 298 |
//} |
291 | 299 |
} |
... | ... | |
347 | 355 |
changed = true; |
348 | 356 |
} |
349 | 357 |
} |
350 |
// TODO when deleting indicator path json path strings... |
|
358 |
// TODO when deleting indicator path json path strings... --> is this done? (line 327)
|
|
351 | 359 |
} |
352 | 360 |
log.debug("After jsonPath check: " + changed); |
353 | 361 |
} |
Also available in: Unified diff
[Trunk | Monitor Service]:
1. MonitorServiceCheckDeployController.java: [NEW] Controller added and
a. "hello()" method (@RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)) which just prints and returns a greeting message.
b. "checkEverything()" method @RequestMapping(value = "/health_check/advanced", method = RequestMethod.GET) only accessible by PORTAL ADMINS which checks connection with db and prints properties.
2. TestController.java: Comment "index()" method with @RequestMapping("/").
3. IndicatorController.java: [Bug fix]
a. Added a check when the value of an indicator path parameter is null
b. When an indicator path parameter from a default profile is deleted, delete this parameter also from all profiles based on this default.