use INeutronObject instead of NeutronObject where possible

Change-Id: Id5abdaa58af68985d4ec88ecfd4a1e0c9a60b653
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
index 2e153fdd2df12da7d490023dc58b5d5fea7bd42d..9131a81380094826c36869ecef40024cb71f9c7a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronObject.java
@@ -24,4 +24,6 @@ public interface INeutronObject {
     void setTenantID(String tenantID);
 
     void setTenantID(Uuid tenantID);
+
+    void initDefaults();
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
index 1fbd016f80dda2246e601873100a47a7d87e59df..488b395099575dbf476e06335719caf76d402949 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
@@ -50,6 +50,7 @@ public class NeutronObject extends Neutron_ID implements Serializable, INeutronO
         return "NeutronObject [id=" + uuid + ", tenantID=" + tenantID + "]";
     }
 
+    @Override
     public void initDefaults() {
     }
 }

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java
index 34db637c3a9c06d40d8a06ad0d7068f2bbce2c29..1f67034090b387b4528deeab41ada9f2a489ed3b 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthbound.java
@@ -14,14 +14,14 @@ import java.util.List;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.opendaylight.neutron.spi.INeutronCRUD;
-import org.opendaylight.neutron.spi.NeutronObject;
+import org.opendaylight.neutron.spi.INeutronObject;
 
 import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class AbstractNeutronNorthbound<T extends NeutronObject, NeutronRequest extends INeutronRequest<T>, I extends INeutronCRUD<T>> {
+public abstract class AbstractNeutronNorthbound<T extends INeutronObject, NeutronRequest extends INeutronRequest<T>, I extends INeutronCRUD<T>> {
     private static final Logger LOGGER = LoggerFactory
         .getLogger(AbstractNeutronNorthbound.class);
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthboundIAware.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthboundIAware.java
index 3dfc6425e357b90d5791eff8d0eb869dd782e559..cbaa73d6ba6357a1f490db0764e51b77c9712ebb 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthboundIAware.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/AbstractNeutronNorthboundIAware.java
@@ -14,7 +14,7 @@ import java.util.List;
 import org.codehaus.enunciate.jaxrs.ResponseCode;
 import org.codehaus.enunciate.jaxrs.StatusCodes;
 import org.opendaylight.neutron.spi.INeutronCRUD;
-import org.opendaylight.neutron.spi.NeutronObject;
+import org.opendaylight.neutron.spi.INeutronObject;
 
 import javax.ws.rs.core.Response;
 
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
 
 // When INeutron*Aware interfaces are deleted, this class should be deleted for BORON
 @Deprecated
-public abstract class AbstractNeutronNorthboundIAware<T extends NeutronObject, NeutronRequest extends INeutronRequest<T>, I extends INeutronCRUD<T>, INeutronAware>
+public abstract class AbstractNeutronNorthboundIAware<T extends INeutronObject, NeutronRequest extends INeutronRequest<T>, I extends INeutronCRUD<T>, INeutronAware>
     extends AbstractNeutronNorthbound<T, NeutronRequest, I> {
     private static final Logger LOGGER = LoggerFactory
         .getLogger(AbstractNeutronNorthboundIAware.class);