commit 3078fc06206e30c5cebae3f83e3ec1e841a9b9c8
author Ray Milkey <ray@onlab.us> Wed May 06 16:14:14 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 13 17:03:39 2015 +0000
tree f232f656c042d9b74023f31f07cd394e17be2741
parent 8b4b9f0a7380df2b630f97149f5d02652c371c0a

ONOS-743 - Use REST API Codecs to generate JSON for CLI commands

Change-Id: I25e0840d1af03341c638f837498c95275e6cf31b

core/api/src/main/java/org/onosproject/codec/CodecContext.java

diff --git a/core/api/src/main/java/org/onosproject/codec/CodecContext.java b/core/api/src/main/java/org/onosproject/codec/CodecContext.java
index ee00fa9..272c3e9 100644
--- a/core/api/src/main/java/org/onosproject/codec/CodecContext.java
+++ b/core/api/src/main/java/org/onosproject/codec/CodecContext.java
@@ -45,6 +45,6 @@
      * @param <T>          service type
      * @return JSON codec; null if no codec available for the class
      */
-    <T> T get(Class<T> serviceClass);
+    <T> T getService(Class<T> serviceClass);
 
 }

core/api/src/main/java/org/onosproject/rest/AbstractWebResource.java

diff --git a/core/api/src/main/java/org/onosproject/rest/AbstractWebResource.java b/core/api/src/main/java/org/onosproject/rest/AbstractWebResource.java
index ff53182..82caf08 100644
--- a/core/api/src/main/java/org/onosproject/rest/AbstractWebResource.java
+++ b/core/api/src/main/java/org/onosproject/rest/AbstractWebResource.java
@@ -60,4 +60,9 @@
         return result;
     }
 
+    @Override
+    public <T> T getService(Class<T> serviceClass) {
+        return get(serviceClass);
+    }
+
 }

core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java

diff --git a/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java b/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
index ebe5f8e..eb04d9a 100644
--- a/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
+++ b/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
@@ -92,7 +92,7 @@
         }
 
         @Override
-        public <T> T get(Class<T> serviceClass) {
+        public <T> T getService(Class<T> serviceClass) {
             return null;
         }
     }