From 62c469dc0045e81979ac14aecb105f2150592c3a Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 20 Aug 2021 16:39:17 -0400 Subject: [PATCH] Fix sonars in models Fixed: - use "var" - change constructor to protected - add equals() to subclasses Issue-ID: POLICY-3094 Change-Id: Ia62716b1a740b4475e54e496330f50aa7fb404d7 Signed-off-by: Jim Hahn --- .../src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java | 2 +- .../org/onap/policy/controlloop/actor/xacml/DecisionOperation.java | 2 +- .../src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java | 2 +- .../main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java | 2 ++ .../src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java | 4 +++- .../main/java/org/onap/policy/models/pdp/concepts/PdpTopicCheck.java | 2 ++ .../src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java | 2 ++ 7 files changed, 12 insertions(+), 4 deletions(-) diff --git a/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java b/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java index e9a10a134..1b1b77da2 100644 --- a/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java +++ b/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java @@ -393,7 +393,7 @@ public class DefaultPfDao implements PfDao { try { PfFilter filter = new PfFilterFactory().createFilter(someClass); - String filterQueryString = SELECT_FROM_TABLE + var filterQueryString = SELECT_FROM_TABLE + filter.genWhereClause(filterParams) + filter.genOrderClause(filterParams); diff --git a/models-interactions/model-actors/actor.xacml/src/main/java/org/onap/policy/controlloop/actor/xacml/DecisionOperation.java b/models-interactions/model-actors/actor.xacml/src/main/java/org/onap/policy/controlloop/actor/xacml/DecisionOperation.java index 9fbb3e268..0792dc6ea 100644 --- a/models-interactions/model-actors/actor.xacml/src/main/java/org/onap/policy/controlloop/actor/xacml/DecisionOperation.java +++ b/models-interactions/model-actors/actor.xacml/src/main/java/org/onap/policy/controlloop/actor/xacml/DecisionOperation.java @@ -53,7 +53,7 @@ public abstract class DecisionOperation extends HttpOperation * @param config configuration for this operation * @param propertyNames names of properties required by this operation */ - public DecisionOperation(ControlLoopOperationParams params, HttpConfig config, + protected DecisionOperation(ControlLoopOperationParams params, HttpConfig config, List propertyNames) { super(params, config, DecisionResponse.class, propertyNames); this.config = (DecisionConfig) config; diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java index 54023f6e5..36964210b 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/XacmlSimulatorJaxRs.java @@ -71,7 +71,7 @@ public class XacmlSimulatorJaxRs { return func.apply(req); } - DecisionResponse response = new DecisionResponse(); + var response = new DecisionResponse(); response.setMessage("unsupported action: " + req.getAction()); return response; } diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java index 6a7b7d534..98e2ee907 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStateChange.java @@ -21,6 +21,7 @@ package org.onap.policy.models.pdp.concepts; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -36,6 +37,7 @@ import org.onap.policy.models.pdp.enums.PdpState; @Getter @Setter @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class PdpStateChange extends PdpMessage { /** diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java index e90a4d10e..3d85f4bc4 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-2021 Nordix Foundation. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. + * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ package org.onap.policy.models.pdp.concepts; import java.util.ArrayList; import java.util.List; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -40,6 +41,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; @Getter @Setter @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class PdpStatus extends PdpMessage { private String pdpType; diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpTopicCheck.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpTopicCheck.java index 2cd3a9d8b..c17127299 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpTopicCheck.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpTopicCheck.java @@ -20,6 +20,7 @@ package org.onap.policy.models.pdp.concepts; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -31,6 +32,7 @@ import org.onap.policy.models.pdp.enums.PdpMessageType; @Getter @Setter @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class PdpTopicCheck extends PdpMessage { /** diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java index aa2b85d29..b962e2b32 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java @@ -25,6 +25,7 @@ package org.onap.policy.models.pdp.concepts; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -42,6 +43,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; @Getter @Setter @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class PdpUpdate extends PdpMessage { /** -- 2.16.6