V2 update deps (#188)

* Update dependencies
* Update jackson dependency
* Reformat to newer parent project's formatting rules

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       MAVEN_CACHE_KEY: ${{ secrets.MAVEN_CACHE_KEY }}
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 17 ]
 
     steps:
       - name: Check out code

.github/workflows/release.yml

@@ -1,24 +1,24 @@
 name: Maven Release
 
-# Performs a Maven release using JDK 11 when a new GitHub release has been published
+# Performs a Maven release using JDK 17 when a new GitHub release has been published
 on:
   release:
     types: [ published ]
 
 jobs:
   publish:
-    name: Maven Artifact Publisher (JDK 11)
+    name: Maven Artifact Publisher (JDK 17)
     runs-on: ubuntu-latest
     env:
       AUTORELEASE_ARTIFACT: ${{ secrets.AUTORELEASE_ARTIFACT }}
       MAVEN_CACHE_KEY: ${{ secrets.MAVEN_CACHE_KEY }}
     steps:
       - name: Check out source code
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2
-      - name: Install JDK 11 and Maven
+      - name: Install JDK 17 and Maven
         uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1
         with:
-          java-version: 11
+          java-version: 17
       # If running locally in act, install Maven
       - name: Set up Maven if needed
         if: ${{ env.ACT }}

pom.xml

@@ -38,16 +38,17 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+    <!-- Also https://github.com/ksclarke/jiiify-presentation/graphs/contributors -->
   </developers>
 
   <properties>
     <revision>0.0.0-SNAPSHOT</revision>
 
     <!-- Project dependencies -->
-    <jackson.version>2.13.4</jackson.version>
-    <jackson.databind.version>2.13.4.2</jackson.databind.version>
+    <jackson.version>2.15.2</jackson.version>
+    <jackson.databind.version>2.15.2</jackson.databind.version>
     <guava.version>32.0.0-jre</guava.version>
-    <freelib.utils.version>3.2.4</freelib.utils.version>
+    <freelib.utils.version>4.0.2</freelib.utils.version>
     <vertx.version>4.4.5</vertx.version>
 
     <!-- Test related versions -->
@@ -216,7 +217,7 @@
   <parent>
     <artifactId>freelib-parent</artifactId>
     <groupId>info.freelibrary</groupId>
-    <version>7.4.2</version>
+    <version>8.0.3</version>
   </parent>
 
 </project>

src/main/java/info/freelibrary/iiif/presentation/v2/Canvas.java

@@ -13,6 +13,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonSetter;
 
+import info.freelibrary.util.IllegalArgumentI18nException;
+
 import info.freelibrary.iiif.presentation.v2.properties.Attribution;
 import info.freelibrary.iiif.presentation.v2.properties.Description;
 import info.freelibrary.iiif.presentation.v2.properties.Label;
@@ -27,7 +29,6 @@
 import info.freelibrary.iiif.presentation.v2.services.Service;
 import info.freelibrary.iiif.presentation.v2.utils.Constants;
 import info.freelibrary.iiif.presentation.v2.utils.MessageCodes;
