aboutsummaryrefslogtreecommitdiffstats
path: root/testsuites/integration/integration-context-test/src/test
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-12-04 09:20:04 +0000
committerliamfallon <liam.fallon@est.tech>2019-12-04 17:14:11 +0000
commit7a0a44eac6167cfeff935c39f2c3f20d3a893c3e (patch)
tree5874e4b8f0e4b5ce8cc222912833029729fe4ed3 /testsuites/integration/integration-context-test/src/test
parent9253f81d14a5217479ca8e59efb198eaa32ec9f0 (diff)
Minor changes for new Eclipse checkstyle checks
The laest Eclipse checkstyle version 8.26.0 does more thorough checking and identified a number of small issues in the apex-pdp codebase. This review fixes those issues. Issue-ID: POLICY-1913 Change-Id: I30ba25e3e425c6d54c77f925e8da3ab841a8357c Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'testsuites/integration/integration-context-test/src/test')
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java4
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java4
-rw-r--r--testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java11
-rw-r--r--testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml101
4 files changed, 65 insertions, 55 deletions
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
index 45ea0fdc4..4abbc2051 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/factory/TestContextAlbumFactory.java
@@ -60,7 +60,9 @@ public final class TestContextAlbumFactory {
/**
* Default constructor to prevent sub-classing.
*/
- private TestContextAlbumFactory() {}
+ private TestContextAlbumFactory() {
+ // Private constructor to block subclassing
+ }
/**
* Creates the policy context model.
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
index 6fdcf6121..bf0c57a5f 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/Constants.java
@@ -68,7 +68,9 @@ public class Constants {
/**
* Instantiates a new constants.
*/
- private Constants() {}
+ private Constants() {
+ // Private constructor to block subclassing
+ }
/**
* Gets the ax artifact key array.
diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
index ac43b7120..30bc8d823 100644
--- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
+++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/utils/NetworkUtils.java
@@ -37,12 +37,14 @@ public class NetworkUtils {
/**
* Instantiates a new network utils.
*/
- private NetworkUtils() {}
+ private NetworkUtils() {
+ // Private constructor to block subclassing
+ }
/**
- * The JGroups IP address must be set to a real (not loopback) IP address for Infinispan to
- * work. In order to ensure that all the JVMs in a test pick up the same IP address, this
- * function sets the address to be the first non-loopback IPv4 address on a host
+ * The JGroups IP address must be set to a real (not loopback) IP address for Infinispan to work. In order to ensure
+ * that all the JVMs in a test pick up the same IP address, this function sets the address to be the first
+ * non-loopback IPv4 address on a host
*
* @return Set of IPv4 addresses
* @throws SocketException throw socket exception if error occurs
@@ -63,5 +65,4 @@ public class NetworkUtils {
return ipAddressSet;
}
-
}
diff --git a/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml b/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml
index a84a737b5..79a3d0633 100644
--- a/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml
+++ b/testsuites/integration/integration-context-test/src/test/resources/infinispan/default-jgroups-udp.xml
@@ -6,23 +6,25 @@
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=========================================================
-->
-<config xmlns="urn:org:jgroups"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
- <UDP mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
+<config
+ xmlns="urn:org:jgroups"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
+ <UDP
+ mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}"
mcast_port="${jgroups.udp.mcast_port:46655}"
bind_port="${jgroups.udp.mcast.bind_port:63005}"
bind_addr="${jgroups.udp.mcast.bind_addr:127.0.0.1}"
@@ -38,45 +40,48 @@
thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
- thread_pool.keep_alive_time="60000"
- />
- <PING />
- <MERGE3 min_interval="10000"
- max_interval="30000"
- />
- <FD_SOCK />
- <FD_SOCK bind_addr="${jgroups.udp.mcast.bind_addr:127.0.0.1}" sock_conn_timeout="60000" start_port="${jgroups.udp.fd.sock.start_port:63010}" port_range="1000"/>
-
- <FD_ALL timeout="60000"
- interval="15000"
- timeout_check_interval="5000"
- />
- <VERIFY_SUSPECT timeout="5000" />
- <pbcast.NAKACK2 xmit_interval="100"
- xmit_table_num_rows="50"
- xmit_table_msgs_per_row="1024"
- xmit_table_max_compaction_time="30000"
- resend_last_seqno="true"
- />
- <UNICAST3 xmit_interval="100"
- xmit_table_num_rows="50"
- xmit_table_msgs_per_row="1024"
- xmit_table_max_compaction_time="30000"
- conn_expiry_timeout="0"
- />
- <pbcast.STABLE stability_delay="500"
- desired_avg_gossip="5000"
- max_bytes="1M"
- />
- <pbcast.GMS print_local_addr="false"
- install_view_locally_first="true"
- join_timeout="${jgroups.join_timeout:5000}"
- />
- <UFC max_credits="2m"
- min_threshold="0.40"
- />
- <MFC max_credits="2m"
- min_threshold="0.40"
- />
- <FRAG3 frag_size="8000"/>
+ thread_pool.keep_alive_time="60000" />
+ <PING />
+ <MERGE3
+ min_interval="10000"
+ max_interval="30000" />
+ <FD_SOCK />
+ <FD_SOCK
+ bind_addr="${jgroups.udp.mcast.bind_addr:127.0.0.1}"
+ sock_conn_timeout="60000"
+ start_port="${jgroups.udp.fd.sock.start_port:63010}"
+ port_range="1000" />
+
+ <FD_ALL
+ timeout="60000"
+ interval="15000"
+ timeout_check_interval="5000" />
+ <VERIFY_SUSPECT timeout="5000" />
+ <pbcast.NAKACK2
+ xmit_interval="100"
+ xmit_table_num_rows="50"
+ xmit_table_msgs_per_row="1024"
+ xmit_table_max_compaction_time="30000"
+ resend_last_seqno="true" />
+ <UNICAST3
+ xmit_interval="100"
+ xmit_table_num_rows="50"
+ xmit_table_msgs_per_row="1024"
+ xmit_table_max_compaction_time="30000"
+ conn_expiry_timeout="0" />
+ <pbcast.STABLE
+ stability_delay="500"
+ desired_avg_gossip="5000"
+ max_bytes="1M" />
+ <pbcast.GMS
+ print_local_addr="false"
+ install_view_locally_first="true"
+ join_timeout="${jgroups.join_timeout:5000}" />
+ <UFC
+ max_credits="2m"
+ min_threshold="0.40" />
+ <MFC
+ max_credits="2m"
+ min_threshold="0.40" />
+ <FRAG3 frag_size="8000" />
</config>