Refactor Apex benchmark tests

Apex performance tests are refactored and reorganised
to be all in the one place and to be coherent.

A test REST server that can generate events in batches
is introduced and this can be configured to respond to REST
calls from Apex with various batch sizes that can be varied
for performance tests.

Actual performance tests are added for the various executors
in Apex.

Change-Id: I692b41e1e4451e821a618c64dead5cc8e9685d08
Issue-ID: POLICY-812
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

7 files changed, 278 insertions, 93 deletions

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index e357290c3..a3ca91cc6 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -17,7 +17,8 @@
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
@@ -167,6 +168,13 @@
             <artifactId>plugins-event-carrier-restrequestor</artifactId>
             <version>${project.version}</version>
         </dependency>
+        
+        <!-- Benchmark test event generator -->
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
+            <artifactId>performance-benchmark-test</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- Plugins for event protocols -->
         <dependency>
@@ -289,6 +297,15 @@
                                     <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
+                                    <artifactId>performance-benchmark-test</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>examples/**/*</includes>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <artifactId>examples-aadm</artifactId>
                                     <version>${project.version}</version>
@@ -481,7 +498,9 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <untar src="${project.build.directory}/${project.artifactId}-${project.version}-tarball.tar.gz" dest="${project.build.directory}/install_hierarchy" compression="gzip" />
+                                <untar
+                                    src="${project.build.directory}/${project.artifactId}-${project.version}-tarball.tar.gz"
+                                    dest="${project.build.directory}/install_hierarchy" compression="gzip" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
index d5ac0532c..848498b1e 100644
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
@@ -81,6 +81,7 @@ set APEX_APP_MAP[engine]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logbac
 set APEX_APP_MAP[eng-deployment]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-deployment-%_VERSION%-deployment.jar
 set APEX_APP_MAP[eng-monitoring]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-monitoring-%_VERSION%-monitoring.jar
 set APEX_APP_MAP[full-client]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-full-%_VERSION%-full.jar
+set APEX_APP_MAP[event-generator]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator
 
 :: array of applications with name=description
 :: declare -A APEX_APP_DESCR_MAP
@@ -94,7 +95,7 @@ set APEX_APP_DESCR_MAP[engine]=starts the APEX engine
 set APEX_APP_DESCR_MAP[eng-deployment]=starts the APEX deployment client in a simple webserver
 set APEX_APP_DESCR_MAP[eng-monitoring]=starts the APEX engine monitoring client in a simple webserver
 set APEX_APP_DESCR_MAP[full-client]=starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver
