Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to hibernate 6.6 #65

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
+274 −147
Draft

update to hibernate 6.6 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7ecf75
update to hibernate 6.6
pahjbo Nov 29, 2024
71ddf4b
try to make sure that base classes listed first in persistence.xml
pahjbo Dec 10, 2024
84d631b
reflocation should be an objectType
pahjbo Dec 13, 2024
7169fbd
extend the JPA test to have slightly more complex dataType hierarchy
pahjbo Dec 13, 2024
6d64575
adjust the hibernate logging to be easier to read
pahjbo Dec 13, 2024
41f60fe
slight change to use of @Embeddable and @MappedSuperclass
pahjbo Dec 13, 2024
c338014
update to hibernate 6.6
pahjbo Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 50 additions & 4 deletions models/sample/test/jpatest.vo-dml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<uri/>
<title></title>
<version>1.0</version>
<lastModified>2024-10-07T16:00:35Z</lastModified>
<lastModified>2024-12-02T20:51:41Z</lastModified>
<import>
<name>ivoa</name>
<version>1.0</version>
Expand Down Expand Up @@ -111,10 +111,50 @@
</multiplicity>
</attribute>
</dataType>
<dataType>
<vodml-id>AEtype</vodml-id>
<name>AEtype</name>
<description>dtype</description>
<extends>
<vodml-ref>jpatest:Intermediate</vodml-ref>
</extends>
<attribute>
<vodml-id>AEtype.evalr</vodml-id>
<name>evalr</name>
<description></description>
<datatype>
<vodml-ref>ivoa:real</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>AEtype.evals</vodml-id>
<name>evals</name>
<description></description>
<datatype>
<vodml-ref>ivoa:string</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</dataType>
<objectType abstract="true">
<vodml-id>Refbase</vodml-id>
<name>Refbase</name>
<description></description>
</objectType>
<objectType>
<vodml-id>ReferredTo1</vodml-id>
<name>ReferredTo1</name>
<description></description>
<extends>
<vodml-ref>jpatest:Refbase</vodml-ref>
</extends>
<attribute>
<vodml-id>ReferredTo1.sval</vodml-id>
<name>sval</name>
Expand All @@ -132,6 +172,9 @@
<vodml-id>ReferredTo2</vodml-id>
<name>ReferredTo2</name>
<description></description>
<extends>
<vodml-ref>jpatest:Refbase</vodml-ref>
</extends>
<attribute>
<vodml-id>ReferredTo2.sval</vodml-id>
<name>sval</name>
Expand All @@ -149,12 +192,15 @@
<vodml-id>ReferredTo3</vodml-id>
<name>ReferredTo3</name>
<description></description>
<extends>
<vodml-ref>jpatest:ReferredTo2</vodml-ref>
</extends>
<attribute>
<vodml-id>ReferredTo3.sval</vodml-id>
<name>sval</name>
<vodml-id>ReferredTo3.ival</vodml-id>
<name>ival</name>
<description></description>
<datatype>
<vodml-ref>ivoa:string</vodml-ref>
<vodml-ref>ivoa:integer</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
Expand Down
15 changes: 11 additions & 4 deletions models/sample/test/jpatest.vodsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,25 @@ dtype ADtype -> Intermediate "dtype" {
dvalr: ivoa:real "";
dvals: ivoa:string "";
}
dtype AEtype -> Intermediate "dtype" {
evalr: ivoa:real "";
evals: ivoa:string "";
}


