Properties change (#413)

* Update property names and documentation

Author: Christoffer-Cortes

.travis.yml

@@ -31,7 +31,7 @@ jobs:
     - stage: test
       name: unitAndFunctionalTests
       script:
-        - mvn -Dsurefire.rerunFailingTestsCount=2 test -DskipITs -B
+        - mvn test -DskipITs -Dsurefire.rerunFailingTestsCount=2 -Dspring.config.location=src/main/resources/application.properties -B
     - stage: test
       name: integrationTests
       # To ensure docker containers are fully up and running we sleep 60s
@@ -47,4 +47,4 @@ jobs:
       script:
         - mvn cobertura:cobertura -B
         - curl -Ls -o codacy-coverage-reporter-assembly.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/6.0.2/codacy-coverage-reporter-6.0.2-assembly.jar
-        - java -jar codacy-coverage-reporter-assembly.jar report -l Java -r target/site/cobertura/coverage.xml
+        - java -jar codacy-coverage-reporter-assembly.jar report -l Java -r target/site/cobertura/coverage.xml

run_integration_tests_with_replica_sets

@@ -11,7 +11,7 @@ docker_network="docker_eiffel_2.0_1"
 
 test_command="mvn verify \
     -DskipUTs \
-    -Der.url=http://eiffel-er:8080/search/ \
+    -Devent.repository.url=http://eiffel-er:8080/search/ \
     -Drabbitmq.host=$rabbitmg_host \
     -Drabbitmq.exchange.name=ei-exchange \
     -Dspring.data.mongodb.uri=$mongodb_uri \
@@ -21,7 +21,7 @@ test_command="mvn verify \
     -Djenkins.port=$jenkins_port \
     -Dspring.mail.host=$mail_server_host \
     -Dspring.mail.port=1025 \
-    -Dwaitlist.fixedRateResend=1 -B"
+    -Dwaitlist.resend.fixed.rate=1 -B"
 
 function invalid_arguments {
   echo "missing command(s) setup | test"

src/functionaltests/java/com/ericsson/ei/encryption/EncryptionSteps.java

@@ -30,10 +30,11 @@
 import cucumber.api.java.en.When;
 
 @Ignore
-@TestPropertySource(properties = { "spring.data.mongodb.database: EncryptionSteps",
-        "missedNotificationDataBaseName: EncryptionSteps-missedNotifications",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: EncryptionSteps",
+        "failed.notifications.collection.name: EncryptionSteps-missedNotifications",
         "rabbitmq.exchange.name: EncryptionSteps-exchange",
-        "rabbitmq.consumerName: EncryptionSteps-consumer"})
+        "rabbitmq.queue.suffix: EncryptionSteps"})
 public class EncryptionSteps extends FunctionalTestBase {
 
     private static final Logger LOGGER = getLogger(EncryptionSteps.class);

src/functionaltests/java/com/ericsson/ei/notifications/trigger/SubscriptionNotificationSteps.java

@@ -45,10 +45,11 @@
 import cucumber.api.java.en.When;
 
 @Ignore
-@TestPropertySource(properties = { "spring.data.mongodb.database: SubscriptionNotificationSteps",
-        "failed.notification.collection-name: SubscriptionNotificationSteps-failedNotifications",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: SubscriptionNotificationSteps",
+        "failed.notifications.collection.name: SubscriptionNotificationSteps-failedNotifications",
         "rabbitmq.exchange.name: SubscriptionNotificationSteps-exchange",
-        "rabbitmq.consumerName: SubscriptionNotificationSteps-consumer" })
+        "rabbitmq.queue.suffix: SubscriptionNotificationSteps" })
 public class SubscriptionNotificationSteps extends FunctionalTestBase {
 
     private static final Logger LOGGER = getLogger(SubscriptionNotificationSteps.class);
@@ -69,16 +70,16 @@ public class SubscriptionNotificationSteps extends FunctionalTestBase {
     @Value("${email.sender}")
     private String sender;
 
-    @Value("${aggregated.collection.name}")
+    @Value("${aggregations.collection.name}")
     private String aggregatedCollectionName;
 
     @Value("${spring.data.mongodb.database}")
     private String database;
 
-    @Value("${failed.notification.collection-name}")
+    @Value("${failed.notifications.collection.name}")
     private String failedNotificationCollection;
 
-    @Value("${subscription.collection.name}")
+    @Value("${subscriptions.collection.name}")
     private String subscriptionCollection;
 
     @Autowired

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java

@@ -43,13 +43,13 @@
 
 @Ignore
 @TestPropertySource(properties = {
-        "notification.ttl.value:1",
-        "aggregated.collection.ttlValue:1",
-        "notification.failAttempt:1",
+        "failed.notifications.collection.ttl: 1",
+        "aggregations.collection.ttl: 1",
+        "notification.retry: 1",
         "spring.data.mongodb.database: TestTTLSteps",
-        "failed.notification.collection-name: TestTTLSteps-failedNotifications",
+        "failed.notifications.collection.name: TestTTLSteps-failedNotifications",
         "rabbitmq.exchange.name: TestTTLSteps-exchange",
-        "rabbitmq.consumerName: TestTTLStepsConsumer"})
+        "rabbitmq.consumer.name: TestTTLStepsConsumer"})
 public class TestTTLSteps extends FunctionalTestBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(TestTTLSteps.class);
     private static final String BASE_URL = "localhost";