-
+set APEX_APP_DESCR_MAP["event-generator"]=starts the event generator in a simple webserver for performance testing
 
 :: no command line means help, -h means help
 if "%1" == "" goto Help
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
index 3316e8e1c..c5569baaa 100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -90,6 +90,7 @@ APEX_APP_MAP["engine"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.
 APEX_APP_MAP["eng-deployment"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-deployment-$_version-deployment.jar"
 APEX_APP_MAP["eng-monitoring"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-monitoring-$_version-monitoring.jar"
 APEX_APP_MAP["full-client"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-full-$_version-full.jar"
+APEX_APP_MAP["event-gen"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator"
 
 ## array of applications with name=description
 declare -A APEX_APP_DESCR_MAP
@@ -103,6 +104,7 @@ APEX_APP_DESCR_MAP["engine"]="starts the APEX engine"
 APEX_APP_DESCR_MAP["eng-deployment"]="starts the APEX deployment client in a simple webserver"
 APEX_APP_DESCR_MAP["eng-monitoring"]="starts the APEX engine monitoring client in a simple webserver"
 APEX_APP_DESCR_MAP["full-client"]="starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver"
+APEX_APP_DESCR_MAP["event-generator"]="starts the event generator in a simple webserver for performance testing"
 
 ##
 ## Help screen and exit condition (i.e. too few arguments)
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/runBenchmark.sh b/packages/apex-pdp-package-full/src/main/package/scripts/runBenchmark.sh
new file mode 100644
index 000000000..08c8d181f
--- /dev/null
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/runBenchmark.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+#-------------------------------------------------------------------------------
+# ============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=========================================================
+#-------------------------------------------------------------------------------
+
+if [ -z $APEX_HOME ]
+then
+    APEX_HOME="/opt/app/policy/apex-pdp"
+fi
+
+if [ ! -d $APEX_HOME ]
+then
+    echo
+    echo 'Apex directory "'$APEX_HOME'" not set or not a directory'
+    echo "Please set environment for 'APEX_HOME'"
+    exit
+fi
+
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 01
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 02
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 04
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 08
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 16
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 32
+$APEX_HOME/bin/runOneBenchmark.sh Javascript 64
+
+$APEX_HOME/bin/runOneBenchmark.sh Jython 01
+$APEX_HOME/bin/runOneBenchmark.sh Jython 02
+$APEX_HOME/bin/runOneBenchmark.sh Jython 04
+$APEX_HOME/bin/runOneBenchmark.sh Jython 08
+$APEX_HOME/bin/runOneBenchmark.sh Jython 16
+$APEX_HOME/bin/runOneBenchmark.sh Jython 32
+$APEX_HOME/bin/runOneBenchmark.sh Jython 64
+
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 01
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 02
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 04
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 08
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 16
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 32
+$APEX_HOME/bin/runOneBenchmark.sh Mvel 64
+
+$APEX_HOME/bin/runOneBenchmark.sh Java 01
+$APEX_HOME/bin/runOneBenchmark.sh Java 02
+$APEX_HOME/bin/runOneBenchmark.sh Java 04
+$APEX_HOME/bin/runOneBenchmark.sh Java 08
+$APEX_HOME/bin/runOneBenchmark.sh Java 16
+$APEX_HOME/bin/runOneBenchmark.sh Java 32
+$APEX_HOME/bin/runOneBenchmark.sh Java 64
+
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 01
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 02
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 04
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 08
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 16
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 32
+#$APEX_HOME/bin/runOneBenchmark.sh JRuby 64
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/runOneBenchmark.sh b/packages/apex-pdp-package-full/src/main/package/scripts/runOneBenchmark.sh
new file mode 100755
index 000000000..2e81bd29d
--- /dev/null
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/runOneBenchmark.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+#-------------------------------------------------------------------------------
+# ============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=========================================================
+#-------------------------------------------------------------------------------
+
+if [ -z $APEX_HOME ]
+then
+    APEX_HOME="/opt/app/policy/apex-pdp"
+fi
+
+if [ ! -d $APEX_HOME ]
+then
+    echo
+    echo 'Apex directory "'$APEX_HOME'" not set or not a directory'
+    echo "Please set environment for 'APEX_HOME'"
+    exit
+fi
+
+if [ $# -ne 2 ]
+then
+    echo "usage: $0 executor-type thread-count"
+    echo "  executor-type [Javascript|Jython|JRuby|Mvel|Java]"
+    echo "  thread-count [01|02|04|08|16|32|64]"
+    exit 1
+fi
+
+if [ "$1" != "Javascript" ] && [ "$1" != "Jython" ] && [ "$1" != "JRuby" ] && [ "$1" != "Mvel" ] && [ "$1" != "Java" ]
+then
+   echo "executor-type must be a member of the set [Javascript|Jython|JRuby|Mvel|Java]"
+   exit 1
+fi
+    
+if [ "$2" != "01" ] && [ "$2" != "02" ] && [ "$2" != "04" ] && [ "$2" != "08" ] && [ "$2" != "16" ] && [ "$2" != "32" ] && [ "$2" != "64" ]
+then
+    echo "thread-count must be a member of the set [01|02|04|08|16|32|64]"
+   exit 1
+fi
+    
+# Remove the old benchmark test result file if it exists
+rm -fr examples/benchmark/Bm$1$2.json
+
+# Start the event generator
+/bin/bash bin/apexApps.sh event-gen -c examples/benchmark/EventGeneratorConfig.json -o examples/benchmark/Bm$1$2.json > examples/benchmark/Bm$1$2_gen.log 2>&1 &
+
+# Start Apex
+sleep 2
+/bin/bash bin/apexApps.sh engine -c examples/benchmark/$1$2.json > examples/benchmark/Bm$1$2_apex.log 2>&1 &
+apex_pid=`ps -A -o pid,cmd | grep ApexMain | grep -v grep | head -n 1 | awk '{print $1}'`
+
+echo "running benchmark test for executor $1 with $2 threads" 
+
+# Loop until result file exists
+while [ ! -f examples/benchmark/Bm$1$2.json ]
+do
+    echo -n .
+    sleep 1
+done
+
+# Loop until result file has 318 lines
+while [ "$(wc -l examples/benchmark/Bm$1$2.json | cut -f1 -d' ')" -lt 318 ]
+do
+    echo -n .
+    sleep 1
+done
+
+# Kill Apex
+kill $apex_pid
+
+sleep 5
+
+echo ""
+echo "Finished"
diff --git a/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml b/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
index f90c53c51..b0847f295 100644
--- a/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
@@ -32,19 +32,19 @@
             </multicast>
             <tcp-ip enabled="true">
                 <members>10.0.0.1</members>
-				<!-- members>192.168.219.141</members-->
+                <!-- members>192.168.219.141</members-->
             </tcp-ip>
         </join>
         <interfaces enabled="false">
-			<!-- This value will allow hazelcast to run locally from the IDE -->
+            <!-- This value will allow hazelcast to run locally from the IDE -->
             <interface>127.0.0.*</interface>
         </interfaces>
     </network>
     <properties>
         <property name="hazelcast.icmp.enabled">true</property>
         <property name="hazelcast.logging.type">slf4j</property>
-		<!-- disable the hazelcast shutdown hook - prefer to control the shutdown 
-			in code -->
+        <!-- disable the hazelcast shutdown hook - prefer to control the shutdown 
+            in code -->
         <property name="hazelcast.shutdownhook.enabled">false</property>
         <property name="hazelcast.graceful.shutdown.max.wait">60</property>
     </properties>
@@ -52,59 +52,59 @@
         <pool-size>16</pool-size>
     </executor-service>
     <queue name="default">
-		<!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
-		<!-- Maximum number of seconds for each item to stay in the queue. Items 
-			that are not consumed in <time-to-live-seconds> will automatically get evicted 
-			from the queue. Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. 
-			Default is 0. -->
+        <!-- Maximum number of seconds for each item to stay in the queue. Items 
+            that are not consumed in <time-to-live-seconds> will automatically get evicted 
+            from the queue. Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. 
+            Default is 0. -->
     </queue>
     <map name="default">
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
+        <!-- Number of backups. If 1 is set as the backup-count for example, then 
+            all entries of the map will be copied to another JVM for fail-safety. Valid 
+            numbers are 0 (no backup), 1, 2, 3. -->
         <backup-count>1</backup-count>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
+        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
+            (Least Frequiently Used). NONE is the default. -->
         <eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the map. When max size is reached, map is evicted 
+            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>0</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
+        <!-- When max. size is reached, specified percentage of the map will be 
+            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
+            the entries will get evicted. -->
         <eviction-percentage>25</eviction-percentage>
     </map>
 
     <map name="CommonCache">
 
 
-		<!-- Number of async-backups. If 1 is set as the backup-count for example, 
-			then all entries of the map will be copied to another JVM for fail-safety. 
-			Valid numbers are 0 (no backup), 1, 2, 3. -->
+        <!-- Number of async-backups. If 1 is set as the backup-count for example, 
+            then all entries of the map will be copied to another JVM for fail-safety. 
+            Valid numbers are 0 (no backup), 1, 2, 3. -->
         <async-backup-count>1</async-backup-count>
 
-		<!-- Can we read the local backup entries? Default value is false for strong 
-			consistency. Being able to read backup data will give you greater performance. -->
+        <!-- Can we read the local backup entries? Default value is false for strong 
+            consistency. Being able to read backup data will give you greater performance. -->
         <read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
+        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
+            (Least Frequiently Used). NONE is the default. -->
         <eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the map. When max size is reached, map is evicted 
+            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>3000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
+        <!-- When max. size is reached, specified percentage of the map will be 
+            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
+            the entries will get evicted. -->
         <eviction-percentage>5</eviction-percentage>
 
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
+        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
+            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
+            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means infinite. Default is 0. -->
         <time-to-live-seconds>7200</time-to-live-seconds>
 
 
@@ -113,45 +113,45 @@
     <map name="CommonDataCache">
 
 
-		<!-- Number of async-backups. If 1 is set as the backup-count for example, 
-			then all entries of the map will be copied to another JVM for fail-safety. 
-			Valid numbers are 0 (no backup), 1, 2, 3. -->
+        <!-- Number of async-backups. If 1 is set as the backup-count for example, 
+            then all entries of the map will be copied to another JVM for fail-safety. 
+            Valid numbers are 0 (no backup), 1, 2, 3. -->
         <async-backup-count>1</async-backup-count>
 
-		<!-- Can we read the local backup entries? Default value is false for strong 
-			consistency. Being able to read backup data will give you greater performance. -->
+        <!-- Can we read the local backup entries? Default value is false for strong 
+            consistency. Being able to read backup data will give you greater performance. -->
         <read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
+        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
+            (Least Frequiently Used). NONE is the default. -->
         <eviction-policy>LRU</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the map. When max size is reached, map is evicted 
+            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>3000000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
+        <!-- When max. size is reached, specified percentage of the map will be 
+            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
+            the entries will get evicted. -->
         <eviction-percentage>5</eviction-percentage>
 
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
+        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
+            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
+            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means infinite. Default is 0. -->
         <time-to-live-seconds>7200</time-to-live-seconds>
 
     </map>
 
 
     <queue name="raw-distributer-queue">
-		<!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
     </queue>
     <map name="queue-map">
 
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
+        <!-- Number of backups. If 1 is set as the backup-count for example, then 
+            all entries of the map will be copied to another JVM for fail-safety. Valid 
+            numbers are 0 (no backup), 1, 2, 3. -->
         <backup-count>0</backup-count>
 
     </map>
@@ -161,24 +161,24 @@
         <async-backup-count>3</async-backup-count>
 
         <read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
+        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
+            (Least Frequiently Used). NONE is the default. -->
         <eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the map. When max size is reached, map is evicted 
+            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>1000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
+        <!-- When max. size is reached, specified percentage of the map will be 
+            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
+            the entries will get evicted. -->
         <eviction-percentage>0</eviction-percentage>
 
 
 
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
+        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
+            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
+            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means infinite. Default is 0. -->
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
     <map name="TOPIC-REGISTRY">
@@ -186,34 +186,34 @@
         <async-backup-count>3</async-backup-count>
 
         <read-backup-data>true</read-backup-data>
-		<!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-			(Least Frequiently Used). NONE is the default. -->
+        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
+            (Least Frequiently Used). NONE is the default. -->
         <eviction-policy>NONE</eviction-policy>
-		<!-- Maximum size of the map. When max size is reached, map is evicted 
-			based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the map. When max size is reached, map is evicted 
+            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>1000</max-size>
-		<!-- When max. size is reached, specified percentage of the map will be 
-			evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-			the entries will get evicted. -->
+        <!-- When max. size is reached, specified percentage of the map will be 
+            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
+            the entries will get evicted. -->
         <eviction-percentage>0</eviction-percentage>
 
-		<!-- Maximum number of seconds for each entry to stay in the map. Entries 
-			that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-			will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-			0 means infinite. Default is 0. -->
+        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
+            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
+            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
+            0 means infinite. Default is 0. -->
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
     <queue name="Pooled-Topic-Request-Queue">
-		<!-- Maximum size of the queue.Any integer between 0 and Integer.MAX_VALUE. 
-			0 means Integer.MAX_VALUE. Default is 0. -->
+        <!-- Maximum size of the queue.Any integer between 0 and Integer.MAX_VALUE. 
+            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
     </queue>
     <map name="Pooled-Topic-Request-Queue-Backup-map">
 
-		<!-- Number of backups. If 1 is set as the backup-count for example, then 
-			all entries of the map will be copied to another JVM for fail-safety. Valid 
-			numbers are 0 (no backup), 1, 2, 3. -->
+        <!-- Number of backups. If 1 is set as the backup-count for example, then 
+            all entries of the map will be copied to another JVM for fail-safety. Valid 
+            numbers are 0 (no backup), 1, 2, 3. -->
         <backup-count>1</backup-count>
         <eviction-policy>NONE</eviction-policy>
         <time-to-live-seconds>0</time-to-live-seconds>
diff --git a/packages/apex-pdp-package-full/src/main/resources/logback.xml b/packages/apex-pdp-package-full/src/main/resources/logback.xml
index 42502b1ab..b96a37686 100644
--- a/packages/apex-pdp-package-full/src/main/resources/logback.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/logback.xml
@@ -25,7 +25,7 @@
     <contextName>Apex</contextName>
     <property name="VAR_LOG" value="/var/log/onap/policy/apex-pdp/" />
 
-	<!-- USE FOR STD OUT ONLY -->
+    <!-- USE FOR STD OUT ONLY -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>