diff options
| author |   Michal Kabaj <michal.kabaj@nokia.com> | 2018-07-23 18:05:35 +0200 |
|---|---|---|
| committer |   Takamune Cho <tc012c@att.com> | 2018-08-10 14:04:47 +0000 |
| commit | ed13e1b0270932ba8bbfa7b51c84b4b88894e061 (patch) | |
| tree | 7286b56c38e3c265a348efc1003c093585a648a2 /appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF | |
| parent | e35c3a0387e68bbeb3df8c5d614e0b99f5c4f743 (diff) | |
Remove all powermock(ito) usages in appc-dg-util
- Replace powermock usage with mockito.
- Introduce AAIServiceFactory for fetching AAIService from bundle
- Using blueprint.xml DI to pass factory into ExecuteNodeActionImpl
during construction
- removed powermock(ito) deps from pom
Change-Id: I54450580c68c7d4992cb412192ca6dd4741398fc
Issue-ID: APPC-1008
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>
Diffstat (limited to 'appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF')
| -rw-r--r-- | appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 824b2ce47..fdb507778 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -6,7 +6,9 @@ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs - ============================================================================= + ================================================================================ + Modifications Copyright (C) 2018 Nokia + ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -34,7 +36,11 @@ <service id="inputParameterValidationService" interface="org.onap.appc.dg.util.InputParameterValidation" ref="inputParameterValidationBean"/> - <bean id="executeNodeActionBean" class="org.onap.appc.dg.util.impl.ExecuteNodeActionImpl" scope="prototype" > + <bean id="aaiServiceFactory" class="org.onap.appc.dg.util.impl.AAIServiceFactory"> + </bean> + + <bean id="executeNodeActionBean" class="org.onap.appc.dg.util.impl.ExecuteNodeActionImpl" scope="prototype"> + <argument ref="aaiServiceFactory"/> </bean> <service id="executeNodeActionService" interface="org.onap.appc.dg.util.ExecuteNodeAction" ref="executeNodeActionBean"/> |