From 874a1dcf54a14f28068e237b7d3fa06593fe4eb1 Mon Sep 17 00:00:00 2001 From: RossC Date: Thu, 11 Jun 2020 11:24:13 +0100 Subject: Switching logging of ToscaPolicyXXXIdentifiers to use new toString() Issue-ID: POLICY-2078 Change-Id: I035eceb45e76ef11df0e903b584fcf7f8eb63208 Signed-off-by: RossC --- .../org/onap/policy/pap/main/notification/PolicyNotifier.java | 5 +++-- .../org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java | 3 ++- .../org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java | 10 +++++----- .../org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java | 5 +++-- 4 files changed, 13 insertions(+), 10 deletions(-) (limited to 'main') diff --git a/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java b/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java index 430a09b9..12630af2 100644 --- a/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java +++ b/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java @@ -3,6 +3,7 @@ * ONAP PAP * ================================================================================ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,8 +135,8 @@ public class PolicyNotifier { ToscaPolicyTypeIdentifier type = id2type.get(policyId); if (type == null) { - logger.error("group {}:{} refers to non-existent policy {}:{}", group.getName(), subgrp.getPdpType(), - policyId.getName(), policyId.getVersion()); + logger.error("group {}:{} refers to non-existent policy {}", group.getName(), subgrp.getPdpType(), + policyId); continue; } diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java index 931ad7f0..44450389 100644 --- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java +++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java @@ -3,6 +3,7 @@ * ONAP PAP * ================================================================================ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -154,7 +155,7 @@ public class PdpGroupDeleteProvider extends ProviderBase { if (matcher.test(ident)) { result = true; iter.remove(); - logger.info("remove policy {} {} from subgroup {} {} count={}", ident.getName(), ident.getVersion(), + logger.info("remove policy {} from subgroup {} {} count={}", ident, group.getName(), subgroup.getPdpType(), subgroup.getPolicies().size()); data.trackUndeploy(ident, pdps); diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java index 4c0accd3..d09e2ea7 100644 --- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java +++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java @@ -3,6 +3,7 @@ * ONAP PAP * ================================================================================ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -439,9 +440,8 @@ public class PdpGroupDeployProvider extends ProviderBase { // add the policy to the subgroup subgroup.getPolicies().add(desiredIdent); - logger.info("add policy {} {} to subgroup {} {} count={}", desiredIdent.getName(), - desiredIdent.getVersion(), group.getName(), subgroup.getPdpType(), - subgroup.getPolicies().size()); + logger.info("add policy {} to subgroup {} {} count={}", desiredIdent, group.getName(), + subgroup.getPdpType(), subgroup.getPolicies().size()); Set pdps = subgroup.getPdpInstances().stream().map(Pdp::getInstanceId).collect(Collectors.toSet()); data.trackDeploy(desiredIdent, pdps); @@ -505,8 +505,8 @@ public class PdpGroupDeployProvider extends ProviderBase { } // already has the desired policy & version - logger.info("subgroup {} {} already contains policy {} {}", group.getName(), subgroup.getPdpType(), desnm, - desvers); + logger.info("subgroup {} {} already contains policy {}", group.getName(), subgroup.getPdpType(), + desiredIdent); return true; } diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java b/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java index f2812087..85ad1280 100644 --- a/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java +++ b/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java @@ -3,6 +3,7 @@ * ONAP PAP * ================================================================================ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,8 +89,8 @@ public class PolicyUndeployerImpl extends ProviderBase implements PolicyUndeploy continue; } - logger.info("remove policy {} {} from subgroup {} {} count={}", ident.getName(), ident.getVersion(), - group.getName(), subgroup.getPdpType(), subgroup.getPolicies().size()); + logger.info("remove policy {} from subgroup {} {} count={}", ident, group.getName(), + subgroup.getPdpType(), subgroup.getPolicies().size()); updated = true; data.trackUndeploy(ident, pdps); -- cgit 1.2.3-korg