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>

2 files changed, 90 insertions, 90 deletions

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>