Component{Factory,Instance} are generic with OSGi R7, fix a few raw type
warnings.
Change-Id: I6a923e164a99d0e1959d217401116e0bf381b930
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
DataBroker dataBroker = null;
@Reference(target = "(component.factory=" + OSGiPasswordServiceConfig.FACTORY_NAME + ")")
DataBroker dataBroker = null;
@Reference(target = "(component.factory=" + OSGiPasswordServiceConfig.FACTORY_NAME + ")")
- ComponentFactory configFactory = null;
+ ComponentFactory<OSGiPasswordServiceConfig> configFactory = null;
private ListenerRegistration<?> registration;
private ListenerRegistration<?> registration;
- private ComponentInstance instance;
+ private ComponentInstance<?> instance;
@Activate
synchronized void activate() {
@Activate
synchronized void activate() {
@Holding("this")
private void updateInstance(final PasswordServiceConfig config) {
if (registration != null) {
@Holding("this")
private void updateInstance(final PasswordServiceConfig config) {
if (registration != null) {
- final ComponentInstance newInstance = configFactory.newInstance(
+ final ComponentInstance<?> newInstance = configFactory.newInstance(
OSGiPasswordServiceConfig.props(config != null ? config : new PasswordServiceConfigBuilder().build()));
if (instance != null) {
instance.dispose();
OSGiPasswordServiceConfig.props(config != null ? config : new PasswordServiceConfigBuilder().build()));
if (instance != null) {
instance.dispose();