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=c8bf6e6675e1f10278fe218986e54313ba0bb79a;hb=refs%2Fchanges%2F50%2F22850%2F1;hp=a261f2380782a1867e88493b1980174668c061bb;hpb=110114fe324e84f03faf234dd5f12c54ca58f668;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..c8bf6e6675 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);