update Java version

Author: peteroupc

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

@@ -1158,30 +1158,33 @@ public static <TKey, TValue> CBORObject FromObject(Map<TKey,
 
     /**
      * Generates a CBORObject from an arbitrary object. The following types are
-     * specially handled by this method: null , primitive types, strings,
-     * CBORObject , arbitrary-precision decimal , arbitrary-precision binary
-     * float , arbitrary-precision rational number, the custom
-     * arbitrary-precision integer , lists, arrays, enumerations (
-     * <code>Enum</code> objects), and maps. <p>In the .NET version, if the object
-     * is a type not specially handled by this method, returns a CBOR map
-     * with the values of each of its read/write properties (or all
-     * properties in the case of an anonymous type). Properties are
-     * converted to their camel-case names (meaning if a name starts with A
-     * to Z, that letter is lower-cased). If the property name begins with
-     * the word "Is", that word is deleted from the name. Also, .NET
-     * <code>Enum</code> objects will be converted to their integer values, and a
-     * multidimensional array is converted to an array of arrays.</p> <p>In
-     * the Java version, if the object is a type not specially handled by
-     * this method, this method checks the CBOR object for methods starting
-     * with the word "get" or "is" that take no parameters, and returns a
-     * CBOR map with one entry for each such method found. For each method
-     * found, the starting word "get" or "is" is deleted from its name, and
-     * the name is converted to camel case (meaning if a name starts with A
-     * to Z, that letter is lower-cased). Also, Java <code>Enum</code> objects
-     * will be converted to the result of their name method.</p> <p>If the
-     * input is a byte array, the byte array is copied to a new byte array.
-     * (This method can't be used to decode CBOR data from a byte array; for
-     * that, use the DecodeFromBytes method instead.).</p>
+     * specially handled by this method: null; primitive types; string;
+     * CBORObject; the <code>EDecimal</code>, <code>EFloat</code>, <code>EInteger</code>, and
+     * <code>ERational</code> classes in the new <code>PeterO.Numbers</code> library (in
+     * .NET) or the <code>com.github.peteroupc/numbers</code> artifact (in Java);
+     * the legacy <code>ExtendedDecimal</code>, <code>ExtendedFloat</code>,
+     * <code>ExtendedInteger</code>, and <code>ExtendedRational</code> classes in this
+     * library; arrays; enumerations (<code>Enum</code> objects); and maps. <p>In
+     * the .NET version, if the object is a type not specially handled by
+     * this method, returns a CBOR map with the values of each of its
+     * read/write properties (or all properties in the case of an anonymous
+     * type). Properties are converted to their camel-case names (meaning if
+     * a name starts with A to Z, that letter is lower-cased). If the
+     * property name begins with the word "Is", that word is deleted from
+     * the name. Also, .NET <code>Enum</code> objects will be converted to their
+     * integer values, and a multidimensional array is converted to an array
+     * of arrays.</p> <p>In the Java version, if the object is a type not
+     * specially handled by this method, this method checks the CBOR object
+     * for methods starting with the word "get" or "is" that take no
+     * parameters, and returns a CBOR map with one entry for each such
+     * method found. For each method found, the starting word "get" or "is"
+     * is deleted from its name, and the name is converted to camel case
+     * (meaning if a name starts with A to Z, that letter is lower-cased).
+     * Also, Java <code>Enum</code> objects will be converted to the result of
+     * their name method.</p> <p>If the input is a byte array, the byte
+     * array is copied to a new byte array. (This method can't be used to
+     * decode CBOR data from a byte array; for that, use the DecodeFromBytes
+     * method instead.).</p>
      * @param obj An arbitrary object.
      * @return A CBOR object corresponding to the given object. Returns
      * CBORObject.Null if the object is null.
@@ -1205,6 +1208,22 @@ public static CBORObject FromObject(Object obj) {
       if (obj instanceof BigInteger) {
         return FromObject((BigInteger)obj);
       }
+      EInteger eif = ((obj instanceof EInteger) ? (EInteger)obj : null);
+      if (eif != null) {
+        return FromObject(eif);
+      }
+      EDecimal edf = ((obj instanceof EDecimal) ? (EDecimal)obj : null);
+      if (edf != null) {
+        return FromObject(edf);
+      }
+      EFloat eff = ((obj instanceof EFloat) ? (EFloat)obj : null);
+      if (eff != null) {
+        return FromObject(eff);
+      }
+      ERational erf = ((obj instanceof ERational) ? (ERational)obj : null);
+      if (erf != null) {
+        return FromObject(erf);
+      }
       ExtendedDecimal df = ((obj instanceof ExtendedDecimal) ? (ExtendedDecimal)obj : null);
       if (df != null) {
         return FromObject(df);

src/main/java/com/upokecenter/util/BigInteger.java

@@ -15,11 +15,21 @@
 import com.upokecenter.numbers.*;
 
     /**
-     * An arbitrary-precision integer. <p><b>Thread safety:</b>Instances of this
-     * class are immutable, so they are inherently safe for use by multiple
-     * threads. Multiple instances of this object with the same value are
-     * interchangeable, but they should be compared using the "Equals"
-     * method rather than the "==" operator.</p>
+     * <p><b>This class is largely obsolete. It will be replaced by a new version
+     * of this class in a different namespace/package and library, called
+     * <code>PeterO.Numbers.EInteger</code> in the <code>PeterO.Numbers</code> library
+     * (in .NET), or <code>com.upokecenter.numbers.getEInteger()</code> in the
+     * <code>com.github.peteroupc/numbers</code> artifact (in Java). This new
+     * class can be used in the <code>CBORObject.FromObject(Object)</code> method,
+     * among other things, but for method, among other things (by including
+     * the new library in your code), but for this versionof the CBOR
+     * library doesn't include any methods that explicitly take an
+     * <code>EInteger</code> as a parameter or return value.</b></p> An
+     * arbitrary-precision integer. <p><b>Thread safety:</b>Instances of
+     * this class are immutable, so they are inherently safe for use by
+     * multiple threads. Multiple instances of this object with the same
+     * value are interchangeable, but they should be compared using the
+     * "Equals" method rather than the "==" operator.</p>
      */
   public final class BigInteger implements Comparable<BigInteger> {
     /**
@@ -202,9 +212,7 @@ public static BigInteger fromRadixSubstring(
      * @throws java.lang.NullPointerException The parameter {@code str} is null.
      * @throws java.lang.NumberFormatException The parameter {@code str} is in an invalid
      * format.
-     * @deprecated Use EInteger from PeterO.Numbers/com.upokecenter.numbers.
- */
-@Deprecated
+     */
   public static BigInteger fromString(String str) {
 return new BigInteger(EInteger.FromString(str));
 }

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

@@ -5,6 +5,7 @@
 import org.junit.Test;
 import com.upokecenter.util.*;
 import com.upokecenter.cbor.*;
+import com.upokecenter.numbers.*;
 
   public class CBORObjectTest {
     private static String[] jsonFails = { "\"\\uxxxx\"",
@@ -2037,6 +2038,41 @@ public void TestFromJSONString() {
       TestFailingJSON(jsonTemp);
     }
     @Test
+    public void TestEI() {
+      CBORObject cbor = CBORObject.FromObject(EInteger.FromString("100"));
+      Assert.assertEquals(CBORType.Number, cbor.getType());
+      {
+String stringTemp = cbor.toString();
+Assert.assertEquals(
+"100",
+stringTemp);
+}
+      cbor = CBORObject.FromObject(EDecimal.FromString("200"));
+      Assert.assertEquals(CBORType.Number, cbor.getType());
+      {
+String stringTemp = cbor.toString();
+Assert.assertEquals(
+"200",
+stringTemp);
+}
+      cbor = CBORObject.FromObject(EFloat.FromString("300"));
+      Assert.assertEquals(CBORType.Number, cbor.getType());
+      {
+String stringTemp = cbor.toString();
+Assert.assertEquals(
+"300",
+stringTemp);
+}
+      cbor = CBORObject.FromObject(ERational.Create(1, 2));
+      Assert.assertEquals(CBORType.Number, cbor.getType());
+      {
+String stringTemp = cbor.toString();
+Assert.assertEquals(
+"1/2",
+stringTemp);
+}
+    }
+    @Test
     public void TestFromObject() {
       CBORObject[] cborarray = new CBORObject[2];
       cborarray[0] = CBORObject.False;