diff --git a/pom.xml b/pom.xml index 9bf8921..f014a51 100644 --- a/pom.xml +++ b/pom.xml @@ -75,10 +75,10 @@ 22.04 - 17.0.8.1+1~us1-0ubuntu1~22.04 + 17.0.9+9-1~22.04 4:11.2.0-1ubuntu1 4.3-4.1build1 - 4.3.0-6ubuntu0.6 + 4.3.0-6ubuntu0.7 12.9ubuntu3 2.4.0-6 2.1.2-0ubuntu1 @@ -609,7 +609,7 @@ info.freelibrary freelib-parent - 8.0.0 + 8.0.4 diff --git a/src/main/tools/checkstyle/checkstyle.xml b/src/main/tools/checkstyle/checkstyle.xml index 6d99c58..b3ad842 100644 --- a/src/main/tools/checkstyle/checkstyle.xml +++ b/src/main/tools/checkstyle/checkstyle.xml @@ -44,14 +44,28 @@ - + + + + + + + - - + + + - + + + + + + + diff --git a/src/test/java/edu/ucla/library/iiif/cantaloupe/AbstractCantaloupeIT.java b/src/test/java/edu/ucla/library/iiif/cantaloupe/AbstractCantaloupeIT.java index acec994..54d7f96 100644 --- a/src/test/java/edu/ucla/library/iiif/cantaloupe/AbstractCantaloupeIT.java +++ b/src/test/java/edu/ucla/library/iiif/cantaloupe/AbstractCantaloupeIT.java @@ -12,16 +12,22 @@ */ class AbstractCantaloupeIT { + /** A URL pattern constant. */ private static final String URL_PATTERN = "http://localhost:{}"; + /** A default port constant. */ private static final String DEFAULT_PORT = "8182"; + /** The URL being tested. */ protected String myURL; + /** The port being tested. */ protected int myPort; + /** Whether the test system has Kakadu installed. */ protected boolean hasKakaduInstalled; + /** Whether the test is running in a development environment. */ protected boolean isDevBuild; /** diff --git a/src/test/java/edu/ucla/library/iiif/cantaloupe/Constants.java b/src/test/java/edu/ucla/library/iiif/cantaloupe/Constants.java index a81f766..39b2cfd 100644 --- a/src/test/java/edu/ucla/library/iiif/cantaloupe/Constants.java +++ b/src/test/java/edu/ucla/library/iiif/cantaloupe/Constants.java @@ -6,24 +6,28 @@ */ public final class Constants { - /* The randomly selected port at which Cantaloupe is run. */ + /** The randomly selected port at which Cantaloupe is run. */ public static final String PORT = "http.port"; - /* The version of Cantaloupe that's being tested. */ + /** The version of Cantaloupe that's being tested. */ public static final String CANTALOUPE_VERSION = "cantaloupe.version"; - /* The Cantaloupe commit hash that's being tested. */ + /** The Cantaloupe commit hash that's being tested. */ public static final String CANTALOUPE_COMMIT_REF = "cantaloupe.commit.ref"; - /* The version of Kakadu that's being tested. */ + /** The version of Kakadu that's being tested. */ public static final String KAKADU_VERSION = "kakadu.version"; - /* A flag to indicate we want to build a snapshot build from the 5.x line. */ + /** A flag to indicate we want to build a snapshot build from the 5.x line. */ public static final String DEV_BUILD = "devBuild"; - /* A constant representing an empty string. */ + /** A constant representing an empty string. */ public static final String EMPTY = ""; + /** + * Creates a new constants class. + */ private Constants() { + // This is intentionally left empty. } } diff --git a/src/test/java/edu/ucla/library/iiif/cantaloupe/KakaduIT.java b/src/test/java/edu/ucla/library/iiif/cantaloupe/KakaduIT.java index 660cf3e..23e0c81 100644 --- a/src/test/java/edu/ucla/library/iiif/cantaloupe/KakaduIT.java +++ b/src/test/java/edu/ucla/library/iiif/cantaloupe/KakaduIT.java @@ -24,6 +24,7 @@ */ public class KakaduIT extends AbstractCantaloupeIT { + /** A test logger. */ private static final Logger LOGGER = LoggerFactory.getLogger(KakaduIT.class, MessageCodes.BUNDLE); /** diff --git a/src/test/java/edu/ucla/library/iiif/cantaloupe/VersionIT.java b/src/test/java/edu/ucla/library/iiif/cantaloupe/VersionIT.java index 7c979c2..52864ad 100644 --- a/src/test/java/edu/ucla/library/iiif/cantaloupe/VersionIT.java +++ b/src/test/java/edu/ucla/library/iiif/cantaloupe/VersionIT.java @@ -1,7 +1,9 @@ package edu.ucla.library.iiif.cantaloupe; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -19,8 +21,10 @@ */ public class VersionIT extends AbstractCantaloupeIT { + /** A test logger. */ private static final Logger LOGGER = LoggerFactory.getLogger(VersionIT.class, MessageCodes.BUNDLE); + /** The HTML containing the version to be tested. */ private Document myHTML; /**