Release next version

hexagontk · Oct 27, 2022 · 9151583 · 9151583
1 parent 314d766
commit 9151583
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 20 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -24,8 +24,13 @@ jobs:
         uses: actions/checkout@v3
         with: { ref: develop }
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Build Project
@@ -58,8 +63,13 @@ jobs:
         uses: actions/checkout@v3
         with: { ref: develop }
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Test Publishing

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -14,8 +14,13 @@ jobs:
       - name: Check Out
         uses: actions/checkout@v3
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Build Project
@@ -33,8 +38,13 @@ jobs:
       - name: Check Out
         uses: actions/checkout@v3
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Test Publishing

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,8 +15,13 @@ jobs:
       - name: Check Out
         uses: actions/checkout@v3
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Build Project

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,13 @@ jobs:
       - name: Check Out
         uses: actions/checkout@v3
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Build Project
@@ -35,8 +40,13 @@ jobs:
       - name: Check Out
         uses: actions/checkout@v3
       - name: Install Java
-        uses: actions/setup-java@v3
-        with: { java-version: 17, distribution: temurin, cache: gradle }
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: latest
+          java-version: 17
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: native-image,llvm
+          cache: gradle
 
       # PROCESS
       - name: Publish Packages

diff --git a/gradle.properties b/gradle.properties
@@ -7,12 +7,12 @@ org.gradle.console=plain
 
 # Gradle
 # Version synchronized with Hexagon release (master)
-version=2.0.26
+version=2.1.2
 group=com.hexagonkt
 description=The atoms of your platform
 
 kotlin.code.style=official
-gradleScripts=https://raw.githubusercontent.com/hexagonkt/hexagon/2.0.26/gradle
+gradleScripts=https://raw.githubusercontent.com/hexagonkt/hexagon/2.1.2/gradle
 detektConfigPath=detekt.yml
 
 # Publish

diff --git a/messaging_rabbitmq/src/main/kotlin/com/hexagonkt/messaging/rabbitmq/RabbitMqClient.kt b/messaging_rabbitmq/src/main/kotlin/com/hexagonkt/messaging/rabbitmq/RabbitMqClient.kt
@@ -4,7 +4,7 @@ import com.hexagonkt.core.logging.Logger
 import com.codahale.metrics.MetricRegistry
 import com.hexagonkt.http.parseQueryString
 import com.hexagonkt.core.*
-import com.hexagonkt.http.model.HttpFields
+import com.hexagonkt.http.model.QueryParameters
 import com.rabbitmq.client.*
 import com.rabbitmq.client.AMQP.BasicProperties
 import com.rabbitmq.client.impl.StandardMetricsCollector
@@ -42,9 +42,9 @@ class RabbitMqClient(
             val cf = ConnectionFactory()
             cf.setUri(uri)
 
-            val queryParameters = parseQueryString(uri.query ?: "").httpFields.values
-            val params = HttpFields(queryParameters.filterNot { it.values.first().isBlank() })
-            fun value(name: String): String? = params[name]
+            val queryParameters = parseQueryString(uri.query ?: "").values
+            val params = QueryParameters(queryParameters.filterNot { it.values.first().isBlank() })
+            fun value(name: String): String? = params[name]?.value
             val automaticRecovery = value("automaticRecovery")?.toBoolean()
             val recoveryInterval = value("recoveryInterval")?.toLong()
             val shutdownTimeout = value("shutdownTimeout")?.toInt()