Skip to content

[DLSR-377] Add missing ImageService2 #277

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

Merged
ksclarke merged 3 commits into from
Jun 10, 2026
Merged

[DLSR-377] Add missing ImageService2 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5659bcc
[DLSR-377] Add missing ImageService2
ksclarke Jun 10, 2026
932c648
Update test fixture
ksclarke Jun 10, 2026
bc24f1d
Update enforcer plugin config
ksclarke Jun 10, 2026
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
46 changes: 41 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@
<vertx.plugin.version>1.0.27</vertx.plugin.version>
<codacy.plugin.version>1.2.0</codacy.plugin.version>
<xml.maven.plugin.version>1.0.2</xml.maven.plugin.version>
<docker.maven.plugin.version>0.48.0</docker.maven.plugin.version>
<localstack.version>1.21.3</localstack.version>
<docker.maven.plugin.version>0.48.1</docker.maven.plugin.version>
<localstack.version>1.21.3</localstack.version> <!-- Pinned, do not advance -->

<!-- Name of the main Vert.x verticle -->
<main.verticle>edu.ucla.library.iiif.fester.verticles.MainVerticle</main.verticle>
Expand Down Expand Up @@ -194,9 +194,6 @@
<pmd.skip>true</pmd.skip>
<cpd.skip>true</cpd.skip>
<checkstyle.skip>true</checkstyle.skip>

<!-- Temporary so we can use jpv3 snapshot -->
<enforcer.skip>true</enforcer.skip>

<!-- Ignore the AWS S3 API v1 deprecation warning -->
<disable.deprecation.warning>true</disable.deprecation.warning>
Expand Down Expand Up @@ -565,6 +562,45 @@
<!-- Enforcer enforces some basic characteristics of the project -->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-no-snapshots</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<failFast>true</failFast>
<rules>
<requireReleaseDeps>
<onlyWhenRelease>false</onlyWhenRelease>
<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
<excludes>
<!-- Temporarily allow the jpv3 snapshot/WIP release -->
<exclude>info.freelibrary:jiiify-presentation-v3</exclude>
</excludes>
<message>
<![CDATA[Sorry, dependency snapshots are not allowed! To temporarily ignore this]]>
<![CDATA[restriction add the following to the command line: -Denforcer.skip=true]]>
</message>
</requireReleaseDeps>
</rules>
<fail>true</fail>
</configuration>
</execution>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[21,22)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Maven dependency helps freelib-resources copy files into the project -->
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/edu/ucla/library/iiif/fester/verticles/V3ManifestVerticle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,15 +577,16 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
if (mediaWidth.isPresent() && mediaHeight.isPresent()) {
width = Integer.parseInt(mediaWidth.get());
height = Integer.parseInt(mediaHeight.get());
image = new ImageContent(accessURI).setWidthHeight(width, height);
image = new ImageContent(accessURI);
} else {
final ImageInfoLookup infoLookup = new ImageInfoLookup(pageURI); // Look up w/h for page URI

width = infoLookup.getWidth();
height = infoLookup.getHeight();
image = new ImageContent(resourceURI).setServices(new ImageService2(pageURI));
image = new ImageContent(resourceURI);
}

image.setWidthHeight(width, height).setServices(new ImageService2(pageURI));
canvas.setWidthHeight(width, height).setThumbnails(new ImageContent(thumbnail));
canvas.paintWith(image);
} catch (final IOException details) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/edu/ucla/library/iiif/fester/fit/BatchIngestFfOffT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final void testCsvPostEndpoint(final TestContext aContext) {
public final void testCsvUploadPage(final TestContext aContext) {
final Async asyncTask = aContext.async();

myWebClient.get(FESTER_PORT, Constants.UNSPECIFIED_HOST, UPLOAD_FORM_PATH).send(request -> {
myWebClient.get(FESTER_PORT, UNSPECIFIED_HOST, UPLOAD_FORM_PATH).send(request -> {
if (request.succeeded()) {
final String html = request.result().bodyAsString();
final Element h1 = Jsoup.parse(html).selectFirst("h1");
Expand Down
4 changes: 4 additions & 0 deletions src/test/resources/json/v3/ark%3A%2F21198%2Fzz000bjdtv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
"id": "https://test.example.com/iiif/ark%3A%2F21198%2Fzz000bjffn/full/600,/0/default.jpg",
"type": "Image",
"format": "image/jpeg",
"width": 1000,
"height": 1000,
"service": [
{
"@id": "https://test.example.com/iiif/ark%3A%2F21198%2Fzz000bjffn",
Expand Down Expand Up @@ -108,6 +110,8 @@
"id": "https://test.example.com/iiif/ark%3A%2F21198%2Fzz000bjfg5/full/600,/0/default.jpg",
"type": "Image",
"format": "image/jpeg",
"width": 1000,
"height": 1000,
"service": [
{
"@id": "https://test.example.com/iiif/ark%3A%2F21198%2Fzz000bjfg5",
Expand Down
Loading