diff options
Diffstat (limited to 'aai-core')
| -rw-r--r-- | aai-core/src/main/java/org/onap/aai/config/SchemaConfiguration.java | 7 | ||||
| -rw-r--r-- | aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java | 4 |
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) { |