Prepping new release

buildSrc/src/main/kotlin/org.mbari.commons.java-conventions.gradle.kts

@@ -18,12 +18,12 @@ repositories {
 }
 
 dependencies {
-    testImplementation("ch.qos.logback:logback-classic:1.5.1")
+    testImplementation("ch.qos.logback:logback-classic:1.5.6")
     testImplementation("org.slf4j:slf4j-jdk-platform-logging:2.0.12")
 }
 
 group = "org.mbari.commons"
-version = "0.0.6"
+version = "0.0.7"
 extra["artifactIdForMaven"] = project.name
 
 java {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

jcommons/src/main/java/org/mbari/jcommons/util/AutoCloseableLock.java

@@ -0,0 +1,19 @@
+package org.mbari.jcommons.util;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+
+public class AutoCloseableLock extends ReentrantLock implements AutoCloseable {
+
+    public AutoCloseableLock lockAndGet()  {
+        lock();
+        return this;
+    }
+
+    @Override
+    public void close() {
+        unlock();
+    }
+
+
+}

jcommons/src/main/java/org/mbari/jcommons/util/CloseableLock.java

@@ -14,8 +14,12 @@
  * }
  * }
  * 
- * @see https://debugagent.com/relearning-java-thread-primitives
+ * From https://debugagent.com/relearning-java-thread-primitives
+ * 
+ * @deprecated Use {@link AutoCloseableLock} instead
+ * 
  */
+
 public class CloseableLock implements AutoCloseable, Lock {
   private final Lock lock;
 

scommons/build.gradle.kts

@@ -18,7 +18,7 @@ java {
 
 dependencies {
     api(project(":jcommons"))
-    implementation("org.scala-lang:scala3-library_3:3.3.1")
+    implementation("org.scala-lang:scala3-library_3:3.3.3")
     implementation("com.github.rwl:jtransforms:2.4.0")
     implementation("org.typelevel:spire_3:0.18.0")
     implementation("org.apache.commons:commons-math3:3.6.1")

scommons/src/main/scala/org/mbari/scommons/etc/jdk/Logging.scala → scommons/src/main/scala/org/mbari/scommons/etc/jdk/Loggers.scala

@@ -7,7 +7,7 @@ import java.util.function.Supplier
 /**
  * Add fluent logging to System.Logger. Usage:
  * {{{
- * import org.fathomnet.support.etc.jdk.Logging.{given, *}
+ * import org.fathomnet.support.etc.jdk.Loggers.{given, *}
  * given log: Logger = Sytem.getLogger("my.logger")
  *
  * log.atInfo.log("Hello World")
@@ -17,7 +17,7 @@ import java.util.function.Supplier
  * }}}
  * * @author Brian Schlining
  */
-object Logging:
+object Loggers:
 
   case class LoggerBuilder(
       logger: Logger,

scommons/src/main/scala/org/mbari/scommons/etc/jdk/Uris.scala

@@ -1,7 +1,25 @@
 package org.mbari.scommons.etc.jdk
 
 import java.net.URI
+import Loggers.given
+import scala.util.control.NonFatal
+import java.net.HttpURLConnection
 
 object Uris:
 
+    private val log = System.getLogger(getClass.getName)
+
     def filename(uri: URI): String = uri.getPath.split('/').last
+
+    def exists(uri: URI): Boolean = try
+        HttpURLConnection.setFollowRedirects(false)
+        val connection = uri.toURL.openConnection().asInstanceOf[HttpURLConnection]
+        connection.setRequestMethod("HEAD")
+        connection.getResponseCode == HttpURLConnection.HTTP_OK
+    catch
+        case NonFatal(e) =>
+            log
+                .atWarn
+                .withCause(e)
+                .log(s"Failed to connect to $uri")
+            false

scommons/src/main/scala/org/mbari/scommons/math/FastCollator.scala

@@ -1,6 +1,6 @@
 package org.mbari.scommons.math
 
-import org.mbari.scommons.etc.jdk.Logging.given
+import org.mbari.scommons.etc.jdk.Loggers.given
 import java.lang.System.Logger.Level
 
 /**

scommons/src/main/scala/org/mbari/scommons/util/ISO8601.scala

@@ -4,34 +4,21 @@ import java.time.format.DateTimeFormatter
 import java.time.ZoneId
 import java.time.Instant
 import scala.util.Try
+import org.mbari.scommons.etc.jdk.Instants
 
+@deprecated("Use org.mbari.scommons.Instants instead", "0.0.7")
 object ISO8601:
 
-  private val utcZone                           = ZoneId.of("UTC")
-    val TimeFormatter: DateTimeFormatter          = DateTimeFormatter.ISO_DATE_TIME.withZone(utcZone)
-    val CompactTimeFormatter: DateTimeFormatter   = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmssX").withZone(utcZone)
-    val CompactTimeFormatterMs: DateTimeFormatter =
-        DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss.SSSX").withZone(utcZone)
-    val CompactTimeFormatterNs: DateTimeFormatter =
-        DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss.SSSSSSX").withZone(utcZone)
 
     def parseIso8601(s: String): Either[Throwable, Instant] =
-        val tried = Try(Instant.from(CompactTimeFormatter.parse(s))) orElse
-            Try(Instant.from(TimeFormatter.parse(s))) orElse
-            Try(Instant.from(CompactTimeFormatterMs.parse(s))) orElse
-            Try(Instant.from(CompactTimeFormatterNs.parse(s)))
-        tried.toEither
-
+        Instants.parseIso8601(s) match
+            case Some(i) => Right(i)
+            case None    => Left(new IllegalArgumentException(s"Could not parse $s as an ISO8601 timestamp"))
 
 
   /**
    * Parse a string in common ISO8601 formats into an Instant
    * @param timestamp
    * @return
    */
-  def parse(timestamp: String): Option[Instant] =
-    Try(formatMillis.parse(timestamp))
-      .orElse(Try(formatSeconds.parse(timestamp)))
-      .orElse(Try(DateTimeFormatter.ISO_INSTANT.parse(timestamp)))
-      .toOption
-      .map(Instant.from)
+  def parse(timestamp: String): Option[Instant] = Instants.parseIso8601(timestamp)