Fixed EI Instance info issues and added some new EI Instance informations. (#116)

* Set Aggregated Rules RestApi to default enabled

* Update application.properties

* Fixed and issue in EI Instance info and added some missing EI Instance Information.

* Removed duplication parameter in application.properties file.

* Fixed indentations.

* Removed passwords character from EI Instance Info object.

Author: tobiasake

src/main/java/com/ericsson/ei/controller/model/ParseInstanceInfoEI.java

@@ -18,7 +18,6 @@
 
 import com.ericsson.ei.erqueryservice.ERQueryService;
 import com.ericsson.ei.handlers.ObjectHandler;
-import com.ericsson.ei.mongodbhandler.MongoDBHandler;
 import com.ericsson.ei.rmqhandler.RmqHandler;
 import com.ericsson.ei.subscriptionhandler.InformSubscription;
 import com.ericsson.ei.subscriptionhandler.SendMail;
@@ -37,21 +36,26 @@
  */
 @Component
 public class ParseInstanceInfoEI {
+	
     @Getter
     @Value("${spring.application.name}")
     private String applicationName;
 
     @Getter
     @Value("${build.version}")
     private String version;
+    
+    @Getter
+    @Value("${testaggregated.enabled:false}")
+    private String testRulesEnabled;
 
     @Getter
     @Autowired
     private List<RmqHandler> rabbitmq;
 
     @Getter
     @Autowired
-    private List<MongoDBHandler> mongodb;
+    private List<MongoDbValues> mongodb;
 
     @Getter
     @Autowired
@@ -60,7 +64,15 @@ public class ParseInstanceInfoEI {
     @Getter
     @Autowired
     private List<SendMail> email;
+    
+    @Getter
+    @Autowired
+    private List<MailServerValues> mailServerValues;
 
+    @Getter
+    @Autowired
+    private LdapValues ldap;
+ 
     @Getter
     @Autowired
     private List<WaitListStorageHandler> waitList;
@@ -80,6 +92,72 @@ public class ParseInstanceInfoEI {
     @Getter
     @Autowired
     private ERQueryService erUrl;
+   
+    public ParseInstanceInfoEI(){
+    }
+    
+    @Component
+    private class MailServerValues {
+        @Getter
+        @Value("${spring.mail.host}")
+        private String host;
+
+        @Getter
+        @Value("${spring.mail.port}")
+        private String port;
+
+        @Getter
+        @Value("${spring.mail.username}")
+        private String username;
+
+        @Getter
+        @Value("${spring.mail.properties.mail.smtp.auth}")
+        private String smtpAuth;
+
+        @Getter
+        @Value("${spring.mail.properties.mail.smtp.starttls.enable}")
+        private String startTls;
+    }
+    
+    @Component
+    private class MongoDbValues {
+        @Getter
+        @Value("${spring.data.mongodb.host}")
+        private String host;
+
+        @Getter
+        @Value("${spring.data.mongodb.port}")
+        private String port;
+
+        @Getter
+        @Value("${spring.data.mongodb.database}")
+        private String database;
+    }
+    
+    @Component
+    private class LdapValues {
+        @Getter
+        @Value("${ldap.enabled}")
+        private String enabled;
+
+        @Getter
+        @Value("${ldap.url}")
+        private String url;
+
+        @Getter
+        @Value("${ldap.base.dn}")
+        private String baseDn;
+        
+        @Getter
+        @Value("${ldap.user.filter}")
+        private String filter;
+        
+        @Getter
+        @Value("${ldap.username}")
+        private String username;
+    }
+
+
 
     @Component
     private class ThreadsValue {

src/main/resources/application.properties

@@ -53,6 +53,9 @@ waitlist.fixedRateResend: 15000
 subscription.collection.name: subscription
 subscription.collection.repeatFlagHandlerName: subscription_repeat_handler
 
+# Need to be set to True to use Test Rules page in EI-Frontend.
+testaggregated.enabled: false
+
 threads.corePoolSize: 100
 threads.queueCapacity: 5000
 threads.maxPoolSize: 150
@@ -67,14 +70,14 @@ notification.ttl.value: 600
 
 spring.mail.host: 
 spring.mail.port:
-#spring.mail.username: 
-#spring.mail.password: 
+spring.mail.username: 
+spring.mail.password: 
 spring.mail.properties.mail.smtp.auth: false
-#spring.mail.properties.mail.smtp.starttls.enable: false
+spring.mail.properties.mail.smtp.starttls.enable: false
 
 er.url: http://localhost:8080/search/
 
-ldap.enabled:false
+ldap.enabled: false
 ldap.url:
 ldap.base.dn:
 ldap.username: