update data type classes used in caom2-2.5.0 to implement PrimitiveWrapper

cadc-dali/build.gradle

@@ -15,7 +15,7 @@ sourceCompatibility = 11
 
 group = 'org.opencadc'
 
-version = '1.2.30'
+version = '1.2.31'
 
 description = 'OpenCADC DALI library'
 def git_url = 'https://github.com/opencadc/dal'

cadc-dali/src/main/java/ca/nrc/cadc/dali/Circle.java

@@ -69,11 +69,13 @@
 
 package ca.nrc.cadc.dali;
 
+import org.opencadc.persist.PrimitiveWrapper;
+
 /**
  *
  * @author pdowler
  */
-public class Circle implements Shape {
+public class Circle implements Shape, PrimitiveWrapper {
     private Point center;
     private double radius;
 
@@ -118,6 +120,12 @@ public double getRadius() {
         return radius;
     }
 
+    // org.opencadc.entity.PrimitiveWrapper
+    @Override
+    public Object getValue() {
+        return toArray();
+    }
+
     public double[] toArray() {
         return new double[]{center.getLongitude(), center.getLatitude(), radius};
     }

cadc-dali/src/main/java/ca/nrc/cadc/dali/Interval.java

@@ -67,12 +67,14 @@
 
 package ca.nrc.cadc.dali;
 
+import org.opencadc.persist.PrimitiveWrapper;
+
 /**
  *
  * @author pdowler
  * @param <T>
  */
-public class Interval<T extends Number> {
+public class Interval<T extends Number> implements PrimitiveWrapper {
 
     private T lower;
     private T upper;
@@ -108,6 +110,12 @@ public T getUpper() {
         return upper;
     }
 
+    // org.opencadc.entity.PrimitiveWrapper
+    @Override
+    public Object getValue() {
+        return toArray();
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {

cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiPolygon.java

@@ -74,7 +74,9 @@
 /**
  *
  * @author pdowler
+ * @deprecated did not make it into DALI-1.2 and not used in CAOM-2.5
  */
+@Deprecated
 public class MultiPolygon {
     private static final Logger log = Logger.getLogger(MultiPolygon.class);
 

cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiShape.java

@@ -70,12 +70,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Logger;
+import org.opencadc.persist.PrimitiveWrapper;
 
 /**
  *
  * @author pdowler
  */
-public class MultiShape {
+public class MultiShape implements PrimitiveWrapper {
     private static final Logger log = Logger.getLogger(MultiShape.class);
 
     private final List<Shape> shapes = new ArrayList<>();
@@ -87,6 +88,12 @@ public List<Shape> getShapes() {
         return shapes;
     }
 
+    // org.opencadc.entity.PrimitiveWrapper
+    @Override
+    public Object getValue() {
+        return getShapes();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();

cadc-dali/src/main/java/ca/nrc/cadc/dali/Point.java

@@ -69,11 +69,13 @@
 
 package ca.nrc.cadc.dali;
 
+import org.opencadc.persist.PrimitiveWrapper;
+
 /**
  *
  * @author pdowler
  */
-public class Point {
+public class Point implements PrimitiveWrapper {
     private final double cval1;
     private final double cval2;
 
@@ -110,6 +112,12 @@ public double getLatitude() {
         return cval2;
     }
 
+    // org.opencadc.entity.PrimitiveWrapper
+    @Override
+    public Object getValue() {
+        return toArray();
+    }
+
     public double[] toArray() {
         return new double[] {cval1, cval2};
     }

cadc-dali/src/main/java/ca/nrc/cadc/dali/Polygon.java

@@ -73,6 +73,7 @@
 import java.util.Iterator;
 import java.util.List;
 import org.apache.log4j.Logger;
+import org.opencadc.persist.PrimitiveWrapper;
 
 /**
  * DALI polygon class with port of CAOM-2.4 polygon validation code. Note: the code
@@ -82,7 +83,7 @@
  *
  * @author pdowler
  */
-public class Polygon implements Shape {
+public class Polygon implements Shape, PrimitiveWrapper {
 
     private static final Logger log = Logger.getLogger(Polygon.class);
 
@@ -132,6 +133,12 @@ public boolean equals(Object obj) {
         return true;
     }
 
+    // org.opencadc.entity.PrimitiveWrapper
+    @Override
+    public Object getValue() {
+        return toArray();
+    }
+
     public double[] toArray() {
         double[] arr = new double[points.size() * 2];
         for (int i = 0; i < points.size(); i++) {