X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FJsonReader.java;fp=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FJsonReader.java;h=a0acaf156facb47a74f9e672f1514277f78fc4a4;hb=6cfe2845817ee6c0036de61ba9e4e51e55954eb4;hp=3115994e01575a57661db4bbc73bc81927e9713d;hpb=db4f7442fdf4df1fade6c65c5da5a8ff7dba2079;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java index 3115994e01..a0acaf156f 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java @@ -17,17 +17,17 @@ import com.google.gson.JsonPrimitive; class JsonReader { - public CompositeNodeWrapper read(InputStream entityStream) throws UnsupportedJsonFormatException { + public CompositeNodeWrapper read(InputStream entityStream) throws UnsupportedFormatException { JsonParser parser = new JsonParser(); JsonElement rootElement = parser.parse(new InputStreamReader(entityStream)); if (!rootElement.isJsonObject()) { - throw new UnsupportedJsonFormatException("Root element of Json has to be Object"); + throw new UnsupportedFormatException("Root element of Json has to be Object"); } Set> entrySetsOfRootJsonObject = rootElement.getAsJsonObject().entrySet(); if (entrySetsOfRootJsonObject.size() != 1) { - throw new UnsupportedJsonFormatException("Json Object should contain one element"); + throw new UnsupportedFormatException("Json Object should contain one element"); } else { Entry childEntry = Lists.newArrayList(entrySetsOfRootJsonObject).get(0); String firstElementName = childEntry.getKey(); @@ -41,10 +41,10 @@ class JsonReader { if (firstElementInArray.isJsonObject()) { return createStructureWithRoot(firstElementName, firstElementInArray.getAsJsonObject()); } - throw new UnsupportedJsonFormatException("Array as the first element in Json Object can have only Object element"); + throw new UnsupportedFormatException("Array as the first element in Json Object can have only Object element"); } } - throw new UnsupportedJsonFormatException("First element in Json Object has to be \"Object\" or \"Array with one Object element\". Other scenarios are not supported yet."); + throw new UnsupportedFormatException("First element in Json Object has to be \"Object\" or \"Array with one Object element\". Other scenarios are not supported yet."); } }