otype ReferredTo1 {
abstract otype Refbase "" {}

otype ReferredTo1 -> Refbase {
sval : ivoa:string "";

}

otype ReferredTo2 "" {
otype ReferredTo2 -> Refbase "" {
sval : ivoa:string "";
}

otype ReferredTo3 "" {
sval : ivoa:string "";
otype ReferredTo3 -> ReferredTo2 "" {
ival : ivoa:integer "";
}

otype Child {
Expand Down
157 changes: 78 additions & 79 deletions models/sample/test/like_coords.vo-dml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
<title></title>
<author>Arnold Rots, Mark Cresitello-Dittmar, Omar Laurino</author>
<version>1.0</version>
<lastModified>2024-11-29T09:02:40Z</lastModified>
<lastModified>2024-12-06T07:20:16Z</lastModified>
<import>
<name>ivoa</name>
<version>1.0</version>
<name>null</name><!--should not be needed in modern vo-dml -->
<url>IVOA-v1.0.vo-dml.xml</url>
<documentationURL>not known</documentationURL>
</import>
Expand Down Expand Up @@ -486,80 +485,80 @@
</multiplicity>
</attribute>
</dataType>
<dataType abstract="true">
<vodml-id>RefLocation</vodml-id>
<name>RefLocation</name>
<description>RefLocation defines the origin of the spatial coordinate space. This location is represented either by a standard reference position (for which the absolute location in phase space is known by definition), or a specified point in another Spatial frame. This object is used as the origin of the SpaceFrame here, but also to specify the Spatial Reference Position (refPosition) associated with other domain Frames. For example, in the Time domain, the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which might be different from the detector location.
</description>
</dataType>
<dataType>
<vodml-id>StdRefLocation</vodml-id>
<name>StdRefLocation</name>
<description>An absolute a-priori known location in phase space (position and velocity). Values are selected from the StdRefPosition vocabulary. Considering that the GEOCENTER is really the only place for which we know the absolute location at all times, all other locations require the specification of a planetary ephemeris. LSR[KD] are reserved for spectral and reshift frames. TOPOCENTER (location of the observer) is special in that it assumes that the observing location is available through other means (e.g. a geographic location or an orbit ephemeris). RELOCATABLE is available for simulations. UNKNOWN should only be used if absolutely necessary.</description>
<objectType abstract="true">
<vodml-id>RefLocation</vodml-id>
<name>RefLocation</name>
<description>RefLocation defines the origin of the spatial coordinate space. This location is represented either by a standard reference position (for which the absolute location in phase space is known by definition), or a specified point in another Spatial frame. This object is used as the origin of the SpaceFrame here, but also to specify the Spatial Reference Position (refPosition) associated with other domain Frames. For example, in the Time domain, the Spatial Reference Position indicates that the 'time' values are the time that the 'event' occured at that location, which might be different from the detector location.
</description>
</objectType>
<objectType>
<vodml-id>StdRefLocation</vodml-id>
<name>StdRefLocation</name>
<description>An absolute a-priori known location in phase space (position and velocity). Values are selected from the StdRefPosition vocabulary. Considering that the GEOCENTER is really the only place for which we know the absolute location at all times, all other locations require the specification of a planetary ephemeris. LSR[KD] are reserved for spectral and reshift frames. TOPOCENTER (location of the observer) is special in that it assumes that the observing location is available through other means (e.g. a geographic location or an orbit ephemeris). RELOCATABLE is available for simulations. UNKNOWN should only be used if absolutely necessary.</description>
<extends>
<vodml-ref>coords:RefLocation</vodml-ref>
</extends>
<attribute>
<vodml-id>StdRefLocation.position</vodml-id>
<name>position</name>
<description>Standard reference location. Values MUST be selected from the controlled vocabulary at the given URL. </description>
<datatype>
<vodml-ref>ivoa:string</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
<semanticconcept>
<topConcept>ReferencePosition</topConcept>
<vocabularyURI>http://www.ivoa.net/rdf/refposition</vocabularyURI>
</semanticconcept>
</attribute>
</dataType>
<dataType>
<vodml-id>CustomRefLocation</vodml-id>
<name>CustomRefLocation</name>
<description>A custom reference location in phase space (position and velocity). Position and velocity are given as coordinates with an associated SpaceFrame. An epoch MAY be provided to further refine the location.</description>
<attribute>
<vodml-id>StdRefLocation.position</vodml-id>
<name>position</name>
<description>Standard reference location. Values MUST be selected from the controlled vocabulary at the given URL. </description>
<datatype>
<vodml-ref>ivoa:string</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
<semanticconcept>
<topConcept>ReferencePosition</topConcept>
<vocabularyURI>http://www.ivoa.net/rdf/refposition</vocabularyURI>
</semanticconcept>
</attribute>
</objectType>
<objectType>
<vodml-id>CustomRefLocation</vodml-id>
<name>CustomRefLocation</name>
<description>A custom reference location in phase space (position and velocity). Position and velocity are given as coordinates with an associated SpaceFrame. An epoch MAY be provided to further refine the location.</description>
<extends>
<vodml-ref>coords:RefLocation</vodml-ref>
</extends>
<attribute>
<vodml-id>CustomRefLocation.epoch</vodml-id>
<name>epoch</name>
<description>Epoch for the reference location.</description>
<datatype>
<vodml-ref>coords:Epoch</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>CustomRefLocation.position</vodml-id>
<name>position</name>
<description>The spatial coordinates of the reference location.</description>
<datatype>
<vodml-ref>coords:Point</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>CustomRefLocation.velocity</vodml-id>
<name>velocity</name>
<description>The velocity of the reference location.</description>
<datatype>
<vodml-ref>coords:Point</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</dataType>
<attribute>
<vodml-id>CustomRefLocation.epoch</vodml-id>
<name>epoch</name>
<description>Epoch for the reference location.</description>
<datatype>
<vodml-ref>coords:Epoch</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>CustomRefLocation.position</vodml-id>
<name>position</name>
<description>The spatial coordinates of the reference location.</description>
<datatype>
<vodml-ref>coords:Point</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
<attribute>
<vodml-id>CustomRefLocation.velocity</vodml-id>
<name>velocity</name>
<description>The velocity of the reference location.</description>
<datatype>
<vodml-ref>coords:Point</vodml-ref>
</datatype>
<multiplicity>
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</objectType>
<objectType abstract="true">
<vodml-id>CoordSpace</vodml-id>
<name>CoordSpace</name>
Expand Down Expand Up @@ -678,7 +677,7 @@
<extends>
<vodml-ref>coords:CoordFrame</vodml-ref>
</extends>
<attribute>
<composition>
<vodml-id>GenericFrame.refPosition</vodml-id>
<name>refPosition</name>
<description>Spatial location in phase space (position and velocity) at which the observed value is considered to have been taken. This will typically be given by a standard reference position, but we allow for custom locations as well.
Expand All @@ -690,7 +689,7 @@
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</composition>
<attribute>
<vodml-id>GenericFrame.planetaryEphem</vodml-id>
<name>planetaryEphem</name>
Expand All @@ -712,7 +711,7 @@
<extends>
<vodml-ref>coords:CoordFrame</vodml-ref>
</extends>
<attribute>
<composition>
<vodml-id>SpaceFrame.refPosition</vodml-id>
<name>refPosition</name>
<description>The spatial location at which the coordinates are considered to have been determined. This model supports locations provided as either a standard reference position (e.g. GEOCENTER), or a coordinate specifying a custom location (e.g. long, lat, height ).</description>
Expand All @@ -723,7 +722,7 @@
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</composition>
<attribute>
<vodml-id>SpaceFrame.spaceRefFrame</vodml-id>
<name>spaceRefFrame</name>
Expand Down Expand Up @@ -773,7 +772,7 @@
<extends>
<vodml-ref>coords:CoordFrame</vodml-ref>
</extends>
<attribute>
<composition>
<vodml-id>TimeFrame.refPosition</vodml-id>
<name>refPosition</name>
<description>The spatial location at which the coordinate is considered to have been taken. This model supports locations provided as either a standard reference position (e.g. GEOCENTER), or a coordinate specifying a custom location (e.g. long, lat, height).</description>
Expand All @@ -784,7 +783,7 @@
<minOccurs>1</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</composition>
<attribute>
<vodml-id>TimeFrame.timescale</vodml-id>
<name>timescale</name>
Expand All @@ -801,7 +800,7 @@
<vocabularyURI>http://www.ivoa.net/rdf/timescale</vocabularyURI>
</semanticconcept>
</attribute>
<attribute>
<composition>
<vodml-id>TimeFrame.refDirection</vodml-id>
<name>refDirection</name>
<description>The reference direction is needed if the time stamps are transformed to a time frame with a different reference position. In those situations, the solar system ephemeris also comes into play. See: FITS WCS Paper IV for details, but in short: The reference direction, presumably the direction to the thing being observed, is used in conjunction with the reference position and planetary ephemeris to determine the correction applied for the path length change. To be fully useful, one also needs to know the location at which the observation was made ( i.e. the observatory location), which is not considered to be Frame metadata.</description>
Expand All @@ -812,7 +811,7 @@
<minOccurs>0</minOccurs>
<maxOccurs>1</maxOccurs>
</multiplicity>
</attribute>
</composition>
</objectType>
<objectType>
<vodml-id>AstroCoordSystem</vodml-id>
Expand Down
Loading
Loading