-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #172 from mbari-org/feature/hibernate
Feature/hibernate
- Loading branch information
Showing
41 changed files
with
1,795 additions
and
842 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
org.mbari.vars.core/src/main/java/org/mbari/vars/core/util/InstantUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package org.mbari.vars.core.util; | ||
|
|
||
| import java.time.Instant; | ||
| import java.time.ZoneId; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.util.Optional; | ||
|
|
||
| public class InstantUtils { | ||
|
|
||
| private static ZoneId utcZone = ZoneId.of("UTC"); | ||
| public static DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ISO_DATE_TIME.withZone(utcZone); | ||
| public static DateTimeFormatter COMPACT_TIME_FORMATTER = | ||
| DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmssX").withZone(utcZone); | ||
| public static DateTimeFormatter COMPACT_TIME_FORMATTER_MS = | ||
| DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss.SSSX").withZone(utcZone); | ||
| public static DateTimeFormatter COMPACT_TIME_FORMATTER_NS = | ||
| DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss.SSSSSSX").withZone(utcZone); | ||
|
|
||
| public static Optional<Instant> parseIso8601(String s) { | ||
| return parse(s, TIME_FORMATTER) | ||
| .or(() -> parse(s, COMPACT_TIME_FORMATTER)) | ||
| .or(() -> parse(s, COMPACT_TIME_FORMATTER_MS)) | ||
| .or(() -> parse(s, COMPACT_TIME_FORMATTER_NS)); | ||
| } | ||
|
|
||
| private static Optional<Instant> parse(String s, DateTimeFormatter formatter) { | ||
| try { | ||
| return Optional.of(Instant.from(formatter.parse(s))); | ||
| } | ||
| catch (Exception e) { | ||
| return Optional.empty(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
org.mbari.vars.services/src/integTest/java/org/mbari/vars/services/AssertUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| package org.mbari.vars.services; | ||
|
|
||
| import org.mbari.vars.services.model.*; | ||
| import org.mbari.vcr4j.time.Timecode; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| public class AssertUtils { | ||
|
|
||
| public static void assertSameMedia(Media a, Media b, boolean checkUuid) { | ||
| if (checkUuid) { | ||
| assertEquals(a.getVideoReferenceUuid(), b.getVideoReferenceUuid()); | ||
| assertEquals(a.getVideoUuid(), b.getVideoUuid()); | ||
| assertEquals(a.getVideoSequenceUuid(), b.getVideoSequenceUuid()); | ||
| } | ||
| assertEquals(a.getAudioCodec(), b.getAudioCodec()); | ||
| assertEquals(a.getCameraId(), b.getCameraId()); | ||
| assertEquals(a.getContainer(), b.getContainer()); | ||
| assertEquals(a.getDuration(), b.getDuration()); | ||
| assertArrayEquals(a.getSha512(), b.getSha512()); | ||
| assertEquals(a.getUri(), b.getUri()); | ||
| assertEquals(a.getVideoSequenceName(), b.getVideoSequenceName()); | ||
| assertEquals(a.getVideoName(), b.getVideoName()); | ||
| assertEquals(a.getVideoCodec(), b.getVideoCodec()); | ||
| assertEquals(a.getStartTimestamp(), b.getStartTimestamp()); | ||
| assertEquals(a.getFrameRate(), b.getFrameRate()); | ||
| assertEquals(a.getWidth(), b.getWidth()); | ||
| assertEquals(a.getHeight(), b.getHeight()); | ||
| assertEquals(a.getSizeBytes(), b.getSizeBytes()); | ||
| assertEquals(a.getDescription(), b.getDescription()); | ||
| assertEquals(a.getVideoDescription(), b.getVideoDescription()); | ||
| assertEquals(a.getVideoSequenceDescription(), b.getVideoSequenceDescription()); | ||
| } | ||
|
|
||
| public static void assertSameAnnotation(Annotation a, Annotation b, boolean checkUuid, boolean checkRelations) { | ||
| if (checkUuid) { | ||
| assertEquals(a.getObservationUuid(), b.getObservationUuid()); | ||
| assertEquals(a.getImagedMomentUuid(), b.getImagedMomentUuid()); | ||
| } | ||
| assertEquals(a.getVideoReferenceUuid(), b.getVideoReferenceUuid()); | ||
| assertEquals(a.getConcept(), b.getConcept()); | ||
| assertEquals(a.getObserver(), b.getObserver()); | ||
| assertEquals(a.getObservationTimestamp(), b.getObservationTimestamp()); | ||
| assertEquals(a.getVideoReferenceUuid(), b.getVideoReferenceUuid()); | ||
| assertEquals(a.getDuration(), b.getDuration()); | ||
| assertEquals(a.getElapsedTime(), b.getElapsedTime()); | ||
| assertEquals(a.getRecordedTimestamp(), b.getRecordedTimestamp()); | ||
| assertEquals(a.getGroup(), b.getGroup()); | ||
| assertEquals(a.getActivity(), b.getActivity()); | ||
| if (checkRelations) { | ||
| assertEquals(a.getAssociations().size(), b.getAssociations().size()); | ||
| assertEquals(a.getImageReferences().size(), b.getImageReferences().size()); | ||
| } | ||
| } | ||
|
|
||
| public static void assertSameAssociation(Association a, Association b, boolean checkUuid) { | ||
| assertEquals(a.getLinkName(), b.getLinkName()); | ||
| assertEquals(a.getLinkValue(), b.getLinkValue()); | ||
| assertEquals(a.getToConcept(), b.getToConcept()); | ||
| assertEquals(a.getMimeType(), b.getMimeType()); | ||
| if (checkUuid) { | ||
| assertEquals(a.getUuid(), b.getUuid()); | ||
| } | ||
| } | ||
|
|
||
| public static void assertSameImageReference(ImageReference a, ImageReference b, boolean checkUuid) { | ||
| assertEquals(a.getFormat(), b.getFormat()); | ||
| assertEquals(a.getUrl(), b.getUrl()); | ||
| assertEquals(a.getDescription(), b.getDescription()); | ||
| assertEquals(a.getWidth(), b.getWidth()); | ||
| assertEquals(a.getHeight(), b.getHeight()); | ||
| if (checkUuid) { | ||
| assertEquals(a.getUuid(), b.getUuid()); | ||
| } | ||
| } | ||
|
|
||
| public static void assertSameImage(Image a, Image b, boolean checkUuid) { | ||
| assertEquals(a.getFormat(), b.getFormat()); | ||
| assertEquals(a.getUrl(), b.getUrl()); | ||
| assertEquals(a.getDescription(), b.getDescription()); | ||
| assertEquals(a.getWidth(), b.getWidth()); | ||
| assertEquals(a.getHeight(), b.getHeight()); | ||
| var tca = Optional.ofNullable(a.getTimecode()).orElse(Timecode.zero()).toString(); | ||
| var tcb = Optional.ofNullable(a.getTimecode()).orElse(Timecode.zero()).toString(); | ||
| assertEquals(tca, tcb); | ||
| assertEquals(a.getElapsedTime(), b.getElapsedTime()); | ||
| assertEquals(a.getRecordedTimestamp(), b.getRecordedTimestamp()); | ||
| assertEquals(a.getVideoReferenceUuid(), b.getVideoReferenceUuid()); | ||
| if (checkUuid) { | ||
| assertEquals(a.getImageReferenceUuid(), b.getImageReferenceUuid()); | ||
| assertEquals(a.getImagedMomentUuid(), b.getImagedMomentUuid()); | ||
| } | ||
| } | ||
|
|
||
| public static void assertSameAncillaryData(AncillaryData a, AncillaryData b, boolean checkUuid) { | ||
| assertSameAncillaryData(a, b, checkUuid, true); | ||
| } | ||
|
|
||
| public static void assertSameAncillaryData(AncillaryData a, AncillaryData b, boolean checkUuid, boolean checkTimestamp) { | ||
| if (checkTimestamp) { | ||
| assertEquals(a.getRecordedTimestamp(), b.getRecordedTimestamp()); | ||
| } | ||
| assertEquals(a.getAltitude(), b.getAltitude(), 0.001); | ||
| assertEquals(a.getCrs(), b.getCrs()); | ||
| assertEquals(a.getDepthMeters(), b.getDepthMeters(), 0.001); | ||
| assertEquals(a.getLatitude(), b.getLatitude(), 0.001); | ||
| assertEquals(a.getLongitude(), b.getLongitude(), 0.001); | ||
| assertEquals(a.getLightTransmission(), b.getLightTransmission(), 0.001); | ||
| assertEquals(a.getOxygenMlL(), b.getOxygenMlL(), 0.001); | ||
| assertEquals(a.getPhi(), b.getPhi()); | ||
| assertEquals(a.getPosePositionUnits(), b.getPosePositionUnits()); | ||
| assertEquals(a.getPressureDbar(), b.getPressureDbar(), 0.001); | ||
| assertEquals(a.getPsi(), b.getPsi()); | ||
| assertEquals(a.getSalinity(), b.getSalinity(), 0.001); | ||
| assertEquals(a.getTemperatureCelsius(), b.getTemperatureCelsius(), 0.001); | ||
| assertEquals(a.getTheta(), b.getTheta()); | ||
| assertEquals(a.getX(), b.getX()); | ||
| assertEquals(a.getY(), b.getY()); | ||
| assertEquals(a.getZ(), b.getZ()); | ||
| if (checkUuid) { | ||
| assertEquals(a.getUuid(), b.getUuid()); | ||
| assertEquals(a.getImagedMomentUuid(), b.getImagedMomentUuid()); | ||
| } | ||
| } | ||
|
|
||
| public static void assertSameCachedVideoReference(CachedVideoReference a, CachedVideoReference b, boolean checkUuid) { | ||
| assertEquals(a.getMissionContact(), b.getMissionContact()); | ||
| assertEquals(a.getPlatformName(), b.getPlatformName()); | ||
| assertEquals(a.getMissionId(), b.getMissionId()); | ||
| assertEquals(a.getVideoReferenceUuid(), b.getVideoReferenceUuid()); | ||
| if (checkUuid) { | ||
| assertEquals(a.getUuid(), b.getUuid()); | ||
| } | ||
| } | ||
|
|
||
| public static void assertSameIndex(Index a, Index b, boolean checkUuid) { | ||
| assertEquals(a.getElapsedTime(), b.getElapsedTime()); | ||
| assertEquals(a.getRecordedTimestamp(), b.getRecordedTimestamp()); | ||
| assertEquals(a.getVideoReferenceUuid(), b.getVideoReferenceUuid()); | ||
| if (checkUuid) { | ||
| assertEquals(a.getUuid(), b.getUuid()); | ||
| } | ||
| } | ||
|
|
||
| } |
6 changes: 3 additions & 3 deletions
6
org.mbari.vars.services/src/integTest/java/org/mbari/vars/services/RequestPagerDemo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.