@@ -75,13 +75,13 @@ public class TestTTLSteps extends FunctionalTestBase {
     private MockServerClient mockServerClient;
     private ClientAndServer clientAndServer;
 
-    @Value("${failed.notification.collection-name}")
+    @Value("${failed.notifications.collection.name}")
     private String failedNotificationCollection;
 
     @Value("${spring.data.mongodb.database}")
     private String database;
 
-    @Value("${aggregated.collection.name}")
+    @Value("${aggregations.collection.name}")
     private String collection;
 
     @Autowired

src/functionaltests/java/com/ericsson/ei/query/QueryAggregatedObjectsTestSteps.java

@@ -36,9 +36,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: QueryAggregatedObjectsTestSteps",
-        "failed.notification.collection-name: QueryAggregatedObjectsTestSteps-failedNotifications",
+        "failed.notifications.collection.name: QueryAggregatedObjectsTestSteps-failedNotifications",
         "rabbitmq.exchange.name: QueryAggregatedObjectsTestSteps-exchange",
-        "rabbitmq.consumerName: QueryAggregatedObjectsTestStepsConsumer" })
+        "rabbitmq.queue.suffix: QueryAggregatedObjectsTestSteps" })
 @AutoConfigureMockMvc
 public class QueryAggregatedObjectsTestSteps extends FunctionalTestBase {
 
@@ -72,10 +72,10 @@ public class QueryAggregatedObjectsTestSteps extends FunctionalTestBase {
     @Value("${spring.data.mongodb.database}")
     private String database;
 
-    @Value("${aggregated.collection.name}")
+    @Value("${aggregations.collection.name}")
     private String aggrCollectionName;
 
-    @Value("${failed.notification.collection-name}")
+    @Value("${failed.notifications.collection.name}")
     private String failedNotificationCollectionName;
 
     private String aggrObj;

src/functionaltests/java/com/ericsson/ei/rabbitmq/RabbitMQTestConnectionSteps.java

@@ -38,9 +38,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: RabbitMQTestConnectionSteps",
-        "failed.notification.collection-name: RabbitMQTestConnectionSteps-failedNotifications",
+        "failed.notifications.collection.name: RabbitMQTestConnectionSteps-failedNotifications",
         "rabbitmq.exchange.name: RabbitMQTestConnectionSteps-exchange",
-        "rabbitmq.consumerName: RabbitMQTestConnectionStepsConsumer" })
+        "rabbitmq.queue.suffix: RabbitMQTestConnectionSteps" })
 public class RabbitMQTestConnectionSteps extends FunctionalTestBase {
 
     @Value("${rabbitmq.port}")

src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestSteps.java

@@ -22,9 +22,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: RestEndpointsTestSteps",
-        "failed.notification.collection-name: RestEndpointsTestSteps-failedNotifications",
+        "failed.notifications.collection.name: RestEndpointsTestSteps-failedNotifications",
         "rabbitmq.exchange.name: RestEndpointsTestSteps-exchange",
-        "rabbitmq.consumerName: RestEndpointsTestStepsConsumer" })
+        "rabbitmq.queue.suffix: RestEndpointsTestSteps" })
 @AutoConfigureMockMvc
 public class RestEndpointsTestSteps extends FunctionalTestBase {
 

src/functionaltests/java/com/ericsson/ei/rules/RuleTestSteps.java

@@ -28,9 +28,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: RuleTestSteps",
-        "failed.notification.collection-name: RuleTestSteps-failedNotifications",
+        "failed.notifications.collection.name: RuleTestSteps-failedNotifications",
         "rabbitmq.exchange.name: RuleTestSteps-exchange",
-        "rabbitmq.consumerName: RuleTestStepsConsumer" })
+        "rabbitmq.queue.suffix: RuleTestSteps" })
 public class RuleTestSteps extends FunctionalTestBase {
 
     private static final String TEST_RESOURCES_PATH = "src/test/resources";

src/functionaltests/java/com/ericsson/ei/rules/RulesHandlerSteps.java

@@ -23,9 +23,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: RulesHandlerSteps",
-        "failed.notification.collection-name: RulesHandlerSteps-failedNotifications",
+        "failed.notifications.collection.name: RulesHandlerSteps-failedNotifications",
         "rabbitmq.exchange.name: RulesHandlerSteps-exchange",
-        "rabbitmq.consumerName: RulesHandlerStepsConsumer" })
+        "rabbitmq.queue.suffix: RulesHandlerSteps" })
 public class RulesHandlerSteps {
 
     private ClientAndServer restServer;

src/functionaltests/java/com/ericsson/ei/scaling/ScalingAndFailoverSteps.java

@@ -42,9 +42,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: ScalingAndFailoverSteps",
-        "failed.notification.collection-name: ScalingAndFailoverSteps-failedNotifications",
+        "failed.notifications.collection.name: ScalingAndFailoverSteps-failedNotifications",
         "rabbitmq.exchange.name: ScalingAndFailoverSteps-exchange",
-        "rabbitmq.consumerName: ScalingAndFailoverStepsConsumer" })
+        "rabbitmq.queue.suffix: ScalingAndFailoverSteps" })
 @AutoConfigureMockMvc
 public class ScalingAndFailoverSteps extends FunctionalTestBase {
     private static final String EVENT_DUMMY = "src/functionaltests/resources/scale_and_failover_dummy.json";
@@ -155,8 +155,8 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon
                     Collections.singletonMap("rabbitmq.exchange.name", "ScalingAndFailoverSteps-exchange"));
             configurableApplicationContext.getEnvironment().getPropertySources().addFirst(ps1);
 
