From 04561e175d3fde166c0f54e4dcd276e347340bde Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 24 Jun 2021 17:01:11 +0100 Subject: Update apex-pdp for checkstyle 8.43 Issue-ID: POLICY-3206 Change-Id: I3873c85aab577e85a9ae6b610c3871ee4de6ea53 Signed-off-by: liamfallon --- .../onap/policy/apex/model/basicmodel/concepts/AxModel.java | 2 +- .../onap/policy/apex/model/policymodel/concepts/AxState.java | 4 ++-- .../onap/policy/apex/model/policymodel/concepts/AxTask.java | 6 +++--- .../impl/jsonprotocolplugin/Apex2JsonEventConverter.java | 2 +- .../apex/service/engine/main/ApexEngineServiceHandler.java | 3 +-- .../onap/policy/apex/service/parameters/ApexParameters.java | 4 ++-- .../RestPluginCarrierTechnologyParameters.java | 4 ++-- .../apex/services/onappf/handler/PdpUpdateMessageHandler.java | 1 - .../integration/uservice/adapt/file/TestFile2File.java | 4 ++-- .../uservice/adapt/file/TestFile2FileFiltered.java | 4 ++-- .../integration/uservice/adapt/file/TestFile2FileIgnore.java | 4 ++-- .../model/generator/model2event/Model2JsonEventSchema.java | 11 +++++++---- 12 files changed, 25 insertions(+), 24 deletions(-) diff --git a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java index 4898b6d76..b29743c0b 100644 --- a/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java +++ b/model/basic-model/src/main/java/org/onap/policy/apex/model/basicmodel/concepts/AxModel.java @@ -279,7 +279,7 @@ public class AxModel extends AxConcept { /** * Check for consistent usage of a reference key in the model. * - * @param artifactKey The reference key to check + * @param referenceKey The reference key to check * @param referenceKeySet The set of reference keys encountered so far, this key is appended to the set * @param result The validation result to append to * @return the result of the validation diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java index 80e967fdf..fcc6d995a 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxState.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -937,7 +937,7 @@ public class AxState extends AxConcept { /** * Compare the object fields on this state to another state. * - * @param the other state to compare with + * @param other the other state to compare with * @return the result of the comparison */ private int compareObjectFields(final AxState other) { diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java index 20df8d872..34b35da65 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/concepts/AxTask.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -483,7 +483,7 @@ public class AxTask extends AxConcept { /** * Validate a field. * - * @param key the key of the field to validate + * @param fieldKey the key of the field to validate * @param field the field to validate * @param direction The direction of the field * @param result The validation result to append to @@ -533,7 +533,7 @@ public class AxTask extends AxConcept { /** * Validate a context album reference entry. * - * @param taskParameterEntry the context album reference entry to validate + * @param contextAlbumReference the context album reference entry to validate * @param result The validation result to append to * @return The result of the validation */ diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java index d64d46a7c..56f0d6ba8 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/event/impl/jsonprotocolplugin/Apex2JsonEventConverter.java @@ -466,7 +466,7 @@ public class Apex2JsonEventConverter implements ApexEventProtocolConverter { * Determine the name space field of the event header. * * @param jsonObject the event in JSON format - * @param eventName the name of the event + * @param name the name of the event * @param eventDefinition the definition of the event structure * @return the event version */ diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java index f278fd59d..ca76a53a6 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEngineServiceHandler.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,6 @@ public class ApexEngineServiceHandler { * Instantiates a new engine holder with its engine service and EngDep service. * * @param apexEngineService the apex engine service - * @param engDepService the EngDep service */ ApexEngineServiceHandler(final EngineService apexEngineService) { this.apexEngineService = apexEngineService; diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java index 90c5f43ae..a9ed3265c 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/ApexParameters.java @@ -258,8 +258,8 @@ public class ApexParameters implements ParameterGroup { * * @param handlerMapVariableName the variable name of the map on which the paired parameters are being checked * @param result The result object to which to append any error messages - * @param leftModeParameters The mode parameters being checked - * @param rightModeParameters The mode parameters being referenced by the checked parameters + * @param leftModeParameterMap The mode parameters being checked + * @param rightModeParameterMap The mode parameters being referenced by the checked parameters */ private void validatePeeredModePeers(final String handlerMapVariableName, final BeanValidationResult result, final EventHandlerPeeredMode peeredMode, final Map leftModeParameterMap, diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java index 4e086e809..2c5c4c05a 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -201,7 +201,7 @@ public class RestPluginCarrierTechnologyParameters extends CarrierTechnologyPara /** * Validate the HTTP headers. * - * @param result the result of the validation + * @return the result of the validation */ private ValidationResult validateHttpHeaders() { if (httpHeaders == null) { diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java index 479ec9a72..e6c2c399a 100644 --- a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java +++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/handler/PdpUpdateMessageHandler.java @@ -134,7 +134,6 @@ public class PdpUpdateMessageHandler { * * @param pdpUpdateMsg the pdp update message from pap * @param pdpMessageHandler pdp message handler - * @param pdpStatusContext the pdp status object in memory * @return pdpResponseDetails the pdp response */ private PdpResponseDetails startOrStopApexEngineBasedOnPolicies(final PdpUpdate pdpUpdateMsg, diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java index 63565abdb..ea1e30114 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2File.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020-2021 Nordix Foundation. * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -85,7 +85,7 @@ public class TestFile2File { /** * Strip variable length text from file string. * - * @param textFileAsString the file to read and strip + * @param outFile the file to read and strip * @return the stripped string * @throws IOException on out file read exceptions */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java index a890b8e58..04dcb5704 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileFiltered.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020-2021 Nordix Foundation. * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -133,7 +133,7 @@ public class TestFile2FileFiltered { /** * Strip variable length text from file string. * - * @param textFileAsString the file to read and strip + * @param outFile the file to read and strip * @return the stripped string * @throws IOException on out file read exceptions */ diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java index 328a52a91..1fc98d61b 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/adapt/file/TestFile2FileIgnore.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ public class TestFile2FileIgnore { /** * Strip variable length text from file string. * - * @param textFileAsString the file to read and strip + * @param outFile the file to read and strip * @return the stripped string * @throws IOException on out file read exceptions */ diff --git a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java index 46fba872b..e48c233e2 100644 --- a/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java +++ b/tools/model-generator/src/main/java/org/onap/policy/apex/tools/model/generator/model2event/Model2JsonEventSchema.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -300,7 +301,7 @@ public class Model2JsonEventSchema { /** * Process the state in the response. * @param eventKeys the event keys - * @param policies the policies to process + * @param policy the policy to process */ private void processState(final Set eventKeys, final AxPolicy policy) { for (final AxState state : policy.getStateMap().values()) { @@ -329,10 +330,12 @@ public class Model2JsonEventSchema { /** * Process the internal state. * @param eventKeys the event keys - * @param policies the policies to process + * @param firstState the first state to process + * @param state the state to process */ - private void processInternalState(final Set eventKeys, final String firsState, final AxState state) { - if (state.getKey().getLocalName().equals(firsState)) { + private void processInternalState(final Set eventKeys, final String firstState, + final AxState state) { + if (state.getKey().getLocalName().equals(firstState)) { return; } if ("NULL".equals(state.getNextStateSet().iterator().next())) { -- cgit 1.2.3-korg