restore java 8 support

softwaremill · Nov 8, 2022 · 6382c4b · 6382c4b
1 parent 0dbe63a
commit 6382c4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
 }