From 041f5dd96839596f985a349f4435787d7a068183 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Fri, 6 Nov 2020 08:16:56 -0500 Subject: [PATCH] Fix upcoming checkstyle issues When we upgrade to oparent, these will fail as oparent upgrades to 8.37 of puppycrawl which fixes a few bugs that should have flagged these previously. Issue-ID: POLICY-2887 Change-Id: Ia0ceab23ff3d5c177f657c5852115ab1b265c698 Signed-off-by: Pamela Dragosh --- .../onap/policy/controlloop/actorserviceprovider/OperationOutcome.java | 2 +- .../org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java index 2d6a61249..f5947e77d 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/OperationOutcome.java @@ -66,7 +66,7 @@ public class OperationOutcome { * this object. Sets the outcome field to the string representation of this object's * outcome. * - * @return + * @return ControlLoopOperation */ public ControlLoopOperation toControlLoopOperation() { ControlLoopOperation clo = new ControlLoopOperation(); diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java index d988b7b46..5b6855d95 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/utils/ToscaServiceTemplateUtils.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 AT&T * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +53,7 @@ public class ToscaServiceTemplateUtils { * * @param originalTemplate the original service template * @param fragmentTemplate the fragment being added to the original service template - * @return + * @return JpaToscaServiceTemplate */ public static JpaToscaServiceTemplate addFragment(@NonNull final JpaToscaServiceTemplate originalTemplate, @NonNull final JpaToscaServiceTemplate fragmentTemplate) { -- 2.16.6