Remove OpenAPI v2

[netconf.git] / restconf / sal-rest-docgen / src / main / java / org / opendaylight / netconf / sal / rest / doc / impl / ApiDocServiceImpl.java

diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java
index 06cb65fd9af64a0a1f4020db86819ac1dc20f61e..c6d61bf3fcc9e45c6a1f306346b61a189388daef 100644 (file)
--- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java
+++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java
@@ -51,8 +51,6 @@ public final class ApiDocServiceImpl implements ApiDocService {
     // Query parameter
     private static final String PAGE_NUM = "pageNum";
 
-    public enum OAversion { V2_0, V3_0 }
-
     private final MountPointSwagger mountPointSwaggerRFC8040;
     private final ApiDocGeneratorRFC8040 apiDocGeneratorRFC8040;
 
@@ -73,11 +71,10 @@ public final class ApiDocServiceImpl implements ApiDocService {
 
     @Override
     public synchronized Response getAllModulesDoc(final UriInfo uriInfo) {
-        final OAversion oaversion = identifyOpenApiVersion(uriInfo);
         final DefinitionNames definitionNames = new DefinitionNames();
-        final SwaggerObject doc = apiDocGeneratorRFC8040.getAllModulesDoc(uriInfo, definitionNames, oaversion);
+        final SwaggerObject doc = apiDocGeneratorRFC8040.getAllModulesDoc(uriInfo, definitionNames);
 
-        return Response.ok(BaseYangSwaggerGenerator.getAppropriateDoc(doc, oaversion)).build();
+        return Response.ok(BaseYangSwaggerGenerator.convertToOpenApi(doc)).build();
     }
 
     /**
@@ -86,7 +83,7 @@ public final class ApiDocServiceImpl implements ApiDocService {
     @Override
     public synchronized Response getDocByModule(final String module, final String revision, final UriInfo uriInfo) {
         return Response.ok(
-            apiDocGeneratorRFC8040.getApiDeclaration(module, revision, uriInfo, identifyOpenApiVersion(uriInfo)))
+            apiDocGeneratorRFC8040.getApiDeclaration(module, revision, uriInfo))
             .build();
     }
 
@@ -109,27 +106,18 @@ public final class ApiDocServiceImpl implements ApiDocService {
     @Override
     public synchronized Response getMountDocByModule(final String instanceNum, final String module,
                                                      final String revision, final UriInfo uriInfo) {
-        final OAversion oaversion = identifyOpenApiVersion(uriInfo);
         final CommonApiObject api = mountPointSwaggerRFC8040.getMountPointApi(uriInfo, Long.parseLong(instanceNum),
-            module, revision, oaversion);
+            module, revision);
         return Response.ok(api).build();
     }
 
     @Override
     public synchronized Response getMountDoc(final String instanceNum, final UriInfo uriInfo) {
         final CommonApiObject api;
-        final OAversion oaversion = identifyOpenApiVersion(uriInfo);
         final String stringPageNum = uriInfo.getQueryParameters().getFirst(PAGE_NUM);
         final Optional<Integer> pageNum = stringPageNum != null ? Optional.of(Integer.valueOf(stringPageNum))
                 : Optional.empty();
-        api = mountPointSwaggerRFC8040.getMountPointApi(uriInfo, Long.parseLong(instanceNum), pageNum, oaversion);
+        api = mountPointSwaggerRFC8040.getMountPointApi(uriInfo, Long.parseLong(instanceNum), pageNum);
         return Response.ok(api).build();
     }
-
-    private static OAversion identifyOpenApiVersion(final UriInfo uriInfo) {
-        if (uriInfo.getBaseUri().toString().contains("/swagger2/")) {
-            return OAversion.V2_0;
-        }
-        return OAversion.V3_0;
-    }
 }