aboutsummaryrefslogtreecommitdiffstats
path: root/aai-core
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-02-26 14:03:09 +0100
committerFiete Ostkamp <fiete.ostkamp@telekom.de>2024-02-26 13:08:47 +0000
commitb7ad55e5d91527b259cb9189237b3f01915c31f8 (patch)
tree4fe3a6f134411450f6b19e07a4b965db580cd912 /aai-core
parente190b0b67803241ad3a94a6c6396fc47a94e7fac (diff)
Only load SchemaService related beans in aai-common when schema.translator.list=schema-service
- conditionally load schema-service related config, otherwise use the ConfigTranslator - this prepares locally running traversal via mvn spring-boot:run Issue-ID: AAI-3787 Change-Id: I9415802fb708933e8596b62e7540fa8a156e4cd6 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'aai-core')
-rw-r--r--aai-core/src/main/java/org/onap/aai/config/SchemaConfiguration.java7
-rw-r--r--aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java4
2 files changed, 2 insertions, 9 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/config/SchemaConfiguration.java b/aai-core/src/main/java/org/onap/aai/config/SchemaConfiguration.java
index 885790ce..9247bc77 100644
--- a/aai-core/src/main/java/org/onap/aai/config/SchemaConfiguration.java
+++ b/aai-core/src/main/java/org/onap/aai/config/SchemaConfiguration.java
@@ -66,13 +66,6 @@ public class SchemaConfiguration {
return nodesConfiguration.nodeIngestor();
}
- @Bean(name = "configTranslator")
- @ConditionalOnProperty(name = "schema.translator.list", havingValue = "config", matchIfMissing = true)
- public ConfigTranslator configTranslator(SchemaLocationsBean schemaLocationsBean,
- SchemaConfigVersions schemaVersions) {
- return new AAIConfigTranslator(schemaLocationsBean, schemaVersions);
- }
-
@Bean
@ConditionalOnProperty(name = "schema.translator.list", havingValue = "config", matchIfMissing = true)
public SchemaErrorStrategy schemaErrorStrategy() {
diff --git a/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java b/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java
index 19b8220b..3df799ba 100644
--- a/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java
+++ b/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java
@@ -45,7 +45,7 @@ public abstract class AbstractConfigTranslator extends ConfigTranslator {
*/
@Override
public Map<SchemaVersion, List<String>> getNodeFiles() {
- String prefix = bean.getNodeDirectory() + AAIConstants.AAI_FILESEP;
+ String prefix = schemaLocationsBean.getNodeDirectory() + AAIConstants.AAI_FILESEP;
String suffix = ".xml";
@@ -65,7 +65,7 @@ public abstract class AbstractConfigTranslator extends ConfigTranslator {
List<String> container = new ArrayList<>();
String directoryName =
- bean.getNodeDirectory() + AAIConstants.AAI_FILESEP + v.toString() + AAIConstants.AAI_FILESEP;
+ schemaLocationsBean.getNodeDirectory() + AAIConstants.AAI_FILESEP + v.toString() + AAIConstants.AAI_FILESEP;
File[] files = new File(directoryName).listFiles();
for (File f : files) {