From 6382c4bd1f9987635ebdf94cb67fe0734d337bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ossowski?= Date: Tue, 8 Nov 2022 09:22:54 +0100 Subject: [PATCH] restore java 8 support --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/scala-steward.yml | 2 +- core/src/main/scala/org/elasticmq/NodeAddress.scala | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1d0cb678..b84faba35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 8 - name: Cache SBT id: cache-sbt @@ -52,7 +52,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 8 - name: Cache SBT id: cache-sbt @@ -83,7 +83,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 8 - name: Cache SBT id: cache-sbt @@ -117,7 +117,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 8 - name: Cache sbt uses: actions/cache@v2 diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml index 35229339a..a6b24560d 100644 --- a/.github/workflows/scala-steward.yml +++ b/.github/workflows/scala-steward.yml @@ -15,7 +15,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 - name: Cache sbt uses: actions/cache@v2 with: diff --git a/core/src/main/scala/org/elasticmq/NodeAddress.scala b/core/src/main/scala/org/elasticmq/NodeAddress.scala index 334e0dae5..860dcab93 100644 --- a/core/src/main/scala/org/elasticmq/NodeAddress.scala +++ b/core/src/main/scala/org/elasticmq/NodeAddress.scala @@ -10,5 +10,5 @@ case class NodeAddress( def fullAddress: String = protocol + "://" + hostAndPort + suffix def isWildcard: Boolean = host == "*" def contextPathStripped: String = contextPath.stripPrefix("/").stripSuffix("/") - def suffix = if (contextPath.isBlank) "" else "/" + contextPathStripped + def suffix: String = if (contextPath.trim.isEmpty) "" else "/" + contextPathStripped }