BUG-4688: switch revisions from Date to Revision

[yangtools.git] / yang / yang-model-export / src / main / java / org / opendaylight / yangtools / yang / model / export / YinExportUtils.java

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java
index ec9b723c0a2548f59360d0d9b05cb6c5b34c0c4a..510fdab8337349a059362463e92c2d8189f988e6 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/YinExportUtils.java
@@ -12,13 +12,12 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import java.io.OutputStream;
 import java.net.URI;
-import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
@@ -40,9 +39,8 @@ public final class YinExportUtils {
      *            Revision of module or submodule
      * @return well-formed file name of YIN file as defined in RFC6020.
      */
-    public static String wellFormedYinName(final String name, final Optional<Date> revision) {
-        return !revision.isPresent() ? wellFormedYinName(name, (String) null) :
-            wellFormedYinName(name, SimpleDateFormatUtil.getRevisionFormat().format(revision.get()));
+    public static String wellFormedYinName(final String name, final Optional<Revision> revision) {
+        return wellFormedYinName(name, revision.map(Revision::toString).orElse(null));
     }
 
     /**