summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application/config/spring-beans
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-06-10 10:53:20 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-06-10 11:50:01 +0200
commit1efee417abaaa07344f4dbb239d2456841faa091 (patch)
treea517097a508ad21bb948c3891d9b97fbeeeb11da /sparkybe-onap-application/config/spring-beans
parentf71b22fc3411442c6398866f0c29cbf8f129f26c (diff)
Add sparky-be integration test
- run spring-boot integration test for the AggregateSummaryProcessor in the main sparkybe-onap-application module [1] [1] this is specifically ensuring the proper creation of the beans in the spring context which is done using the spring-beans xml files. In order to replace this outdated approach some time in the future, there have to be integration tests to ensure the proper injection Issue-ID: AAI-3860 Change-Id: Id1488482ba852cce7407aba3e700fba5dd48ae99 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'sparkybe-onap-application/config/spring-beans')
-rw-r--r--sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml62
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-oxm.xml2
2 files changed, 63 insertions, 1 deletions
diff --git a/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml b/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml
new file mode 100644
index 0000000..74a291c
--- /dev/null
+++ b/sparkybe-onap-application/config/spring-beans/oxm-reader-bean.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+ <context:property-placeholder location="file:${schemaIngestPropLoc}" ignore-unresolvable="true" />
+
+ <bean id="filtersConfig" class="org.onap.aai.sparky.search.filters.config.FiltersConfig">
+
+ </bean>
+
+ <bean id="sparkyResourceLoader" class="org.onap.aai.sparky.config.SparkyResourceLoader">
+ <property name="configHomeEnvVar" value="${CONFIG_HOME}" />
+ </bean>
+
+ <bean id="crossEntityReferenceLookup"
+ class="org.onap.aai.sparky.config.oxm.CrossEntityReferenceLookup" />
+
+ <bean id="oxmEntityLookup" class="org.onap.aai.sparky.config.oxm.OxmEntityLookup" />
+
+
+ <bean id="suggestionEntityLookup" class="org.onap.aai.sparky.config.oxm.SuggestionEntityLookup">
+ <constructor-arg ref="filtersConfig" />
+ </bean>
+ <bean id="oxmModelProcessorSet" class="org.springframework.beans.factory.config.SetFactoryBean">
+ <property name="targetSetClass" value="java.util.HashSet" />
+ <property name="sourceSet">
+ <set>
+ <ref bean="oxmEntityLookup" />
+ </set>
+ </property>
+ </bean>
+
+ <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean">
+ <!-- When running with AJSC these properties must be injected directly.
+ The reason for this is unknown. -->
+ <property name="nodeDirectory" value="${nodeDir}" />
+ <property name="edgeDirectory" value="${edgeDir}" />
+ </bean>
+
+ <bean id="schemaVersions" class="org.onap.aai.setup.SchemaVersions" />
+
+ <bean id="oxmConfigTranslator" class="org.onap.aai.setup.AAIConfigTranslator">
+ <constructor-arg ref="schemaLocationsBean" />
+ <constructor-arg ref="schemaVersions" />
+ </bean>
+
+ <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor">
+ <constructor-arg ref="oxmConfigTranslator" />
+ </bean>
+
+
+ <bean id="oxmModelLoader" class="org.onap.aai.sparky.config.oxm.OxmModelLoader"
+ init-method="loadModel">
+ <!-- <constructor-arg name="apiVersionOverride" value="V11" /> -->
+ <constructor-arg ref="oxmModelProcessorSet" />
+ <constructor-arg ref="schemaVersions" />
+ </bean>
+
+</beans> \ No newline at end of file
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
index a210d12..c182c98 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-oxm.xml
@@ -39,7 +39,7 @@
class="org.onap.aai.sparky.search.registry.SearchProviderRegistry" />
<bean id="sparkyResourceLoader" class="org.onap.aai.sparky.config.SparkyResourceLoader">
- <property name="configHomeEnvVar" value="CONFIG_HOME" />
+ <property name="configHomeEnvVar" value="${CONFIG_HOME}" />
</bean>
<bean id="unifiedSearchProcessor" class="org.onap.aai.sparky.search.UnifiedSearchProcessor">