Fix broken spring context in graphadmin

- scan everything under org.onap.aai to get a working spring context

Issue-ID: AAI-4123
Change-Id: I7d96f57109b9acf93b99be737b3bce44bc8a39ca
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/pom.xml b/pom.xml
index 648447a..eed4e41 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -548,6 +548,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+            <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

diff --git a/src/main/java/org/onap/aai/GraphAdminApp.java b/src/main/java/org/onap/aai/GraphAdminApp.java
index 0a5d33d..036f216 100644 (file)
--- a/src/main/java/org/onap/aai/GraphAdminApp.java
+++ b/src/main/java/org/onap/aai/GraphAdminApp.java
@@ -36,6 +36,7 @@ import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfigurati
 import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.core.env.Environment;
@@ -71,6 +72,7 @@ import javax.annotation.PreDestroy;
 @EnableAsync
 @EnableScheduling
 @EnableAspectJAutoProxy
+@EnableConfigurationProperties
 @EnableAutoConfiguration(exclude = {
     DataSourceAutoConfiguration.class,
     HibernateJpaAutoConfiguration.class,

diff --git a/src/main/java/org/onap/aai/config/SecurityConfig.java b/src/main/java/org/onap/aai/config/SecurityConfig.java
index a2872ba..98d6bbd 100644 (file)
--- a/src/main/java/org/onap/aai/config/SecurityConfig.java
+++ b/src/main/java/org/onap/aai/config/SecurityConfig.java
@@ -24,13 +24,14 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.util.AntPathMatcher;
 
 @Configuration
+@EnableWebSecurity
 @ConditionalOnProperty(name = "aai.basic-auth.enabled", havingValue = "true", matchIfMissing = true)
 public class SecurityConfig {
 

diff --git a/src/main/java/org/onap/aai/datagrooming/DataGrooming.java b/src/main/java/org/onap/aai/datagrooming/DataGrooming.java
index d7c36ad..74f4310 100644 (file)
--- a/src/main/java/org/onap/aai/datagrooming/DataGrooming.java
+++ b/src/main/java/org/onap/aai/datagrooming/DataGrooming.java
@@ -298,9 +298,7 @@ public class DataGrooming {
 
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
 

diff --git a/src/main/java/org/onap/aai/datasnapshot/DataSnapshot4HistInit.java b/src/main/java/org/onap/aai/datasnapshot/DataSnapshot4HistInit.java
index fdf81aa..dc60cc1 100644 (file)
--- a/src/main/java/org/onap/aai/datasnapshot/DataSnapshot4HistInit.java
+++ b/src/main/java/org/onap/aai/datasnapshot/DataSnapshot4HistInit.java
@@ -113,9 +113,7 @@ public class DataSnapshot4HistInit {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-          "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/db/schema/ScriptDriver.java b/src/main/java/org/onap/aai/db/schema/ScriptDriver.java
index d71138a..b020dd9 100644 (file)
--- a/src/main/java/org/onap/aai/db/schema/ScriptDriver.java
+++ b/src/main/java/org/onap/aai/db/schema/ScriptDriver.java
@@ -60,8 +60,7 @@ public class ScriptDriver {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
 

diff --git a/src/main/java/org/onap/aai/dbgen/DupeTool.java b/src/main/java/org/onap/aai/dbgen/DupeTool.java
index d65ae25..db53caf 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/DupeTool.java
+++ b/src/main/java/org/onap/aai/dbgen/DupeTool.java
@@ -466,9 +466,7 @@ public class DupeTool {
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
         try {
             ctx.scan(
-                    "org.onap.aai.config",
-                    "org.onap.aai.setup",
-                    "org.onap.aai.introspection"
+                    "org.onap.aai"
             );
             ctx.refresh();
         } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
index f9c9e4b..7ee9372 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
+++ b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
@@ -149,9 +149,7 @@ public class DynamicPayloadGenerator {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-          "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java b/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java
index 1e96223..afc5793 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java
+++ b/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java
@@ -174,9 +174,7 @@ public class SchemaMod {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod4Hist.java b/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod4Hist.java
index e806883..6201562 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod4Hist.java
+++ b/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod4Hist.java
@@ -157,9 +157,7 @@ public class SchemaMod4Hist {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/historytruncate/HistoryTruncateTasks.java b/src/main/java/org/onap/aai/historytruncate/HistoryTruncateTasks.java
index 4cb33fc..794c39f 100644 (file)
--- a/src/main/java/org/onap/aai/historytruncate/HistoryTruncateTasks.java
+++ b/src/main/java/org/onap/aai/historytruncate/HistoryTruncateTasks.java
@@ -32,25 +32,38 @@ import org.onap.aai.logging.LogFormatTools;
 import org.onap.aai.util.AAIConfig;
 import org.onap.logging.filter.base.ONAPComponents;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
+import lombok.extern.slf4j.Slf4j;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Slf4j
 @Component
 @PropertySource("file:${server.local.startpath}/etc/appprops/datatoolscrons.properties")
 public class HistoryTruncateTasks {
 
-       @Autowired
-    private AaiScheduledTaskAuditLog auditLog;
-
        private static final Logger LOGGER = LoggerFactory.getLogger(HistoryTruncateTasks.class);
        private final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 
+       @Autowired
+  private AaiScheduledTaskAuditLog auditLog;
+
+       @Value("#{new Boolean('${historytruncatetasks.enabled:true}')}")
+       private Boolean historyTruncateTaskEnabled;
+
        @Scheduled(cron = "${historytruncatetasks.cron}" )
        public void historyTruncateScheduleTask() throws AAIException, Exception {
 
+               if(historyTruncateTaskEnabled != null && !historyTruncateTaskEnabled) {
+                       log.info("Skipping the scheduled history truncate task since historytruncatetasks.enabled=false");
+                       return;
+               }
+
                if(!"true".equals(AAIConfig.get("aai.disable.check.historytruncate.running", "false"))){
                        if(checkIfHistoryTruncateIsRunning()){
                                LOGGER.debug("History Truncate is already running on the system");

diff --git a/src/main/java/org/onap/aai/migration/MigrationController.java b/src/main/java/org/onap/aai/migration/MigrationController.java
index 6b3b0a6..851502c 100644 (file)
--- a/src/main/java/org/onap/aai/migration/MigrationController.java
+++ b/src/main/java/org/onap/aai/migration/MigrationController.java
@@ -46,9 +46,7 @@ public class MigrationController {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/schema/GenTester.java b/src/main/java/org/onap/aai/schema/GenTester.java
index 3568707..55212d8 100644 (file)
--- a/src/main/java/org/onap/aai/schema/GenTester.java
+++ b/src/main/java/org/onap/aai/schema/GenTester.java
@@ -63,9 +63,7 @@ public class GenTester {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection");
+                                       "org.onap.aai");
                        ctx.refresh();
                } catch (Exception e) {
                        AAIException aai = ExceptionTranslator.schemaServiceExceptionTranslator(e);

diff --git a/src/main/java/org/onap/aai/schema/GenTester4Hist.java b/src/main/java/org/onap/aai/schema/GenTester4Hist.java
index 45581d8..80b58ea 100644 (file)
--- a/src/main/java/org/onap/aai/schema/GenTester4Hist.java
+++ b/src/main/java/org/onap/aai/schema/GenTester4Hist.java
@@ -54,9 +54,7 @@ public class GenTester4Hist {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java b/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java
index c3a40d2..a9b1285 100644 (file)
--- a/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java
+++ b/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java
@@ -45,9 +45,7 @@ public class SendDeleteMigrationNotificationsMain {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java b/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java
index fbd1010..aa6b4e3 100644 (file)
--- a/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java
+++ b/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java
@@ -42,9 +42,7 @@ public class SendMigrationNotificationsMain {
                AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
                try {
                        ctx.scan(
-                                       "org.onap.aai.config",
-                                       "org.onap.aai.setup",
-                                       "org.onap.aai.introspection"
+                                       "org.onap.aai"
                        );
                        ctx.refresh();
                } catch (Exception e) {

diff --git a/src/main/resources/etc/appprops/datatoolscrons.properties b/src/main/resources/etc/appprops/datatoolscrons.properties
index bbad8d5..70fd007 100644 (file)
--- a/src/main/resources/etc/appprops/datatoolscrons.properties
+++ b/src/main/resources/etc/appprops/datatoolscrons.properties
@@ -14,3 +14,6 @@ datasnapshotcleanup.enabled=${DATA_SNAPSHOT_CLEANUP_ENABLED:true}
 datasnapshotcleanup.cron=0 17 0 * * ?
 datasnapshottasks.enabled=${DATA_SNAPSHOT_TASKS_ENABLED:true}
 datasnapshottasks.cron=0 45 * * * ?
+
+historytruncatetasks.enabled=${HISTORY_TRUNCATE_TASK_ENABLED:true}
+historytruncatetasks.cron=0 45 * * * ?