SDN-R code coverage

[ccsdk/features.git] / sdnr / wt / devicemanager / provider / src / main / java / org / onap / ccsdk / features / sdnr / wt / devicemanager / impl / util / InternalDateAndTime.java

diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalDateAndTime.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalDateAndTime.java
index b04a49b..c528532 100644 (file)
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalDateAndTime.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/util/InternalDateAndTime.java
@@ -15,36 +15,30 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-/**
- *
- */
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util;
 
+import org.eclipse.jdt.annotation.Nullable;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.NetconfTimeStamp;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.NetconfTimeStampImpl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 
 /**
  * Converts time stamps into internal format according to ONF1.2 and ISO 8601.
- * @author herbert
- *
+ * To be replaced by NetconfTimeStampImpl
  */
+@Deprecated
 public class InternalDateAndTime {
 
-    private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStampImpl.getConverter();
-
-    private static final InternalDateAndTime TESTPATTERN = new InternalDateAndTime("2017-01-01T00:00:00.0Z");
+    private static final String TESTPATTERNSTRING = "2017-01-01T00:00:00.0Z";
     private static final String INITIALPATTERN = "0000-00-00T00:00:00.0Z";
 
-    String internalDateAndTime = INITIALPATTERN;
+    private static final InternalDateAndTime TESTPATTERN = new InternalDateAndTime(TESTPATTERNSTRING);
+    private static final DateAndTime TESTPATTERN2 = new DateAndTime(TESTPATTERNSTRING);
 
-    /**
-     * Static builder ONF1.2
-     * @param time in ONF1.2 yang format
-     * @return  InternalDateAndTime
-     */
-//    public static InternalDateAndTime valueOf(DateAndTime time) {
-//        return new InternalDateAndTime(time);
-//    }
+    private static final NetconfTimeStamp NETCONFTIME_CONVERTER = NetconfTimeStampImpl.getConverter();
+
+    /** Internal variable to hold the value, that is converted **/
+    private final String internalDateAndTime;
 
     /**
      * Static builder ONF1.0
@@ -63,17 +57,24 @@ public class InternalDateAndTime {
         return internalDateAndTime;
     }
 
-    /*----------------------------------------------------------------
-     * Private constructors and functions
+    /**
+     * Get a testpattern
+     * @return testpattern
      */
+    public static InternalDateAndTime getTestpattern() {
+        return TESTPATTERN;
+    }
 
     /**
-     * Convert ONF 1.2 DateAndTime to String
-     * @param time as input
+     * @return DateAndTime testpattern
+     */
+    public static @Nullable DateAndTime getTestpatternDateAndTime() {
+        return TESTPATTERN2;
+    }
+
+    /*----------------------------------------------------------------
+     * Private constructors
      */
-//    private InternalDateAndTime(DateAndTime time) {
-//        internalDateAndTime = NETCONFTIME_CONVERTER.getTimeStampFromNetconf(time.getValue());
-//    }
 
     /**
      * Convert ONF 1.2 DateAndTime to String
@@ -95,14 +96,4 @@ public class InternalDateAndTime {
         this.internalDateAndTime = internalDateAndTime;
     }
 
-    /**
-     * Get a testpattern
-     * @return testpattern
-     */
-    public static InternalDateAndTime getTestpattern() {
-        return TESTPATTERN;
-    }
-
-
-
 }