Merge "Add test to Holmes"

2 files changed, 28 insertions, 11 deletions

diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/clamp/clds/Application.java
index 4fc68e1d0..0304a6806 100644
--- a/src/main/java/org/onap/clamp/clds/Application.java
+++ b/src/main/java/org/onap/clamp/clds/Application.java
@@ -36,6 +36,8 @@ import javax.ws.rs.client.ClientBuilder;
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
 import org.apache.catalina.connector.Connector;
 import org.camunda.bpm.spring.boot.starter.webapp.CamundaBpmWebappAutoConfiguration;
+import org.onap.clamp.clds.model.prop.Holmes;
+import org.onap.clamp.clds.model.prop.ModelProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
@@ -43,6 +45,7 @@ import org.springframework.boot.actuate.autoconfigure.ManagementWebSecurityAutoC
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -57,8 +60,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
 @ComponentScan(basePackages = { "org.onap.clamp.clds", "com.att.ajsc" })
-@EnableAutoConfiguration(exclude = { CamundaBpmWebappAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JpaRepositoriesAutoConfiguration.class, SecurityAutoConfiguration.class,
+@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, CamundaBpmWebappAutoConfiguration.class,
+        HibernateJpaAutoConfiguration.class, JpaRepositoriesAutoConfiguration.class, SecurityAutoConfiguration.class,
         ManagementWebSecurityAutoConfiguration.class })
 @EnableAsync
 public class Application extends SpringBootServletInitializer {
@@ -92,11 +95,19 @@ public class Application extends SpringBootServletInitializer {
         return application.sources(Application.class);
     }
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
+        // This is to load the system.properties file parameters
         SystemPropertiesLoader.addSystemProperties();
+        // This is to initialize some Onap Clamp components
+        initializeComponents();
+        // Start the Spring application
         SpringApplication.run(Application.class, args); // NOSONAR
     }
 
+    private static void initializeComponents() {
+        ModelProperties.registerModelElement(Holmes.class, Holmes.getType());
+    }
+
     @Bean
     public ServletRegistrationBean servletRegistrationBean() {
         ServletRegistrationBean registration = new ServletRegistrationBean();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a66557835..854fe737d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -64,7 +64,6 @@ server.contextPath=/
 #Modified engine-rest applicationpath

 spring.jersey.application-path=/engine-rest

 spring.profiles.active=clamp-default,clamp-spring-authentication

-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration

 

 #The max number of active threads in this pool

 server.tomcat.max-threads=200

@@ -93,34 +92,41 @@ camel.defaultthreadpool.rejectpolicy=CallerRuns
 kubernetes.namespace=com-att-ajsc

 

 #server.port=0

-

 #Camunda Process Engine DataSource connection Details

 spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver

-spring.datasource.camunda.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100

+spring.datasource.camunda.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true

 spring.datasource.camunda.username=camunda

 spring.datasource.camunda.password=ndMSpw4CAM

 spring.datasource.camunda.validationQuery=SELECT 1

 spring.datasource.camunda.validationQueryTimeout=20000

-spring.datasource.camunda.validationInterval=60000

+spring.datasource.camunda.validationInterval=30000

 spring.datasource.camunda.testWhileIdle = true

+spring.datasource.camunda.minIdle = 0

+spring.datasource.camunda.initialSize=0

 # Automatically test whether a connection provided is good or not

 spring.datasource.camunda.testOnBorrow=true

+spring.datasource.camunda.ignoreExceptionOnPreLoad=true

 

 #Camunda application properties

 #Camunda history level

-camunda.bpm.history-level=auto

+camunda.bpm.history-level=none

+camunda.bpm.database.type=mariadb

+camunda.bpm.database.schema-update=false

 

 #clds datasource connection details

-spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver

-spring.datasource.cldsdb.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100

+spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver

+spring.datasource.cldsdb.url=jdbc:mariadb://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true

 spring.datasource.cldsdb.username=clds

 spring.datasource.cldsdb.password=sidnnd83K

 spring.datasource.cldsdb.validationQuery=SELECT 1

 spring.datasource.cldsdb.validationQueryTimeout=20000

-spring.datasource.cldsdb.validationInterval=60000

+spring.datasource.cldsdb.validationInterval=30000

 spring.datasource.cldsdb.testWhileIdle = true

+spring.datasource.cldsdb.minIdle = 0

+spring.datasource.cldsdb.initialSize=0

 # Automatically test whether a connection provided is good or not

 spring.datasource.cldsdb.testOnBorrow=true

+spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true

 

 #Async Executor default Parameters

 async.core.pool.size=10