summaryrefslogtreecommitdiffstats
path: root/sparkybe-onap-application
diff options
context:
space:
mode:
Diffstat (limited to 'sparkybe-onap-application')
-rw-r--r--sparkybe-onap-application/config/application.properties5
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml2
-rw-r--r--sparkybe-onap-application/config/spring-beans/sparky-filters.xml7
-rw-r--r--sparkybe-onap-application/pom.xml2
4 files changed, 6 insertions, 10 deletions
diff --git a/sparkybe-onap-application/config/application.properties b/sparkybe-onap-application/config/application.properties
index 54f4f40..f3ba9a9 100644
--- a/sparkybe-onap-application/config/application.properties
+++ b/sparkybe-onap-application/config/application.properties
@@ -3,8 +3,9 @@
#
spring.mvc.favicon.enabled=false
-#possible values: camel,http,ssl,portal,fe-dev,fe-prod,oxm-default,oxm-override,[resources|gizmo],sync,oxm-schema-prod
-spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,resources,sync
+#possible values: camel,http,ssl,portal,fe-dev,fe-prod,oxm-default,oxm-override,[resources|gizmo],sync,oxm-schema-dev,oxm-schema-prod
+#For oxm loading there needs to be a combo of [oxm-default OR oxm-override] AND [oxm-schema-dev OR oxm-schema-prod]
+spring.profiles.active=camel,ssl,fe-dev,oxm-schema-dev,resources,sync,oxm-override
elasticsearch.hostname=127.0.0.1
elasticsearch.port=9200
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml b/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml
index 25da171..03218d1 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-aggregate-vnf-search-provider.xml
@@ -14,7 +14,7 @@
<bean id="aggregateSummaryProcessor"
class="org.onap.aai.sparky.aggregatevnf.search.AggregateSummaryProcessor">
- <constructor-arg ref="elasticSearchAdapter" />
+ <constructor-arg ref="searchServiceAdapter" />
<constructor-arg ref="filtersConfig" />
<property name="vnfAggregationIndexName" value="aggregate_generic-vnf_index" />
</bean>
diff --git a/sparkybe-onap-application/config/spring-beans/sparky-filters.xml b/sparkybe-onap-application/config/spring-beans/sparky-filters.xml
index 2dc4936..6cd9b06 100644
--- a/sparkybe-onap-application/config/spring-beans/sparky-filters.xml
+++ b/sparkybe-onap-application/config/spring-beans/sparky-filters.xml
@@ -10,14 +10,9 @@
<constructor-arg name="resourceLoader" ref="sparkyResourceLoader" />
</bean>
- <bean id="filterElasticSearchAdapter"
- class="org.onap.aai.sparky.search.filters.FilterElasticSearchAdapter">
- <constructor-arg ref="elasticSearchAdapter" />
- </bean>
-
<bean id="filteredSearchHelper" class="org.onap.aai.sparky.search.filters.FilteredSearchHelper">
<constructor-arg ref="filtersConfig" />
- <constructor-arg ref="filterElasticSearchAdapter" />
+ <constructor-arg ref="searchServiceAdapter" />
</bean>
<bean id="filterProcessor" class="org.onap.aai.sparky.search.filters.FilterProcessor">
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index e8ec642..0f81a17 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -225,7 +225,7 @@
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-schema</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${version.aai-schema}</version>
</dependency>
<dependency>