X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-docgen%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fdoc%2Fimpl%2FBaseYangSwaggerGenerator.java;h=c86b89c004b645aa42e31b86320077278ff23551;hb=cb4800008fe5852753b2809da429ec373dd0092a;hp=a261f2380782a1867e88493b1980174668c061bb;hpb=4c4cab643ce6aeb5b60cb9b1b1e193c4fafb46ad;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java
index a261f23807..c86b89c004 100644
--- a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java
+++ b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java
@@ -8,7 +8,6 @@
 package org.opendaylight.controller.sal.rest.doc.impl;
 
 import static org.opendaylight.controller.sal.rest.doc.util.RestDocgenUtil.resolvePathArgumentsName;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
@@ -20,10 +19,12 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
@@ -119,11 +120,25 @@ public class BaseYangSwaggerGenerator {
 
     public ApiDeclaration getApiDeclaration(String module, String revision, UriInfo uriInfo, SchemaContext schemaContext, String context) {
         Date rev = null;
+
         try {
-            rev = SIMPLE_DATE_FORMAT.parse(revision);
+            if(revision != null && !revision.equals("0000-00-00")) {
+                rev = SIMPLE_DATE_FORMAT.parse(revision);
+            }
         } catch (ParseException e) {
             throw new IllegalArgumentException(e);
         }
+
+        if(rev != null) {
+            Calendar cal = new GregorianCalendar();
+
+            cal.setTime(rev);
+
+            if(cal.get(Calendar.YEAR) < 1970) {
+                rev = null;
+            }
+        }
+
         Module m = schemaContext.findModuleByName(module, rev);
         Preconditions.checkArgument(m != null, "Could not find module by name,revision: " + module + "," + revision);
 
@@ -373,13 +388,15 @@ public class BaseYangSwaggerGenerator {
 
         SortedSet<Module> sortedModules = new TreeSet<>(new Comparator<Module>() {
             @Override
-            public int compare(Module o1, Module o2) {
-                int result = o1.getName().compareTo(o2.getName());
+            public int compare(Module module1, Module module2) {
+                int result = module1.getName().compareTo(module2.getName());
                 if (result == 0) {
-                    result = o1.getRevision().compareTo(o2.getRevision());
+                    Date module1Revision = module1.getRevision() != null ? module1.getRevision() : new Date(0);
+                    Date module2Revision = module2.getRevision() != null ? module2.getRevision() : new Date(0);
+                    result = module1Revision.compareTo(module2Revision);
                 }
                 if (result == 0) {
-                    result = o1.getNamespace().compareTo(o2.getNamespace());
+                    result = module1.getNamespace().compareTo(module2.getNamespace());
                 }
                 return result;
             }