-            PropertySource ps2 = new MapPropertySource("rabbitmq.consumerName",
-                    Collections.singletonMap("rabbitmq.consumerName", "ScalingAndFailoverStepsConsumer"));
+            PropertySource ps2 = new MapPropertySource("rabbitmq.queue.suffix",
+                    Collections.singletonMap("rabbitmq.queue.suffix", "ScalingAndFailoverSteps"));
             configurableApplicationContext.getEnvironment().getPropertySources().addFirst(ps2);
 
             int port = SocketUtils.findAvailableTcpPort();

src/functionaltests/java/com/ericsson/ei/status/StatusTestSteps.java

@@ -30,9 +30,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: StatusSteps",
-        "failed.notification.collection-name: StatusSteps-missedNotifications",
+        "failed.notifications.collection.name: StatusSteps-missedNotifications",
         "rabbitmq.exchange.name: StatusSteps-exchange",
-        "rabbitmq.consumerName: StatusSteps-Consumer" })
+        "rabbitmq.queue.suffix: StatusSteps" })
 public class StatusTestSteps extends FunctionalTestBase {
 
     private static final String RABBITMQ_KEY = "rabbitMQStatus";

src/functionaltests/java/com/ericsson/ei/subscriptions/authentication/AuthenticationSteps.java

@@ -41,9 +41,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: AuthenticationSteps",
-        "failed.notification.collection-name: AuthenticationSteps-failedNotifications",
+        "failed.notifications.collection.name: AuthenticationSteps-failedNotifications",
         "rabbitmq.exchange.name: AuthenticationSteps-exchange",
-        "rabbitmq.consumerName: AuthenticationStepsConsumer",
+        "rabbitmq.queue.suffix: AuthenticationSteps",
         "ldap.enabled: true" })
 public class AuthenticationSteps extends FunctionalTestBase {
 

src/functionaltests/java/com/ericsson/ei/subscriptions/bulk/SubscriptionBulkSteps.java

@@ -25,10 +25,10 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: SubscriptionBulkSteps",
-        "failed.notification.collection-name: SubscriptionBulkSteps-failedNotifications",
+        "failed.notifications.collection.name: SubscriptionBulkSteps-failedNotifications",
         "rabbitmq.exchange.name: SubscriptionBulkSteps-exchange",
-        "rabbitmq.consumerName: SubscriptionBulkStepsConsumer",
-        "logging.level.com.ericsson.ei.subscriptions.bulk=OFF" })
+        "rabbitmq.queue.suffix: SubscriptionBulkSteps",
+        "logging.level.com.ericsson.ei.subscriptions.bulk: OFF" })
 public class SubscriptionBulkSteps extends FunctionalTestBase {
 
     private static final String TEST_RESOURCES_PATH = "src/functionaltests/resources";

src/functionaltests/java/com/ericsson/ei/subscriptions/content/SubscriptionContentSteps.java

@@ -28,9 +28,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: SubscriptionContentSteps",
-        "failed.notification.collection-name: SubscriptionContentSteps-failedNotifications",
+        "failed.notifications.collection.name: SubscriptionContentSteps-failedNotifications",
         "rabbitmq.exchange.name: SubscriptionContentSteps-exchange",
-        "rabbitmq.consumerName: SubscriptionContentStepsConsumer" })
+        "rabbitmq.queue.suffix: SubscriptionContentSteps" })
 public class SubscriptionContentSteps extends FunctionalTestBase {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SubscriptionContentSteps.class);