-import info.freelibrary.util.IllegalArgumentI18nException;
 
 /**
  * A virtual container that represents a page or view and has content resources associated with it or with parts of it.
@@ -238,6 +239,7 @@ public Canvas setOtherContent(final OtherContent... aOtherContentArray) {
      *
      * @param aImageContent Image content to be added to the canvas
      * @return The canvas
+     * @throws UnsupportedOperationException If a supplied {@link ImageContent} could not be added
      */
     public Canvas addImageContent(final ImageContent... aImageContent) {
         if (!Collections.addAll(getImageContent(), aImageContent)) {
@@ -252,6 +254,7 @@ public Canvas addImageContent(final ImageContent... aImageContent) {
      *
      * @param aOtherContent Other content to be added to the canvas
      * @return The canvas
+     * @throws UnsupportedOperationException If a supplied {@link OtherContent} could not be added
      */
     public Canvas addOtherContent(final OtherContent... aOtherContent) {
         if (Collections.addAll(getOtherContent(), aOtherContent)) {
@@ -419,6 +422,7 @@ public Canvas setSeeAlso(final String aSeeAlso) {
      *
      * @param aWidth A canvas width
      * @param aHeight A canvas height
+     * @throws IllegalArgumentI18nException If the height or width is less than zero
      */
     @JsonIgnore
     private void setWidthHeight(final int aWidth, final int aHeight) {

src/main/java/info/freelibrary/iiif/presentation/v2/ImageContent.java

@@ -15,7 +15,6 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonSetter;
 
-import info.freelibrary.util.I18nRuntimeException;
 import info.freelibrary.util.Logger;
 import info.freelibrary.util.LoggerFactory;
 import info.freelibrary.util.StringUtils;
@@ -112,10 +111,16 @@ public String getMotivation() {
         return MOTIVATION;
     }
 
+    /**
+     * Sets the image content's motivation.
+     *
+     * @param aMotivation A motivation value
+     * @throws IllegalArgumentException If the wrong motivation is supplied
+     */
     @JsonSetter(Constants.MOTIVATION)
     private void setMotivation(final String aMotivation) {
         if (!MOTIVATION.equals(aMotivation)) {
-            throw new I18nRuntimeException();
+            throw new IllegalArgumentException();
         }
     }
 
@@ -416,44 +421,13 @@ private ImageResource buildImageResource(final Object aImageResourceMap) {
             return null;
         }
 
-        /**
-         * A image resource map.
-         */
         final Map<?, ?> map = (Map<?, ?>) aImageResourceMap;
-
-        /**
-         * A new image resource.
-         */
         final ImageResource resource = new ImageResource(URI.create((String) map.get(Constants.ID)));
-
-        /**
-         * The image resource label.
-         */
         final String label = (String) map.get(Constants.LABEL);
-
-        /**
-         * The image resource service map.
-         */
         final Map<?, ?> service = (Map<?, ?>) map.get(Constants.SERVICE);
-
-        /**
-         * The image resource map's width object.
-         */
         final Object widthObj = map.get(Constants.WIDTH);
-
-        /**
-         * The image resource map's height object.
-         */
         final Object heightObj = map.get(Constants.HEIGHT);
-
-        /**
-         * The image resource's width.
-         */
         final int width;
-
-        /**
-         * The image resource's height.
-         */
         final int height;
 
         if (widthObj == null) {

src/main/java/info/freelibrary/iiif/presentation/v2/Manifest.java

@@ -70,7 +70,7 @@ public class Manifest extends Resource<Manifest> {
     private static final String TYPE = "sc:Manifest";
 
     /**
-     * The manifest's context
+     * The manifest's context.
      */
     private static final URI CONTEXT = URI.create("http://iiif.io/api/presentation/2/context.json");
 
@@ -181,7 +181,7 @@ public URI getContext() {
     }
 
     /**
-     * Adds a new context URI to the manifest
+     * Adds a new context URI to the manifest.
      *
      * @param aContext Manifest context URIs(s)
      * @return The manifest
@@ -192,7 +192,7 @@ public Manifest addContext(final URI... aContext) {
     }
 
     /**
-     * Adds a new context URI to the manifest
+     * Adds a new context URI to the manifest.
      *
      * @param aContext Manifest context URI(s)
      * @return The manifest
@@ -268,6 +268,7 @@ public ViewingDirection getViewingDirection() {
      *
      * @param aSequence Sequence(s) to add to the manifest
      * @return The manifest
+     * @throws UnsupportedOperationException If a supplied sequence couldn't be added to the manifest
      */
     public Manifest addSequence(final Sequence... aSequence) {
         Objects.requireNonNull(aSequence, LOGGER.getMessage(MessageCodes.JPA_008));

src/main/java/info/freelibrary/iiif/presentation/v2/Resource.java

@@ -13,6 +13,9 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
+import info.freelibrary.util.Logger;
+import info.freelibrary.util.LoggerFactory;
+
 import info.freelibrary.iiif.presentation.v2.properties.Attribution;
 import info.freelibrary.iiif.presentation.v2.properties.Description;
 import info.freelibrary.iiif.presentation.v2.properties.Label;
@@ -27,8 +30,6 @@
 import info.freelibrary.iiif.presentation.v2.services.Service;
 import info.freelibrary.iiif.presentation.v2.utils.Constants;
 import info.freelibrary.iiif.presentation.v2.utils.MessageCodes;
-import info.freelibrary.util.Logger;
-import info.freelibrary.util.LoggerFactory;
 
 /**
  * A resource that can be used as a base for more specific IIIF presentation resources.
@@ -709,11 +710,14 @@ protected Resource<T> setSeeAlso(final String aSeeAlso) {
      * @param aArgs An array of arguments passed to the constructor
      * @param aNames An array of names corresponding to the arguments passed to the constructor
      * @param aNumber The number of required arguments
+     * @throws IndexOutOfBoundsException If the supplied number is out of bounds
+     * @throws IllegalArgumentException If the supplied object and string arrays aren't the same length
      */
     private void checkArgs(final Object[] aArgs, final String[] aNames, final int aNumber) {
         if (aArgs.length < aNumber) {
             throw new IndexOutOfBoundsException(String.valueOf(aNumber));
         }
+
         if (aArgs.length != aNames.length) {
             throw new IllegalArgumentException("Number of arguments is not equal to the number of names");
         }

src/main/java/info/freelibrary/iiif/presentation/v2/Sequence.java

@@ -172,6 +172,7 @@ public Sequence setCanvases(final Canvas... aCanvas) {
      *
      * @param aCanvas A canvas to add to this sequence
      * @return The sequence
+     * @throws UnsupportedOperationException If a supplied canvas could not be added
      */
     public Sequence addCanvas(final Canvas... aCanvas) {
         if (!Collections.addAll(myCanvases, aCanvas)) {

src/main/java/info/freelibrary/iiif/presentation/v2/ServiceImage.java

@@ -13,15 +13,16 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.google.common.net.MediaType;
 
+import info.freelibrary.util.FileUtils;
+import info.freelibrary.util.Logger;
+import info.freelibrary.util.LoggerFactory;
+
 import info.freelibrary.iiif.presentation.v2.properties.Logo;
 import info.freelibrary.iiif.presentation.v2.properties.Thumbnail;
 import info.freelibrary.iiif.presentation.v2.services.ImageInfoService;
 import info.freelibrary.iiif.presentation.v2.services.Service;
 import info.freelibrary.iiif.presentation.v2.utils.Constants;
 import info.freelibrary.iiif.presentation.v2.utils.MessageCodes;
-import info.freelibrary.util.FileUtils;
-import info.freelibrary.util.Logger;
-import info.freelibrary.util.LoggerFactory;
 
 /**
  * An image resource from a {@link Service} that is used as an {@link ImageResource}, and in {@link Logo}s and
@@ -68,7 +69,7 @@ public class ServiceImage {
     private Optional<ImageInfoService> myService;
 
     /**
-     * Creates an image
+     * Creates an image.
      *
      * @param aURI An image ID
      */
@@ -82,7 +83,7 @@ public ServiceImage(final String aURI) {
     }
 
     /**
-     * Creates an image
+     * Creates an image.
      *
      * @param aID An image ID
      */
@@ -260,7 +261,7 @@ public int getHeight() {
     }
 
     /**
-     * Gets the image ID
+     * Gets the image ID.
      *
      * @return The image ID
      */
@@ -306,7 +307,7 @@ public Optional<ImageInfoService> getService() {
     }
 
     /**
-     * Sets the image's service
+     * Sets the image's service.
      *
      * @param aService The image's service
      * @return The image

src/main/java/info/freelibrary/iiif/presentation/v2/properties/I18nProperty.java

@@ -3,17 +3,17 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
-import info.freelibrary.iiif.presentation.v2.utils.Constants;
-import info.freelibrary.iiif.presentation.v2.utils.MessageCodes;
 import info.freelibrary.util.Logger;
 import info.freelibrary.util.LoggerFactory;
 
+import info.freelibrary.iiif.presentation.v2.utils.Constants;
+import info.freelibrary.iiif.presentation.v2.utils.MessageCodes;
+
 /**
  * A property value that can be used in the label, description, attribution and the label and value fields.
  */
@@ -92,6 +92,7 @@ public String getString() {
      *
      * @param aValue A String property value
      * @return A String value to the property
+     * @throws UnsupportedOperationException If a supplied value could not be added
      */
     protected I18nProperty<T> addValue(final String... aValue) {
         Objects.requireNonNull(aValue, LOGGER.getMessage(MessageCodes.JPA_001));
@@ -112,6 +113,7 @@ protected I18nProperty<T> addValue(final String... aValue) {
      *
      * @param aValue A I18N property value
      * @return A String value to the property
+     * @throws UnsupportedOperationException If a supplied value could not be added
      */
     protected I18nProperty<T> addValue(final Value... aValue) {
         Objects.requireNonNull(aValue, LOGGER.getMessage(MessageCodes.JPA_001));
@@ -158,21 +160,20 @@ public int hashCode() {
      */
     @JsonValue
     protected Object getJsonValue() {
+        final List<Object> list = new ArrayList<>();
+
         if (!hasValues()) {
             return null;
         }
+
         if (myValues.size() == Constants.SINGLE_INSTANCE) {
             if (myValues.get(0).getLang().isPresent()) {
                 return myValues.get(0);
             }
             return myValues.get(0).getValue();
         }
-        final List<Object> list = new ArrayList<>();
-        final Iterator<Value> iterator = myValues.iterator();
-
-        while (iterator.hasNext()) {
-            final Value entry = iterator.next();
 
+        for (final Value entry : myValues) {
             if (entry.getLang().isPresent()) {
                 list.add(entry);
             } else {