Upgrade spring boot to 2.6

- upgrade spring boot (2.5.15 -> 2.6.15)
- migrate aai-schema-ingest module to JUnit 5

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

8 files changed, 0 insertions, 16 deletions

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
index c3222168..e2b5e75f 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
@@ -51,7 +51,6 @@ import org.onap.aai.setup.SchemaVersions;
 import org.onap.aai.setup.Translator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -76,7 +75,6 @@ public class EdgeIngestor {
 
     private Set<Translator> translators;
 
-    @Autowired
     public EdgeIngestor(Set<Translator> translatorSet) {
         this.translators = translatorSet;
     }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
index 15b495ad..8db80999 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
@@ -52,7 +52,6 @@ import org.onap.aai.setup.SchemaVersions;
 import org.onap.aai.setup.Translator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
@@ -86,7 +85,6 @@ public class NodeIngestor {
      * @param translatorSet
      */
 
-    @Autowired
     public NodeIngestor(Set<Translator> translatorSet) {
         this.translators = translatorSet;
         this.caseFormatStore = new CaseFormatStore();
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
index 50b9dc2f..15587c28 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
@@ -33,7 +33,6 @@ import org.apache.commons.io.IOUtils;
 import org.onap.aai.edges.JsonIngestor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Converts the contents of the schema config file
@@ -46,7 +45,6 @@ public abstract class ConfigTranslator extends Translator {
 
     protected SchemaLocationsBean schemaLocationsBean;
 
-    @Autowired
     public ConfigTranslator(SchemaLocationsBean schemaLocationsBean, SchemaConfigVersions schemaConfigVersions) {
         super(schemaConfigVersions);
         this.schemaLocationsBean = schemaLocationsBean;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
index 7308e377..01d8ddd0 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/DefaultVersionValidationModule.java
@@ -29,7 +29,6 @@ import java.util.Map;
 
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -42,7 +41,6 @@ public class DefaultVersionValidationModule implements VersionValidationModule {
 
     private ConfigTranslator config;
 
-    @Autowired
     public DefaultVersionValidationModule(ConfigTranslator config) {
 
         this.config = config;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java
index a1e95557..bb9d738f 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/VersionValidator.java
@@ -20,7 +20,6 @@
 
 package org.onap.aai.validation;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
@@ -34,7 +33,6 @@ public class VersionValidator {
     private SchemaErrorStrategy strat;
     private VersionValidationModule verMod;
 
-    @Autowired
     public VersionValidator(SchemaErrorStrategy strategy, VersionValidationModule verMod) {
         this.strat = strategy;
         this.verMod = verMod;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
index 620bc726..067d329b 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/EdgeRuleValidator.java
@@ -30,7 +30,6 @@ import org.onap.aai.edges.enums.EdgeField;
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.validation.SchemaErrorStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
@@ -48,7 +47,6 @@ public class EdgeRuleValidator {
     protected final CousinDefaultingValidationModule defaultsValidator;
     protected final NodeTypesValidationModule typeValidator;
 
-    @Autowired
     public EdgeRuleValidator(ConfigTranslator config, SchemaErrorStrategy strat,
             EdgeFieldsValidationModule fieldValidator, UniqueLabelValidationModule labelValidator,
             SingleContainmentValidationModule containsValidator, CousinDefaultingValidationModule defaultsValidator,
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
index 0de66249..5b574732 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/edges/NodeTypesValidationModule.java
@@ -26,7 +26,6 @@ import java.util.Set;
 
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.setup.SchemaVersion;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -39,7 +38,6 @@ import org.springframework.stereotype.Component;
 public class NodeTypesValidationModule {
     private NodeIngestor ni;
 
-    @Autowired
     public NodeTypesValidationModule(NodeIngestor ni) {
         this.ni = ni;
     }
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
index 13de6715..ab951e49 100644
--- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/NodeValidator.java
@@ -26,7 +26,6 @@ import java.util.Map.Entry;
 import org.onap.aai.setup.ConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.validation.SchemaErrorStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
@@ -38,7 +37,6 @@ public class NodeValidator {
     private SchemaErrorStrategy strat;
     private DuplicateNodeDefinitionValidationModule dupChecker;
 
-    @Autowired
     public NodeValidator(ConfigTranslator translator, SchemaErrorStrategy strategy,
             DuplicateNodeDefinitionValidationModule dupChecker) {
         this.translator = translator;