From ea736d0c60f042d4e6255136da789724ee178193 Mon Sep 17 00:00:00 2001
From: ramverma <ram.krishna.verma@ericsson.com>
Date: Thu, 29 Nov 2018 13:47:30 +0000
Subject: Fixing issues in apex documents

Change-Id: Ibc07c20fa8ac1018443a3c061613fdaecc5efb83
Issue-ID: POLICY-1280
Signed-off-by: ramverma <ram.krishna.verma@ericsson.com>
---
 .../client-editor/src/main/assembly/resources.xml  | 32 ++++++++++++++++++++++
 .../editor/rest/handling/RestCommandHandler.java   | 30 ++++++++++----------
 2 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 client/client-editor/src/main/assembly/resources.xml

(limited to 'client/client-editor/src')

diff --git a/client/client-editor/src/main/assembly/resources.xml b/client/client-editor/src/main/assembly/resources.xml
new file mode 100644
index 000000000..0205c3d5d
--- /dev/null
+++ b/client/client-editor/src/main/assembly/resources.xml
@@ -0,0 +1,32 @@
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2018 Ericsson. All rights reserved.
+  ================================================================================
+  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=========================================================
+-->
+<assembly>
+    <id>resources</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>target/classes/webapp</directory>
+            <outputDirectory>editor</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java
index 5921c8960..968a98572 100644
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java
+++ b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java
@@ -5,15 +5,15 @@
  * 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=========================================================
  */
@@ -38,7 +38,7 @@ public interface RestCommandHandler {
      * @return the apex api result the result of the execution
      */
     public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command);
+            final RestCommand command);
 
     /**
      * Process a REST command.
@@ -50,7 +50,7 @@ public interface RestCommandHandler {
      * @return the apex api result the result of the execution
      */
     public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString);
+            final RestCommand command, final String jsonString);
 
     /**
      * Process a REST command.
@@ -63,7 +63,7 @@ public interface RestCommandHandler {
      * @return the apex api result the result of the execution
      */
     public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version);
+            final RestCommand command, final String name, final String version);
 
     /**
      * Get an unsupported command result message.
@@ -71,16 +71,17 @@ public interface RestCommandHandler {
      * @param session the Apex editor session
      * @param commandType the type of REST command to execute
      * @param command the REST command to execute
+     * @return the apex api result the result of the execution
      */
     public default ApexApiResult getUnsupportedCommandResultMessage(final RestSession session,
-                    final RestCommandType commandType, final RestCommand command) {
+            final RestCommandType commandType, final RestCommand command) {
         return new ApexApiResult(Result.FAILED, "session " + session.getSessionId() + ", command type " + commandType
-                        + ", command" + command + " invalid");
+                + ", command" + command + " invalid");
     }
-    
+
     /**
      * Convert blank incoming fields to nulls.
-     * 
+     *
      * @param incomingField the field to check
      * @return null if the field is blank, otherwise, the field trimmed
      */
@@ -88,13 +89,12 @@ public interface RestCommandHandler {
         if (incomingField == null) {
             return null;
         }
-        
-        String trimmedField = incomingField.trim();
-        
+
+        final String trimmedField = incomingField.trim();
+
         if (trimmedField.isEmpty()) {
             return null;
-        }
-        else {
+        } else {
             return trimmedField;
         }
     }
-- 
cgit 1.2.3-korg