diff --git a/cadc-dali/build.gradle b/cadc-dali/build.gradle index e2b3b693..090fb20c 100644 --- a/cadc-dali/build.gradle +++ b/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' diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Circle.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/Circle.java index 443c63b3..3dd944ad 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Circle.java +++ b/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 getWrappedValue() { + return toArray(); + } + public double[] toArray() { return new double[]{center.getLongitude(), center.getLatitude(), radius}; } diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Interval.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/Interval.java index 2638d2d1..f1d7286b 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Interval.java +++ b/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 */ -public class Interval { +public class Interval implements PrimitiveWrapper { private T lower; private T upper; @@ -108,6 +110,17 @@ public T getUpper() { return upper; } + // org.opencadc.entity.PrimitiveWrapper + @Override + public Object getWrappedValue() { + if (lower instanceof Double) { + return new double[] { lower.doubleValue(), upper.doubleValue() }; + } else if (lower instanceof Long) { + return new long[] { lower.longValue(), upper.longValue() }; + } + throw new UnsupportedOperationException("unsupported interval type: " + lower.getClass().getName()); + } + @Override public boolean equals(Object obj) { if (obj == null) { diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiPolygon.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiPolygon.java index 2a8a7cb5..ddc0c898 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiPolygon.java +++ b/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); diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiShape.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiShape.java index 6c445b1a..ac79cb67 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/MultiShape.java +++ b/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 shapes = new ArrayList<>(); @@ -87,6 +88,12 @@ public List getShapes() { return shapes; } + // org.opencadc.entity.PrimitiveWrapper + @Override + public Object getWrappedValue() { + return getShapes(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Point.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/Point.java index 38ea5093..6a677cac 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Point.java +++ b/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 getWrappedValue() { + return toArray(); + } + public double[] toArray() { return new double[] {cval1, cval2}; } diff --git a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Polygon.java b/cadc-dali/src/main/java/ca/nrc/cadc/dali/Polygon.java index f201020f..f5e36845 100644 --- a/cadc-dali/src/main/java/ca/nrc/cadc/dali/Polygon.java +++ b/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 getWrappedValue() { + return toArray(); + } + public double[] toArray() { double[] arr = new double[points.size() * 2]; for (int i = 0; i < points.size(); i++) { diff --git a/cadc-dali/src/test/java/ca/nrc/cadc/dali/PrimitiveWrapperTest.java b/cadc-dali/src/test/java/ca/nrc/cadc/dali/PrimitiveWrapperTest.java new file mode 100644 index 00000000..8b003c31 --- /dev/null +++ b/cadc-dali/src/test/java/ca/nrc/cadc/dali/PrimitiveWrapperTest.java @@ -0,0 +1,131 @@ +/* +************************************************************************ +******************* CANADIAN ASTRONOMY DATA CENTRE ******************* +************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** +* +* (c) 2025. (c) 2025. +* Government of Canada Gouvernement du Canada +* National Research Council Conseil national de recherches +* Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 +* All rights reserved Tous droits réservés +* +* NRC disclaims any warranties, Le CNRC dénie toute garantie +* expressed, implied, or énoncée, implicite ou légale, +* statutory, of any kind with de quelque nature que ce +* respect to the software, soit, concernant le logiciel, +* including without limitation y compris sans restriction +* any warranty of merchantability toute garantie de valeur +* or fitness for a particular marchande ou de pertinence +* purpose. NRC shall not be pour un usage particulier. +* liable in any event for any Le CNRC ne pourra en aucun cas +* damages, whether direct or être tenu responsable de tout +* indirect, special or general, dommage, direct ou indirect, +* consequential or incidental, particulier ou général, +* arising from the use of the accessoire ou fortuit, résultant +* software. Neither the name de l'utilisation du logiciel. Ni +* of the National Research le nom du Conseil National de +* Council of Canada nor the Recherches du Canada ni les noms +* names of its contributors may de ses participants ne peuvent +* be used to endorse or promote être utilisés pour approuver ou +* products derived from this promouvoir les produits dérivés +* software without specific prior de ce logiciel sans autorisation +* written permission. préalable et particulière +* par écrit. +* +* This file is part of the Ce fichier fait partie du projet +* OpenCADC project. OpenCADC. +* +* OpenCADC is free software: OpenCADC est un logiciel libre ; +* you can redistribute it and/or vous pouvez le redistribuer ou le +* modify it under the terms of modifier suivant les termes de +* the GNU Affero General Public la “GNU Affero General Public +* License as published by the License” telle que publiée +* Free Software Foundation, par la Free Software Foundation +* either version 3 of the : soit la version 3 de cette +* License, or (at your option) licence, soit (à votre gré) +* any later version. toute version ultérieure. +* +* OpenCADC is distributed in the OpenCADC est distribué +* hope that it will be useful, dans l’espoir qu’il vous +* but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE +* without even the implied GARANTIE : sans même la garantie +* warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ +* or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF +* PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence +* General Public License for Générale Publique GNU Affero +* more details. pour plus de détails. +* +* You should have received Vous devriez avoir reçu une +* a copy of the GNU Affero copie de la Licence Générale +* General Public License along Publique GNU Affero avec +* with OpenCADC. If not, see OpenCADC ; si ce n’est +* . pas le cas, consultez : +* . +* +************************************************************************ +*/ + +package ca.nrc.cadc.dali; + +import ca.nrc.cadc.util.Log4jInit; +import java.net.URI; +import java.security.MessageDigest; +import java.util.UUID; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.junit.Assert; +import org.junit.Test; +import org.opencadc.persist.Entity; + +/** + * Single test to verify that classes implementing PrimitiveWrapper return + * acceptable wrapped value types. + * + * @author pdowler + */ +public class PrimitiveWrapperTest { + private static final Logger log = Logger.getLogger(PrimitiveWrapperTest.class); + + static { + Log4jInit.setLevel(PrimitiveWrapperTest.class.getPackageName(), Level.INFO); + } + + public PrimitiveWrapperTest() { + } + + @Test + public void testDataTypes() throws Exception { + // static UUID because it is included in metaChecksum + final UUID id = UUID.fromString("15c271c5-c8f9-4484-a87f-8545f57e5f0e"); + // previously computed value to make sure behaviour is stable + final URI expected = URI.create("md5:748bd39388a2bb672019c62acb0841b9"); + + TestEntity e = new TestEntity(id); + log.info("Entity.id: " + e.getID()); + URI mcs = e.computeMetaChecksum(MessageDigest.getInstance("md5")); + log.info("metaChecksum: " + mcs); + Assert.assertNotNull(mcs); + Assert.assertEquals("md5", mcs.getScheme()); + Assert.assertEquals(expected, mcs); + } + + private class TestEntity extends Entity { + public Interval doubleInterval = new Interval<>(1.0, 2.0); + public Interval longInterval = new Interval<>(3L, 4L); + public Point point = new Point(10.0, 11.0); + public Circle circle = new Circle(point, 0.5); + public Polygon poly = new Polygon(); + public MultiShape multiShape = new MultiShape(); + + TestEntity(UUID id) { + super(id, false, true, true, true); + poly.getVertices().add(new Point(2.0, 2.0)); + poly.getVertices().add(new Point(1.0, 3.0)); + poly.getVertices().add(new Point(2.0, 4.0)); + poly.getVertices().add(new Point(3.0, 3.0)); + + multiShape.getShapes().add(circle); + multiShape.getShapes().add(poly); + } + } +}