Merge changes from topic 'bp/annotation'

* changes:
  aclservice-impl *Listener without dumb @PreDestroy super.close()
  aclservice-impl use infrautils AbstractLifecycle

diff --git a/vpnservice/aclservice/impl/pom.xml b/vpnservice/aclservice/impl/pom.xml
index 7cfc9ae9cdc660494168bf63c70234cc4f6d21d9..284ea60b091cde5c8a37c63beaec962e0ede3d00 100644 (file)
--- a/vpnservice/aclservice/impl/pom.xml
+++ b/vpnservice/aclservice/impl/pom.xml
@@ -72,13 +72,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${vpnservices.version}</version>
     </dependency>
     <dependency>
-      <!-- TODO Remove when https://git.opendaylight.org/gerrit/#/c/44502/ is merged -->
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <!-- <scope>provided is wrong here, and causes "Missing Constraint: Import-Package: javax.inject",
-           because javax.inject.Inject & Co. are @Retention(RUNTIME).  As bnd generates a MANIFEST.MF with import-package,
-           you must have <bundle>wrap:mvn:javax.inject/javax.inject/{{VERSION}} in respective features.xml -->
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>inject</artifactId>
+      <version>${infrautils.version}</version>
     </dependency>
 
     <!-- Dependencies used only by code under src/test (<scope>test) -->

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java
index f866c42df4793c7babd8e437a85ba18a651b86e8..b0bed8d9ed6d77b9b72168a126613680724ea174 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AclServiceImplFactory.java
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.netvirt.aclservice;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
+import org.opendaylight.infrautils.inject.AbstractLifecycle;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.config.rev160806.AclserviceConfig.SecurityGroupMode;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -20,7 +19,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class AclServiceImplFactory implements AutoCloseable {
+public class AclServiceImplFactory extends AbstractLifecycle {
 
     private static final Logger LOG = LoggerFactory.getLogger(AclServiceImplFactory.class);
     //private static final String SECURITY_GROUP_MODE = "security-group-mode";
@@ -44,14 +43,13 @@ public class AclServiceImplFactory implements AutoCloseable {
                 .create(AclserviceConfig.class);
     }
 
-    @PostConstruct
-    public void start() {
+    @Override
+    protected void start() {
         LOG.info("{} start", getClass().getSimpleName());
     }
 
-    @PreDestroy
     @Override
-    public void close() throws Exception {
+    protected void stop() {
         LOG.info("{} close", getClass().getSimpleName());
     }
 
@@ -80,4 +78,5 @@ public class AclServiceImplFactory implements AutoCloseable {
             return new LearnEgressAclServiceImpl(dataBroker, mdsalManager);
         }
     }
+
 }

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java
index 7f388f7f719a35440ab4b46b3da49a6144d7b9c6..98e3674bebd63a55f5fa512cb8be8b58ded4875f 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java
@@ -10,8 +10,6 @@ package org.opendaylight.netvirt.aclservice.listeners;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
@@ -48,20 +46,12 @@ public class AclEventListener extends AsyncDataTreeChangeListenerBase<Acl, AclEv
         this.dataBroker = dataBroker;
     }
 
-    @PostConstruct
-    // TODO new interface Lifecyle
-    public void start() {
+    @Override
+    public void init() {
         LOG.info("{} start", getClass().getSimpleName());
         registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
 
-    @Override
-    @PreDestroy
-    // TODO make AsyncDataTreeChangeListenerBase implement new interface Lifecyle
-    public void close() throws Exception {
-        super.close();
-    }
-
     @Override
     protected InstanceIdentifier<Acl> getWildCardPath() {
         return InstanceIdentifier

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
index a21edae69654a57cb57828434f58175b9b3cb9c8..af00cdd6f5b25f6059f184035acb7cb9489aaeb5 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceListener.java
@@ -8,8 +8,6 @@
 package org.opendaylight.netvirt.aclservice.listeners;
 
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
@@ -48,18 +46,12 @@ public class AclInterfaceListener extends AsyncDataTreeChangeListenerBase<Interf
         this.dataBroker = dataBroker;
     }
 
-    @PostConstruct
-    public void start() {
+    @Override
+    public void init() {
         LOG.info("{} start", getClass().getSimpleName());
         registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
 
-    @PreDestroy
-    @Override
-    public void close() throws Exception {
-        super.close();
-    }
-
     @Override
     protected InstanceIdentifier<Interface> getWildCardPath() {
         return InstanceIdentifier

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java
index 32ee82f77e4f3d90c162963aebc53778d3fda48d..a1c2daa30bfed2c29294929afe0565e282e59871 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java
@@ -8,8 +8,6 @@
 package org.opendaylight.netvirt.aclservice.listeners;
 
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
@@ -55,18 +53,12 @@ public class AclInterfaceStateListener extends AsyncDataTreeChangeListenerBase<I
         this.dataBroker = dataBroker;
     }
 
-    @PostConstruct
-    public void start() {
+    @Override
+    public void init() {
         LOG.info("{} start", getClass().getSimpleName());
         registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker);
     }
 
-    @PreDestroy
-    @Override
-    public void close() throws Exception {
-        super.close();
-    }
-
     @Override
     protected InstanceIdentifier<Interface> getWildCardPath() {
         return InstanceIdentifier.create(InterfacesState.class).child(Interface.class);

diff --git a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java
index ef312aba962a2cdb9668bed5ec35d2e71d64a435..0840864e89e23d4e06ab7d6838c30b630f7a610d 100644 (file)
--- a/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclNodeListener.java
@@ -11,8 +11,6 @@ package org.opendaylight.netvirt.aclservice.listeners;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -72,8 +70,8 @@ public class AclNodeListener extends AsyncDataTreeChangeListenerBase<FlowCapable
         this.config = config;
     }
 
-    @PostConstruct
-    public void start() {
+    @Override
+    public void init() {
         LOG.info("{} start", getClass().getSimpleName());
         if (config != null) {
             this.securityGroupMode = config.getSecurityGroupMode();
@@ -82,12 +80,6 @@ public class AclNodeListener extends AsyncDataTreeChangeListenerBase<FlowCapable
         LOG.info("AclserviceConfig: {}", this.config);
     }
 
-    @PreDestroy
-    @Override
-    public void close() throws Exception {
-        super.close();
-    }
-
     @Override
     protected InstanceIdentifier<FlowCapableNode> getWildCardPath() {
         return InstanceIdentifier.create(Nodes.class).child(Node.class).augmentation(FlowCapableNode.class);

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index d20f04c2fa4869a3fe74fab7735f1aaca8b887c4..959f58a64d32cefb1ca4686f11b980e9de3bc167 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -54,7 +54,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version="${openflowplugin.version}">odl-openflowplugin-southbound</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version='${genius.version}'>odl-genius</feature>
-    <bundle>wrap:mvn:javax.inject/javax.inject/{{VERSION}}</bundle>
+    <feature version='${infrautils.version}'>odl-infrautils-inject</feature>
     <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/bgpmanager-api/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/bgpmanager-impl/{{VERSION}}</bundle>