Version 4.4.2

Author: peteroupc

README.md

@@ -24,7 +24,7 @@ project, add the following to the `dependencies` section in your `pom.xml` file:
 <dependency>
   <groupId>com.upokecenter</groupId>
   <artifactId>cbor</artifactId>
-  <version>4.4.1</version>
+  <version>4.4.2</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.upokecenter</groupId>
   <artifactId>cbor</artifactId>
   <packaging>jar</packaging>
-  <version>4.4.1-SNAPSHOT</version>
+  <version>4.4.2</version>
   <name>CBOR (Concise Binary Object Representation)</name>
   <description>A Java implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 8949.</description>
   <url>https://github.com/peteroupc/CBOR-Java</url>

src/main/java/com/upokecenter/cbor/CBORDateConverter.java

@@ -201,7 +201,9 @@ public boolean TryGetDateTimeFields(CBORObject obj, EInteger[] year, int[]
       lesserFields) {
       // TODO: In next major version, return false instead of throwing an
       // exception if the arguments are invalid, to conform to convention
-      // with Try* methods in DotNet
+      // with Try* methods in DotNet.
+      // TODO: In next minor version, add overload that takes an out parameter
+      // for year to DotNet version.
       if (year == null) {
         throw new NullPointerException("year");
       }
@@ -272,12 +274,19 @@ private String TryGetDateTimeFieldsInternal(
           num.compareTo(Long.MAX_VALUE) > 0) {
           return "Too big or small to fit a java.util.Date";
         }
-        EDecimal dec;
-        dec = (EDecimal)untagobj.ToObject(EDecimal.class);
-        CBORUtilities.BreakDownSecondsSinceEpoch(
-          dec,
-          outYear,
-          lesserFields);
+        if (num.CanFitInInt64()) {
+          CBORUtilities.BreakDownSecondsSinceEpoch(
+            num.ToInt64Checked(),
+            outYear,
+            lesserFields);
+        } else {
+           EDecimal dec;
+           dec = (EDecimal)untagobj.ToObject(EDecimal.class);
+           CBORUtilities.BreakDownSecondsSinceEpoch(
+             dec,
+             outYear,
+             lesserFields);
+        }
         return null; // no error
       }
       if (obj.HasMostOuterTag(0)) {
@@ -301,12 +310,19 @@ private String TryGetDateTimeFieldsInternal(
         if (!num.IsFinite()) {
           return "Not a finite number";
         }
-        EDecimal dec;
-        dec = (EDecimal)untagobj.ToObject(EDecimal.class);
-        CBORUtilities.BreakDownSecondsSinceEpoch(
-          dec,
-          outYear,
-          lesserFields);
+        if (num.CanFitInInt64()) {
+          CBORUtilities.BreakDownSecondsSinceEpoch(
+            num.ToInt64Checked(),
+            outYear,
+            lesserFields);
+        } else {
+           EDecimal dec;
+           dec = (EDecimal)untagobj.ToObject(EDecimal.class);
+           CBORUtilities.BreakDownSecondsSinceEpoch(
+             dec,
+             outYear,
+             lesserFields);
+        }
         return null; // No error
       }
       return "Not tag 0 or 1";

src/main/java/com/upokecenter/cbor/CBORNumber.java

@@ -969,12 +969,6 @@ String ToJSONString() {
         }
         case ERational: {
           ERational dec = (ERational)this.value;
-          String nnstr = dec.getNumerator().toString();
-          String dnstr = dec.getDenominator().toString();
-          // System.out.println(
-          // "numlen="+nnstr.length() +
-          // " denlen="+dnstr.length() +
-          // "\nstart="+java.util.Date.UtcNow);
           EDecimal f = dec.ToEDecimalExactIfPossible(
               EContext.Decimal128.WithUnlimitedExponents());
           // System.out.println(

src/main/java/com/upokecenter/cbor/CBORUtilities.java

@@ -618,7 +618,7 @@ private static EInteger FloorDiv(EInteger a, EInteger n) {
     }
 
     private static long FloorDiv(long longA, int longN) {
-      return longA >= 0 ? longA / longN : (-1 - longA) / longN;
+      return longA >= 0 ? longA / longN : (-1 - ((-1 - longA) / longN));
     }
 
     private static EInteger FloorMod(EInteger a, EInteger n) {
@@ -627,7 +627,7 @@ private static EInteger FloorMod(EInteger a, EInteger n) {
 
     private static long FloorModLong(long longA, int longN) {
       {
-        return longA - FloorDiv(longA, longN) * longN;
+        return longA - (FloorDiv(longA, longN) * longN);
       }
     }
 
@@ -897,7 +897,9 @@ public static void BreakDownSecondsSinceEpoch(
       EInteger[] normPart = new EInteger[3];
       long longDays = FloorDiv(seconds, 86400) + 1;
       long longSecondsInDay = FloorModLong(seconds, 86400);
+
       int secondsInDay = ((int)longSecondsInDay);
+
       GetNormalizedPartProlepticGregorian(
         EInteger1970,
         1,
@@ -917,8 +919,8 @@ public static void BreakDownSecondsSinceEpoch(
       int[] lesserFields) {
       EInteger integerPart = edec.Quantize(0, ERounding.Floor)
         .ToEInteger();
-      EDecimal fractionalPart = edec.Abs()
-        .Subtract(EDecimal.FromEInteger(integerPart).Abs());
+      EDecimal fractionalPart = edec.Subtract(
+          EDecimal.FromEInteger(integerPart)).Abs();
       int fractionalSeconds = fractionalPart.Multiply(FractionalSeconds)
         .ToInt32Checked();
       EInteger days = FloorDiv(
@@ -927,6 +929,7 @@ public static void BreakDownSecondsSinceEpoch(
       int secondsInDay = FloorMod(
           integerPart,
           EInteger86400).ToInt32Checked();
+
       GetNormalizedPartProlepticGregorian(
         EInteger1970,
         1,

src/main/java/com/upokecenter/cbor/PropertyMap.java

@@ -330,6 +330,35 @@ public static CBORObject FromArray(final Object arr, PODOptions options,
       CBORTypeMapper mapper, int depth) {
    int length = Array.getLength(arr);
    CBORObject obj = CBORObject.NewArray();
+   if(arr instanceof int[]) {
+     int[] iarr=(int[])arr;
+     if(mapper==null && options==null) {
+       for(int i = 0;i < length;i++) {
+        obj.Add(CBORObject.FromObject((int)iarr[i]));
+       }
+     } else {
+     for(int i = 0;i < length;i++) {
+      obj.Add(CBORObject.FromObject((int)iarr[i], options,
+       mapper, depth+1));
+     }
+     }
+     return obj;
+   }
+   if(arr instanceof Integer[]) {
+     Integer[] iarr=(Integer[])arr;
+     if(mapper==null && options==null) {
+       for(int i = 0;i < length;i++) {
+        obj.Add(CBORObject.FromObject((int)iarr[i]));
+       }
+     } else {
+     for(int i = 0;i < length;i++) {
+      obj.Add(CBORObject.FromObject((int)iarr[i], options,
+       mapper, depth+1));
+     }
+     }
+     return obj;
+   }
+   System.out.println("Array length "+length);
    for(int i = 0;i < length;i++) {
     obj.Add(CBORObject.FromObject(Array.get(arr,i), options,
      mapper, depth+1));
@@ -880,14 +909,24 @@ public static Object CallFromObject(
     // Fractional seconds divided by milliseconds
     private static final int TicksDivFracSeconds = CBORUtilities.FractionalSeconds/1000;
 
+    private static long FloorDiv(long longA, int longN) {
+      return longA >= 0 ? longA / longN : (-1 - ((-1 - longA) / longN));
+    }
+
+    private static long FloorModLong(long longA, int longN) {
+        return longA - (FloorDiv(longA, longN) * longN);
+    }
+
    public static void BreakDownDateTime(java.util.Date bi,
         EInteger[] year, int[] lf) {
     if(TicksDivFracSeconds == 0)throw new IllegalStateException();
     long time=bi.getTime();
-    int nanoseconds=((int)(time%1000L));
-    if(nanoseconds<0)nanoseconds=1000+nanoseconds;
+    int nanoseconds=(int)FloorModLong(time,1000);
+    if(time<0 && nanoseconds!=0){
+       // nanoseconds=1000-nanoseconds;
+    }
     nanoseconds*=TicksDivFracSeconds;
-    long seconds=time/1000L;
+    long seconds=FloorDiv(time,1000);
     CBORUtilities.BreakDownSecondsSinceEpoch(seconds,year,lf);
     lf[5]=nanoseconds;
    }

src/test/java/com/upokecenter/test/CBORObjectTest.java

@@ -8976,6 +8976,67 @@ private static String DateTimeToString(
       return new String(charbuf);
     }
 
+    private static void TestDateTimeStringNumberOne(String str, long num) {
+        CBORObject dtstring = CBORObject.FromObject(str).WithTag(0);
+        CBORObject dtnum = CBORObject.FromObject(num).WithTag(1);
+        TestDateTimeStringNumberOne(dtstring, dtnum);
+    }
+    private static void TestDateTimeStringNumberOne(String str, double num) {
+        CBORObject dtstring = CBORObject.FromObject(str).WithTag(0);
+        CBORObject dtnum = CBORObject.FromObject(num).WithTag(1);
+        TestDateTimeStringNumberOne(dtstring, dtnum);
+    }
+    private static void TestDateTimeStringNumberOne(CBORObject dtstring,
+  CBORObject dtnum) {
+        CBORDateConverter convNumber = CBORDateConverter.TaggedNumber;
+        CBORDateConverter convString = CBORDateConverter.TaggedString;
+        CBORObject cbor;
+        EInteger[] eiYear = new EInteger[1];
+        int[] lesserFields = new int[7];
+        String strnum = dtstring + ", " + dtnum;
+        cbor = convNumber.ToCBORObject(convNumber.FromCBORObject(dtstring));
+        Assert.assertEquals(strnum, dtnum, cbor);
+        if (!convNumber.TryGetDateTimeFields(dtstring, eiYear, lesserFields)) {
+          Assert.fail(strnum);
+        }
+        cbor = convNumber.DateTimeFieldsToCBORObject(eiYear[0], lesserFields);
+        Assert.assertEquals(strnum, dtnum, cbor);
+        cbor = convString.DateTimeFieldsToCBORObject(eiYear[0], lesserFields);
+        Assert.assertEquals(strnum, dtstring, cbor);
+        cbor = convString.ToCBORObject(convString.FromCBORObject(dtnum));
+        Assert.assertEquals(strnum, dtstring, cbor);
+        if (!convString.TryGetDateTimeFields(dtnum, eiYear, lesserFields)) {
+          Assert.fail(strnum);
+        }
+        cbor = convNumber.DateTimeFieldsToCBORObject(eiYear[0], lesserFields);
+        Assert.assertEquals(strnum, dtnum, cbor);
+        cbor = convString.DateTimeFieldsToCBORObject(eiYear[0], lesserFields);
+        Assert.assertEquals(strnum, dtstring, cbor);
+    }
+
+    @Test
+    public void TestDateTimeStringNumber() {
+        TestDateTimeStringNumberOne("1970-01-01T00:00:00.25Z", 0.25);
+        TestDateTimeStringNumberOne("1970-01-01T00:00:00.75Z", 0.75);
+        TestDateTimeStringNumberOne("1969-12-31T23:59:59.75Z", -0.25);
+        TestDateTimeStringNumberOne("1969-12-31T23:59:59.25Z", -0.75);
+        TestDateTimeStringNumberOne("1970-01-03T00:00:00Z", 172800);
+        TestDateTimeStringNumberOne("1970-01-03T00:00:00Z", 172800);
+        TestDateTimeStringNumberOne("1970-01-03T00:00:00Z", 172800);
+        TestDateTimeStringNumberOne("2001-01-03T00:00:00Z", 978480000);
+        TestDateTimeStringNumberOne("2001-01-03T00:00:00.25Z", 978480000.25);
+        TestDateTimeStringNumberOne("1960-01-03T00:00:00Z", -315446400);
+        TestDateTimeStringNumberOne("1400-01-03T00:00:00Z", -17987270400L);
+        TestDateTimeStringNumberOne("2100-01-03T00:00:00Z", 4102617600L);
+        TestDateTimeStringNumberOne("1970-01-03T00:00:01Z", 172801);
+        TestDateTimeStringNumberOne("2001-01-03T00:00:01Z", 978480001);
+        TestDateTimeStringNumberOne("1960-01-03T00:00:01Z", -315446399);
+        TestDateTimeStringNumberOne("1960-01-03T00:00:00.25Z", -315446399.75);
+        TestDateTimeStringNumberOne("1960-01-03T00:00:00.75Z", -315446399.25);
+        TestDateTimeStringNumberOne("1400-01-03T00:00:01Z", -17987270399L);
+        TestDateTimeStringNumberOne("2100-01-03T00:00:01Z", 4102617601L);
+    }
+
     @Test
     public void TestDateTime() {
       ArrayList<String> dateList = new ArrayList<String>();