commit 51539b85d3107c79601129f48041dc72f118e003
author Jonathan Hart <jono@onlab.us> Thu Oct 29 09:53:04 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jan 28 17:32:37 2016 +0000
tree 0f9e3b076a260b9c202b5dd84d386b6983c6182c
parent f95b96eaa39c3a87cab5ed505425160bbe7f9087

Enforce naming convention regarding abbreviations

Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da

apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java

diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java
index 889e48a..fe91829 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java
@@ -60,7 +60,7 @@
      * @param annotations Annotations to use.
      */
     public DefaultIpDeviceDescription(IpDeviceDescription base, SparseAnnotations... annotations) {
-        this(base.deviceURI(), base.type(), base.deviceIdentifier(),
+        this(base.deviceUri(), base.type(), base.deviceIdentifier(),
              base.deviceTed(), annotations);
     }
 
@@ -71,12 +71,12 @@
      * @param annotations Annotations to use.
      */
     public DefaultIpDeviceDescription(IpDeviceDescription base, Type type, SparseAnnotations... annotations) {
-        this(base.deviceURI(), type, base.deviceIdentifier(),
+        this(base.deviceUri(), type, base.deviceIdentifier(),
                 base.deviceTed(), annotations);
     }
 
     @Override
-    public URI deviceURI() {
+    public URI deviceUri() {
         return uri;
     }
 

apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java

diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java
index c0a4391..a8dfff2 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java
@@ -35,7 +35,7 @@
      *
      * @return provider specific URI for the ip device
      */
-    URI deviceURI();
+    URI deviceUri();
 
     /**
      * Returns the type of the ip device. For ex: Psuedo or actual