Skip to content

Commit 4174c00

Browse files
committed
chore: update jersey and its dependencies #4311
1 parent bf1502f commit 4174c00

File tree

11 files changed

+34
-33
lines changed

11 files changed

+34
-33
lines changed

CLAUDE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ cd analysis
3838
# Build the project (creates distribution in build/)
3939
./gradlew build
4040

41+
# Assemble without running tests (faster for frequent builds)
42+
./gradlew assemble
43+
4144
# Install distribution locally for testing
4245
./gradlew installDist
4346

analysis/analysers/importers/SonarImporter/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ dependencies {
1111
implementation(libs.kotter)
1212
implementation(libs.kotter.test)
1313

14-
implementation(libs.jersey.hk2)
15-
implementation(libs.javax.activation)
14+
implementation(libs.jakarta.ws.rs.api)
1615

1716
testImplementation(libs.junit.jupiter.api)
1817

analysis/analysers/importers/SonarImporter/src/main/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/dataaccess/GsonProvider.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package de.maibornwolff.codecharta.analysers.importers.sonar.dataaccess
22

33
import com.google.gson.Gson
44
import com.google.gson.GsonBuilder
5+
import jakarta.ws.rs.Consumes
6+
import jakarta.ws.rs.WebApplicationException
7+
import jakarta.ws.rs.core.MediaType
8+
import jakarta.ws.rs.core.MultivaluedMap
9+
import jakarta.ws.rs.core.UriInfo
10+
import jakarta.ws.rs.ext.MessageBodyReader
11+
import jakarta.ws.rs.ext.Provider
512
import java.io.IOException
613
import java.io.InputStream
714
import java.io.InputStreamReader
815
import java.lang.reflect.Type
9-
import javax.ws.rs.Consumes
10-
import javax.ws.rs.WebApplicationException
11-
import javax.ws.rs.core.MediaType
12-
import javax.ws.rs.core.MultivaluedMap
13-
import javax.ws.rs.core.UriInfo
14-
import javax.ws.rs.ext.MessageBodyReader
15-
import javax.ws.rs.ext.Provider
1616

1717
@Provider
1818
@Consumes(MediaType.APPLICATION_JSON)

analysis/analysers/importers/SonarImporter/src/main/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/dataaccess/SonarMeasuresAPIDatasource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import de.maibornwolff.codecharta.util.Logger
1313
import io.reactivex.BackpressureStrategy
1414
import io.reactivex.Flowable
1515
import io.reactivex.schedulers.Schedulers
16+
import jakarta.ws.rs.client.Client
17+
import jakarta.ws.rs.client.ClientBuilder
18+
import jakarta.ws.rs.core.MediaType
1619
import java.net.URI
1720
import java.net.URISyntaxException
1821
import java.net.URL
19-
import javax.ws.rs.client.Client
20-
import javax.ws.rs.client.ClientBuilder
21-
import javax.ws.rs.core.MediaType
2222

2323
class SonarMeasuresAPIDatasource(
2424
private val user: String,

analysis/analysers/importers/SonarImporter/src/main/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/dataaccess/SonarMetricsAPIDatasource.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import de.maibornwolff.codecharta.analysers.importers.sonar.model.Metrics
66
import de.maibornwolff.codecharta.util.Logger
77
import io.reactivex.Flowable
88
import io.reactivex.schedulers.Schedulers
9+
import jakarta.ws.rs.client.Client
10+
import jakarta.ws.rs.client.ClientBuilder
11+
import jakarta.ws.rs.core.MediaType
912
import org.glassfish.jersey.client.ClientProperties
1013
import java.net.URL
11-
import javax.ws.rs.client.Client
12-
import javax.ws.rs.client.ClientBuilder
13-
import javax.ws.rs.core.MediaType
1414

1515
/**
1616
* Requests Data from Sonar Instance through REST-API
1717
*/
1818
class SonarMetricsAPIDatasource(private val user: String, private val baseUrl: URL?) {
1919
private val client: Client =
20-
ClientBuilder.newClient().property(ClientProperties.CONNECT_TIMEOUT, Companion.TIMEOUT_MS)
21-
.property(ClientProperties.READ_TIMEOUT, Companion.TIMEOUT_MS)
20+
ClientBuilder.newClient().property(ClientProperties.CONNECT_TIMEOUT, TIMEOUT_MS)
21+
.property(ClientProperties.READ_TIMEOUT, TIMEOUT_MS)
2222

2323
val availableMetricKeys: List<String>
2424
get() {
@@ -53,7 +53,7 @@ class SonarMetricsAPIDatasource(private val user: String, private val baseUrl: U
5353
}
5454

5555
fun getAvailableMetrics(page: Int): Metrics {
56-
val url = String.format(Companion.METRICS_URL_PATTERN, baseUrl, page)
56+
val url = String.format(METRICS_URL_PATTERN, baseUrl, page)
5757
val request = client.target(url).request(MediaType.APPLICATION_JSON + "; charset=utf-8")
5858
if (user.isNotEmpty()) {
5959
request.header("Authorization", "Basic " + AuthenticationHandler.createAuthTxtBase64Encoded(user))

analysis/analysers/importers/SonarImporter/src/main/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/dataaccess/SonarVersionAPIDatasource.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package de.maibornwolff.codecharta.analysers.importers.sonar.dataaccess
33
import de.maibornwolff.codecharta.analysers.importers.sonar.SonarImporterException
44
import de.maibornwolff.codecharta.analysers.importers.sonar.filter.ErrorResponseFilter
55
import de.maibornwolff.codecharta.analysers.importers.sonar.model.Version
6+
import jakarta.ws.rs.client.Client
7+
import jakarta.ws.rs.client.ClientBuilder
8+
import jakarta.ws.rs.core.MediaType
69
import java.net.URI
710
import java.net.URL
8-
import javax.ws.rs.client.Client
9-
import javax.ws.rs.client.ClientBuilder
10-
import javax.ws.rs.core.MediaType
1111

1212
class SonarVersionAPIDatasource(private val user: String, private val baseUrl: URL) {
1313
private val client: Client = ClientBuilder.newClient()

analysis/analysers/importers/SonarImporter/src/main/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/filter/ErrorResponseFilter.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package de.maibornwolff.codecharta.analysers.importers.sonar.filter
33
import com.google.gson.GsonBuilder
44
import de.maibornwolff.codecharta.analysers.importers.sonar.model.ErrorResponse
55
import de.maibornwolff.codecharta.util.Logger
6+
import jakarta.ws.rs.WebApplicationException
7+
import jakarta.ws.rs.client.ClientRequestContext
8+
import jakarta.ws.rs.client.ClientResponseContext
9+
import jakarta.ws.rs.client.ClientResponseFilter
10+
import jakarta.ws.rs.core.Response
11+
import jakarta.ws.rs.ext.Provider
612
import java.io.IOException
713
import java.io.InputStreamReader
814
import java.nio.charset.StandardCharsets
9-
import javax.ws.rs.WebApplicationException
10-
import javax.ws.rs.client.ClientRequestContext
11-
import javax.ws.rs.client.ClientResponseContext
12-
import javax.ws.rs.client.ClientResponseFilter
13-
import javax.ws.rs.core.Response
14-
import javax.ws.rs.ext.Provider
1515

1616
@Provider
1717
class ErrorResponseFilter : ClientResponseFilter {
@@ -37,7 +37,7 @@ class ErrorResponseFilter : ClientResponseFilter {
3737
Logger.error { message }
3838

3939
throw WebApplicationException(message)
40-
} catch (e: RuntimeException) {
40+
} catch (_: RuntimeException) {
4141
Logger.error { "Error response could not be parsed." }
4242
}
4343
}

analysis/analysers/importers/SonarImporter/src/test/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/SonarImporterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import de.maibornwolff.codecharta.util.InputHelper
1010
import io.mockk.every
1111
import io.mockk.mockkObject
1212
import io.mockk.unmockkAll
13+
import jakarta.ws.rs.core.MediaType
1314
import org.junit.jupiter.api.AfterEach
1415
import org.junit.jupiter.api.Assertions
1516
import org.junit.jupiter.api.BeforeEach
@@ -20,7 +21,6 @@ import org.junit.jupiter.params.provider.MethodSource
2021
import picocli.CommandLine
2122
import java.io.ByteArrayOutputStream
2223
import java.io.PrintStream
23-
import javax.ws.rs.core.MediaType
2424

2525
private const val PORT = 8089
2626

analysis/analysers/importers/SonarImporter/src/test/kotlin/de/maibornwolff/codecharta/analysers/importers/sonar/dataaccess/SonarVersionAPIDatasourceIntegrationTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import com.github.tomakehurst.wiremock.client.WireMock.stubFor
66
import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
77
import com.github.tomakehurst.wiremock.junit5.WireMockTest
88
import de.maibornwolff.codecharta.analysers.importers.sonar.SonarImporterException
9+
import jakarta.ws.rs.core.MediaType
910
import org.junit.jupiter.api.Assertions.assertEquals
1011
import org.junit.jupiter.api.Test
1112
import org.junit.jupiter.api.assertThrows
1213
import java.net.MalformedURLException
1314
import java.net.URL
14-
import javax.ws.rs.core.MediaType
1515

1616
private const val PORT = 8089
1717

analysis/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ subprojects {
6060
}
6161

6262
configure<KotlinJvmProjectExtension> {
63-
jvmToolchain(11)
63+
jvmToolchain(17)
6464
}
6565
}
6666

0 commit comments

Comments
 (0)