From 0fbf039020488215008a2c1fef8a7801bade9177 Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Thu, 20 Jun 2019 09:39:59 +0000 Subject: Enable maven-checkstyle-plugin in apex-pdp Enable maven-checkstyle-plugin in apex-pdp/pom.xml to fail the build at warning level. Fix all the existing check style issues in the component. Change-Id: I4de9c1bd9ca5a2876de9086d2d3526cbdc25c080 Issue-ID: POLICY-1732 Signed-off-by: a.sreekumar --- .../client/editor/rest/handling/EventHandler.java | 13 ++++++------- .../client/editor/rest/handling/ModelHandler.java | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 18 deletions(-) (limited to 'client/client-editor') diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java index 5a9d5bf0b..7c0d795bc 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java @@ -1,19 +1,20 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. 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. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -21,7 +22,6 @@ package org.onap.policy.apex.client.editor.rest.handling; import java.util.Map.Entry; - import org.onap.policy.apex.client.editor.rest.handling.bean.BeanEvent; import org.onap.policy.apex.client.editor.rest.handling.bean.BeanField; import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo; @@ -124,11 +124,10 @@ public class EventHandler implements RestCommandHandler { /** * Create the parameters on an event. - * + * * @param session the Apex editor session * @param jsonbean the JSON bean holding the parameters - * @param result the result of the parameter creation operation - * @return + * @return result the result of the parameter creation operation */ private ApexApiResult createEventParameters(final RestSession session, final BeanEvent jsonbean) { ApexApiResult result = new ApexApiResult(); diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java index 44993ef1e..c865215a5 100644 --- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java +++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java @@ -1,19 +1,20 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. 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. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -23,10 +24,8 @@ package org.onap.policy.apex.client.editor.rest.handling; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; - import java.util.ArrayList; import java.util.List; - import org.onap.policy.apex.client.editor.rest.handling.bean.BeanModel; import org.onap.policy.apex.model.basicmodel.concepts.AxKey; import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo; @@ -321,7 +320,7 @@ public class ModelHandler implements RestCommandHandler { /** * Augment a message with key information. - * + * * @param session the Apex model editing session * @param message The message to augment * @return the augmented message @@ -357,7 +356,7 @@ public class ModelHandler implements RestCommandHandler { /** * Get an embedded JSON object for the given JSON object. - * + * * @param jsonObject the input JSON object * @return the embedded JSON object */ @@ -371,11 +370,11 @@ public class ModelHandler implements RestCommandHandler { /** * Condition a field so its key information can be looked up. - * + * * @param jsonObject the object to query * @param fieldTag the tag of the field to condition * @param fieldValue the value of the field to condition - * @return + * @return field read from the json */ private String readFieldFromJsonObject(final JsonObject jsonObject, final String fieldTag, final String value) { String lookedupValue = value; @@ -392,7 +391,7 @@ public class ModelHandler implements RestCommandHandler { /** * Look up the UUID and description in the key information for a concept. - * + * * @param session the Apex editor session * @param jsonObject the JSON object to place the fields in * @param name the concept name to look up @@ -425,7 +424,7 @@ public class ModelHandler implements RestCommandHandler { /** * Look up the key information for the given concept name and value. - * + * * @param session the Apex editor session * @param name the concept name to look up * @param version the concept version to look up -- cgit 1.2.3-korg