Updates for the Base Model for VO-DML 1.1

.gitignore

@@ -15,6 +15,7 @@ tools/gradletooling/gradle-plugin/bin/
 /tools/gradletooling/sample/allnav.yml
 /tools/gradletooling/sample/pythontest/generated/
 /tools/gradletooling/sample/mkdocs.yml
+__pycache__/
 /runtime/java/bin/
 /tools/gradletooling/sample/tmp/
 /tools/gradletooling/gradle-plugin/gradle/

models/ivoa/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("net.ivoa.vo-dml.vodmltools") version "0.5.13"
+    id("net.ivoa.vo-dml.vodmltools") version "0.5.15"
 //    id ("com.diffplug.spotless") version "5.17.1"
     `maven-publish`
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
@@ -9,14 +9,20 @@ plugins {
 
 
 group = "org.javastro.ivoa.vo-dml"
-version = "1.0-SNAPSHOT"
+version = "1.1-SNAPSHOT"
 
 vodml {
     vodmlDir.set(file("vo-dml"))
+    vodslDir.set(file("model"))
     bindingFiles.setFrom(file("vo-dml/ivoa_base.vodml-binding.xml"))
     outputPythonDir.set(layout.projectDirectory.dir("../../tools/gradletooling/sample/pythontest/generated"))
 
 }
+/*
+tasks.named("vodmlJavaGenerate") {
+    dependsOn("vodslToVodml")
+}
+*/
 
 tasks.test {
     useJUnitPlatform()
@@ -38,6 +44,15 @@ dependencies {
 tasks.named<Jar>("jar") {
     exclude("**/persistence.xml")
 }
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+    withJavadocJar()
+//    withSourcesJar()
+}
+
+
 //publishing - IMPL would be nice to factor this out in some way....
 nexusPublishing {
     repositories {

models/ivoa/model/IVOA-v1.0.vodsl

@@ -0,0 +1,36 @@
+
+model ivoa (1.1) "This is the main reference data model containing primitive types used in other data models.
+- note that this is an extended version for proposalDM including some identifier types that will hopefully make it into the main
+release
+"
+
+    primitive Unit -> string "Must conform to definition of unit in VOUnit spec."
+    primitive anyURI -> string "Represents a URI in the same way as the datatype of the same nam in XML Schema is used."
+    primitive boolean  "The standard boolean, having values true or false."
+    primitive complex  "Represents a complex number, consisting of a real and imaginary component, both of which are reals. Note that in many contexts there is no native mapping for this type and it must be treated with a custom mapping."
+    primitive datetime  "Represents a moment in time using a date+timestamp - string serialization to conform to ISO 8601"
+    primitive integer  "An integer number (from Z)."
+    primitive nonnegativeInteger  "An integer number from N, therefore greater than or equal to 0."
+    primitive rational  "A rational number from Q, represented by two integers, a numerator and a denominator. A native mapping to a serialisation context does in general not exists."
+    primitive real  "A real number (from R)."
+    primitive string  "A string, represented as an array of characters treated as a single, primitive value. Ala Java, a string can not be updated, that is any update leads to a different string. However in contrast to Java we assume that two strings that are identical in all their constitutent characters are the same.
+I.e. string has value type semantics."
+dtype IntegerQuantity  -> Quantity "An integer number with a unit. Examples of such units that can be used for attributes are bit/byte/kiloByte etc."
+  {   
+        value: integer   "The integer value of this IntegerQuantity.";
+  }
+
+abstract dtype Quantity  "Meant to represent the value of a numerical physical quantity.  
+Can be mapped in VOTables to FIELDrefs and PARAM(ref)s, in which case the @unit attribute of those VOTable elements is assumed to be mapped to the attribute on the Quantity.
+Ths is only allowed for these predefined ivoa types."
+  {   
+        unit: Unit  @?   "The unit of this  quantity.";
+  }
+
+dtype RealQuantity  -> Quantity "A real value with a unit."
+  {   
+        value: real   "The real value of this quantity";
+  }
+  primitive intIdentifier -> integer "an integer identifier that can be used as a key for lookup of an entity that is *outside this datamodel*"
+  primitive stringIdentifier -> string "a string identifier that can be used as a key for lookup of an entity that is *outside this datamodel*"
+  primitive ivoid -> anyURI "an identifier that can be used as a key to look up in an IVOA registry - see https://www.ivoa.net/documents/IVOAIdentifiers/"

models/ivoa/src/main/java/org/ivoa/vodml/stdtypes/Complex.java

@@ -5,6 +5,7 @@
 
 import org.ivoa.vodml.annotation.VoDml;
 import org.ivoa.vodml.annotation.VodmlRole;
+import org.ivoa.vodml.jpa.JPAManipulations;
 
 /**
  * UML PrimitiveType complex : Represents a complex number, consisting of a real
@@ -17,7 +18,7 @@
  */
 @VoDml(id = "ivoa:complex", role=VodmlRole.primitiveType, type="ivoa:complex")
 @Embeddable
-public class Complex {
+public class Complex implements JPAManipulations {
 
     /** string representation */
     private double re;
@@ -78,4 +79,15 @@ public void setRe(double re) {
     public void setIm(double im) {
         this.im = im;
     }
+
+    @Override
+    public void forceLoad() {
+        // nothing to do
+    }
+
+
+    @Override
+    public void persistRefs(EntityManager em) {
+        // nothing to do.
+    }
 }

models/ivoa/src/main/java/org/ivoa/vodml/stdtypes/Duration.java

@@ -5,6 +5,7 @@
 
 import org.ivoa.vodml.annotation.VoDml;
 import org.ivoa.vodml.annotation.VodmlRole;
+import org.ivoa.vodml.jpa.JPAManipulations;
 
 import jakarta.persistence.*;
 
@@ -20,7 +21,7 @@
  */
 @Embeddable
 @VoDml(id = "ivoa:duration", role=VodmlRole.primitiveType, type = "ivoa:duration" )
-public class Duration  {
+public class Duration implements JPAManipulations {
 //TODO not sure that this is the best representation - PAH - better to use java internal type esp. JDK8+
     /** string representation */
     private Date from;
@@ -58,4 +59,16 @@ public Date getTo() {
     public void setTo(Date to) {
         this.to = to;
     }
+
+    @Override
+    public void forceLoad() {
+        // nothing to do
+    }
+
+
+
+    @Override
+    public void persistRefs(EntityManager em) {
+        // nothing to do.
+    }
 }

models/ivoa/src/main/java/org/ivoa/vodml/stdtypes/Rational.java

@@ -5,6 +5,7 @@
 
 import org.ivoa.vodml.annotation.VoDml;
 import org.ivoa.vodml.annotation.VodmlRole;
+import org.ivoa.vodml.jpa.JPAManipulations;
 
 /**
  * UML DataType rational : A rational number from Q, represented by two
@@ -16,7 +17,7 @@
  */
 @VoDml(id = "ivoa:rational", role=VodmlRole.primitiveType, type="ivoa:rational")
 @Embeddable
-public class Rational {
+public class Rational  implements JPAManipulations {
 
     private int numerator;
     private int denominator;
@@ -73,4 +74,15 @@ public int getDenominator() {
     public void setDenominator(int denominator) {
         this.denominator = denominator;
     }
+
+    @Override
+    public void forceLoad() {
+        // nothing to do
+    }
+
+
+    @Override
+    public void persistRefs(EntityManager em) {
+       // nothing to do.
+    }
 }

models/ivoa/src/main/java/org/ivoa/vodml/stdtypes/Unit.java

@@ -0,0 +1,71 @@
+
+package org.ivoa.vodml.stdtypes;
+
+
+
+      /**
+      *  Must conform to definition of unit in VOUnit spec.
+      *  PrimitiveType Unit :
+      *
+      *  @author generated by https://github.com/ivoa/vo-dml tools
+      */
+
+@org.ivoa.vodml.annotation.VoDml(id="ivoa:Unit", role=org.ivoa.vodml.annotation.VodmlRole.primitiveType)
+
+
+        @org.eclipse.microprofile.openapi.annotations.media.Schema(description="Must conform to definition of unit in VOUnit spec.")
+    @jakarta.persistence.Embeddable
+
+    @jakarta.xml.bind.annotation.XmlType( name = "Unit")
+
+      public class Unit implements java.io.Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**  representation */
+        @jakarta.xml.bind.annotation.XmlValue
+        private String value;
+
+        /**
+         * Creates a new Unit Primitive Type instance, wrapping a base type.
+         *
+         * @param v the base object.
+         */
+        public Unit(final String v) {
+            this.value = v;
+        }
+      /**
+      * no arg constructor.
+      */
+      protected Unit() {}
+
+      /**
+      * copy constructor.
+       * @param c the object to be copied.
+      */
+      public Unit(Unit c)
+      {
+         this(c.value);
+      }
+
+      /**
+         * Return the representation of this primitive (value)
+         * @return string representation of this primitive( value)
+         */
+        public final String value() {
+            return this.value;
+        }
+
+        /**
+         * Return the string representation of this primitive value
+         * @see #value()
+         * @return string representation of this primitive
+         */
+        @Override
+        public final String toString() {
+            return value().toString();
+        }
+
+
+      }
+