Changes for Checkstyle 8.32

[policy/models.git] / models-interactions / model-yaml / src / main / java / org / onap / policy / controlloop / policy / ControlLoop.java

diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
index fc3d823..256f8be 100644 (file)
--- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
+++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/ControlLoop.java
@@ -2,15 +2,15 @@
  * ============LICENSE_START=======================================================
  * policy-yaml
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,8 +24,7 @@ package org.onap.policy.controlloop.policy;
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
-
-import org.onap.policy.aai.Pnf;
+import org.onap.aai.domain.yang.Pnf;
 import org.onap.policy.sdc.Resource;
 import org.onap.policy.sdc.Service;
 
@@ -49,7 +48,7 @@ public class ControlLoop implements Serializable {
 
     /**
      * Constructor.
-     * 
+     *
      * @param controlLoop copy object
      */
     public ControlLoop(ControlLoop controlLoop) {
@@ -172,10 +171,12 @@ public class ControlLoop implements Serializable {
             return false;
         }
         ControlLoop other = (ControlLoop) obj;
-        return equalsMayBeNull(controlLoopName, other.controlLoopName) && equalsMayBeNull(resources, other.resources)
-                && equalsMayBeNull(services, other.services) && equalsMayBeNull(timeout, other.timeout)
-                && equalsMayBeNull(triggerPolicy, other.triggerPolicy) && equalsMayBeNull(version, other.version)
-                && equalsMayBeNull(abatement, other.abatement);
+
+        boolean isEq = equalsMayBeNull(controlLoopName, other.controlLoopName)
+                        && equalsMayBeNull(resources, other.resources) && equalsMayBeNull(services, other.services);
+        isEq = isEq && equalsMayBeNull(timeout, other.timeout) && equalsMayBeNull(triggerPolicy, other.triggerPolicy)
+                        && equalsMayBeNull(version, other.version);
+        return (isEq && equalsMayBeNull(abatement, other.abatement));
     }
 
     private boolean equalsMayBeNull(final Object obj1, final Object obj2) {