From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Thu, 25 Jan 2018 16:09:48 +0000 (-0500)
Subject: NETCONF-502:  Use GSON for swagger serdes
X-Git-Tag: release/oxygen~19
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=dbd08776cfea2567cb2e69ef741a29e9651d3862;p=netconf.git

NETCONF-502:  Use GSON for swagger serdes

This utilized the GsonProvider currently in AAA to do serdes
for odl-mdsal-apidocs.  This will not pass until the
subsequent AAA patches are merged.

Change-Id: Iba67d65b3f72f26f0507b62327a41e570fc3cea4
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---

diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml
index 687ec614ea..d8547f6549 100644
--- a/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@ -118,6 +118,11 @@
       <artifactId>automaton</artifactId>
       <version>1.11-8</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-shiro</artifactId>
+      <version>0.7.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/ApiDocApplication.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/ApiDocApplication.java
index c832364f14..93291ddd36 100644
--- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/ApiDocApplication.java
+++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/jaxrs/ApiDocApplication.java
@@ -10,6 +10,7 @@ package org.opendaylight.netconf.sal.rest.doc.jaxrs;
 import java.util.HashSet;
 import java.util.Set;
 import javax.ws.rs.core.Application;
+import org.opendaylight.aaa.provider.GsonProvider;
 import org.opendaylight.netconf.sal.rest.doc.impl.ApiDocServiceImpl;
 
 public class ApiDocApplication extends Application {
@@ -18,6 +19,7 @@ public class ApiDocApplication extends Application {
         Set<Object> singletons = new HashSet<>();
         singletons.add(ApiDocServiceImpl.getInstance());
         singletons.add(new JaxbContextResolver());
+        singletons.add(new GsonProvider());
         return singletons;
     }
 }