src/functionaltests/java/com/ericsson/ei/subscriptions/crud/SubscriptionCRUDSteps.java

@@ -30,9 +30,9 @@
 @Ignore
 @TestPropertySource(properties = {
         "spring.data.mongodb.database: SubscriptionCRUDSteps",
-        "failed.notification.collection-name: SubscriptionCRUDSteps-failedNotifications",
+        "failed.notifications.collection.name: SubscriptionCRUDSteps-failedNotifications",
         "rabbitmq.exchange.name: SubscriptionCRUDSteps-exchange",
-        "rabbitmq.consumerName: SubscriptionCRUDSteps" })
+        "rabbitmq.queue.suffix: SubscriptionCRUDSteps" })
 @AutoConfigureMockMvc
 public class SubscriptionCRUDSteps extends FunctionalTestBase {
 

src/functionaltests/java/com/ericsson/ei/subscriptions/repeatHandler/SubscriptionRepeatHandlerSteps.java

@@ -40,11 +40,11 @@
 
 @Ignore
 @TestPropertySource(properties = {
-        "rules.path=src/test/resources/TestExecutionObjectRules.json",
+        "rules.path: src/test/resources/TestExecutionObjectRules.json",
         "spring.data.mongodb.database: SubscriptionRepeatHandlerSteps",
-        "failed.notification.collection-name: SubscriptionRepeatHandlerSteps-failedNotifications",
+        "failed.notifications.collection.name: SubscriptionRepeatHandlerSteps-failedNotifications",
         "rabbitmq.exchange.name: SubscriptionRepeatHandlerSteps-exchange",
-        "rabbitmq.consumerName: SubscriptionRepeatHandlerStepsConsumer" })
+        "rabbitmq.consumer.name: SubscriptionRepeatHandlerStepsConsumer" })
 public class SubscriptionRepeatHandlerSteps extends FunctionalTestBase {
 
     private static final String AGGREGATED_OBJECT_FILE_PATH = "src/functionaltests/resources/aggregatedObject.json";
@@ -61,13 +61,13 @@ public class SubscriptionRepeatHandlerSteps extends FunctionalTestBase {
     private MongoCondition subscriptionIdMatchedAggrIdObjQuery;
     private ObjectMapper mapper = new ObjectMapper();
 
-    @Value("${aggregated.collection.name}")
+    @Value("${aggregations.collection.name}")
     private String collectionName;
 
     @Value("${spring.data.mongodb.database}")
     private String dataBaseName;
 
-    @Value("${subscription.collection.repeatFlagHandlerName}")
+    @Value("${subscriptions.repeat.handler.collection.name}")
     private String repeatFlagHandlerCollection;
 
     @LocalServerPort

src/functionaltests/java/com/ericsson/ei/templates/TemplatesTestSteps.java

@@ -26,9 +26,10 @@
 import cucumber.api.java.en.Then;
 
 @Ignore
-@TestPropertySource(properties = {"spring.data.mongodb.database: TemplatesTestSteps",
+@TestPropertySource(properties = {
+        "spring.data.mongodb.database: TemplatesTestSteps",
         "rabbitmq.exchange.name: TemplatesTestSteps-exchange",
-        "rabbitmq.consumerName: TemplatesTestStepsConsumer" })
+        "rabbitmq.queue.suffix: TemplatesTestSteps" })
 @AutoConfigureMockMvc
 public class TemplatesTestSteps extends FunctionalTestBase {
 

src/functionaltests/java/com/ericsson/ei/threadingAndWaitlistRepeat/ThreadingAndWaitlistRepeatSteps.java

@@ -26,17 +26,18 @@
 import cucumber.api.java.en.Then;
 
 @TestPropertySource(properties = {
-        "threads.corePoolSize= 3",
-        "threads.queueCapacity= 1",
-        "threads.maxPoolSize= 4",
-        "waitlist.collection.ttlValue: 60",
-        "waitlist.initialDelayResend= 500",
-        "waitlist.fixedRateResend= 1000",
+        "threads.core.pool.size: 3",
+        "threads.queue.capacity: 1",
+        "threads.max.pool.size: 4",
+        "waitlist.collection.ttl: 60",
+        "waitlist.resend.initial.delay: 500",
+        "waitlist.resend.fixed.rate: 1000",
         "spring.data.mongodb.database: ThreadingAndWaitlistRepeatSteps",
-        "failed.notification.collection-name: ThreadingAndWaitlistRepeatSteps-failedNotifications",
+        "failed.notifications.collection.name: ThreadingAndWaitlistRepeatSteps-failedNotifications",
         "rabbitmq.exchange.name: ThreadingAndWaitlistRepeatSteps-exchange",
-        "rabbitmq.consumerName: ThreadingAndWaitlistRepeatStepsConsumer", "logging.level.com.ericsson.ei.waitlist=OFF",
-        "logging.level.com.ericsson.ei.handlers.EventHandler=OFF" })
+        "rabbitmq.queue.suffix: ThreadingAndWaitlistRepeatSteps",
+        "logging.level.com.ericsson.ei.waitlist: OFF",
+        "logging.level.com.ericsson.ei.handlers.EventHandler: OFF" })
 
 @Ignore
 public class ThreadingAndWaitlistRepeatSteps extends FunctionalTestBase {
@@ -46,13 +47,13 @@ public class ThreadingAndWaitlistRepeatSteps extends FunctionalTestBase {
     @Autowired
     private Environment environment;
 
-    @Value("${threads.corePoolSize}")
+    @Value("${threads.core.pool.size}")
     private int corePoolSize;
-    @Value("${threads.queueCapacity}")
+    @Value("${threads.queue.capacity}")
     private int queueCapacity;
-    @Value("${threads.maxPoolSize}")
+    @Value("${threads.max.pool.size}")
     private int maxPoolSize;
-    @Value("${waitlist.collection.ttlValue}")
+    @Value("${waitlist.collection.ttl}")
     private int waitlistTtl;
 
     private RulesObject rulesObject;

src/functionaltests/java/com/ericsson/ei/utils/DataBaseManager.java

@@ -29,16 +29,16 @@ public class DataBaseManager {
     @Value("${spring.data.mongodb.database}")
     private String database;
 
-    @Value("${event_object_map.collection.name}")
+    @Value("${event.object.map.collection.name}")
     private String eventObjectCollectionName;
 
-    @Value("${aggregated.collection.name}")
+    @Value("${aggregations.collection.name}")
     private String aggregatedCollectionName;
 
     @Value("${waitlist.collection.name}")
     private String waitlistCollectionName;
 
-    @Value("${subscription.collection.name}")
+    @Value("${subscriptions.collection.name}")
     private String subscriptionCollectionName;
 
     @Getter

src/functionaltests/java/com/ericsson/ei/utils/TestConfigs.java

@@ -34,8 +34,8 @@ protected static void createAmqpBroker() throws Exception {
         System.setProperty("rabbitmq.port", Integer.toString(port));
         System.setProperty("rabbitmq.user", "guest");
         System.setProperty("rabbitmq.password", "guest");
-        System.setProperty("waitlist.initialDelayResend", "500");
-        System.setProperty("waitlist.fixedRateResend", "3000");
+        System.setProperty("waitlist.resend.initial.delay", "500");
+        System.setProperty("waitlist.resend.fixed.rate", "3000");
 
         String config = "src/functionaltests/resources/configs/qpidConfig.json";
         File qpidConfig = new File(config);