diff --git a/build.gradle b/build.gradle index 6d0c59d2a9..1f2ea2a21f 100644 --- a/build.gradle +++ b/build.gradle @@ -50,13 +50,13 @@ allprojects { project.ext.versions = [ kafka : '2.8.2', guava : '23.0', - jackson : '2.13.4', - jersey : '2.35', - jetty : '9.4.19.v20190610', + jackson : '2.15.2', + jersey : '3.1.2', + jetty : '11.0.15', curator : '5.4.0', dropwizard_metrics: '4.1.0', - micrometer_metrics: '1.6.3', - wiremock : '2.27.2', + micrometer_metrics: '1.11.1', + wiremock : '3.0.0-beta-10', spock : '2.4-M1-groovy-4.0', groovy : '4.0.12', alpn_api : '1.1.2.v20150522', @@ -64,11 +64,11 @@ allprojects { json2avro : '0.2.14', okhttp : '3.9.1', undertow : '2.0.29.Final', - spring_web : '5.3.24', + spring_web : '6.0.8', failsafe : '2.3.1', junit_jupiter : '5.8.2', testcontainers : '1.18.1', - spring : '2.7.7', + spring : '3.0.6', assertj : '3.22.0' ] @@ -77,7 +77,7 @@ allprojects { } dependencies { - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.4' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' testImplementation group: 'junit', name: 'junit', version: '4.11' diff --git a/hermes-api/build.gradle b/hermes-api/build.gradle index 40ce095205..c6554f612b 100644 --- a/hermes-api/build.gradle +++ b/hermes-api/build.gradle @@ -4,16 +4,20 @@ plugins { } dependencies { - api group: 'org.hibernate.validator', name: 'hibernate-validator', version: '6.2.2.Final' - api group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' + api group: 'org.hibernate.validator', name: 'hibernate-validator', version: '8.0.0.Final' + + api group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.1.0' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: versions.jackson - api group: 'com.fasterxml.jackson.jaxrs', name: 'jackson-jaxrs-json-provider', version: versions.jackson + api group: 'com.fasterxml.jackson.jakarta.rs', name: 'jackson-jakarta-rs-json-provider', version: versions.jackson api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jackson implementation group: 'com.google.guava', name: 'guava', version: versions.guava api group: 'com.damnhandy', name: 'handy-uri-templates', version: '2.0.2' - api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0.1' - implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.3' + api group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.0' + + implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '4.0.3' + implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '4.0.3' + implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.1.1' + testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java index bab47637b2..1c06f0ee03 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/BatchSubscriptionPolicy.java @@ -2,11 +2,11 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.base.MoreObjects; +import jakarta.validation.constraints.Min; import pl.allegro.tech.hermes.api.helpers.Patch; import java.util.Map; import java.util.Objects; -import javax.validation.constraints.Min; public class BatchSubscriptionPolicy { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java index 34dd93438a..60d71c6e40 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Constraints.java @@ -2,9 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Min; import java.util.Objects; -import javax.validation.constraints.Min; public class Constraints { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java index 13cb48ac13..8cd3f20bd8 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/EndpointAddressResolverMetadata.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.google.common.collect.ImmutableMap; +import jakarta.validation.constraints.NotNull; import java.io.IOException; import java.util.Collections; @@ -13,7 +14,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import javax.validation.constraints.NotNull; @JsonSerialize(using = EndpointAddressResolverMetadata.EndpointAddressResolverMetadataSerializer.class) public class EndpointAddressResolverMetadata { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java index 767edf98ec..9e48226597 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/ErrorCode.java @@ -1,14 +1,14 @@ package pl.allegro.tech.hermes.api; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.REQUEST_TIMEOUT; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.REQUEST_TIMEOUT; public enum ErrorCode { TIMEOUT(REQUEST_TIMEOUT), diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java index b1d9b6886f..6d58c2f8b2 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Group.java @@ -2,9 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import java.util.Objects; -import javax.validation.constraints.NotNull; public class Group { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java index e64ddd3ae9..af96c6371e 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Header.java @@ -2,9 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import java.util.Objects; -import javax.validation.constraints.NotNull; public class Header { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java index ae2a857a96..eecb9e6dda 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MessageFiltersVerificationInput.java @@ -2,9 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import java.util.List; -import javax.validation.constraints.NotNull; public class MessageFiltersVerificationInput { private final List filters; diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java index 4e3e6cd0fb..d35e99cc26 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/MonitoringDetails.java @@ -2,9 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import java.util.Objects; -import javax.validation.constraints.NotNull; public final class MonitoringDetails { public static final MonitoringDetails EMPTY = new MonitoringDetails(Severity.NON_IMPORTANT, ""); diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java index 8a62821225..2654d1990d 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OAuthProvider.java @@ -2,13 +2,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import java.util.Objects; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX; diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java index 1491921712..850b2fa389 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetentionTime.java @@ -1,9 +1,9 @@ package pl.allegro.tech.hermes.api; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Min; import java.util.Objects; -import javax.validation.constraints.Min; public class OfflineRetentionTime { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java index 9dca242bd7..ef79fef7fd 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java @@ -3,11 +3,11 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import pl.allegro.tech.hermes.api.jackson.InstantIsoSerializer; import java.time.Instant; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; public class OfflineRetransmissionRequest { @NotEmpty diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java index 95500b12b4..acd1270616 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OffsetRetransmissionDate.java @@ -2,10 +2,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import jakarta.validation.constraints.NotNull; import pl.allegro.tech.hermes.api.jackson.OffsetDateTimeSerializer; import java.time.OffsetDateTime; -import javax.validation.constraints.NotNull; public class OffsetRetransmissionDate { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java index ff2bd0ae82..b8838b9279 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/OwnerId.java @@ -2,9 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import java.util.Objects; -import javax.validation.constraints.NotNull; public final class OwnerId { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java index 4ca412cc34..4223df0e1c 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Readiness.java @@ -3,8 +3,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class Readiness { @NotNull diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java index ba81dbdc5c..bf6478b702 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/RetentionTime.java @@ -2,12 +2,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import pl.allegro.tech.hermes.api.constraints.AdminPermitted; import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; public class RetentionTime { private static final TimeUnit DEFAULT_UNIT = TimeUnit.DAYS; diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java index f1ff4c1482..3a8c673590 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Subscription.java @@ -4,6 +4,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import pl.allegro.tech.hermes.api.constraints.ValidContentType; import java.time.Instant; @@ -13,10 +17,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX; diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java index 445566d802..3ba492ec74 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionConstraints.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.validation.Valid; +import jakarta.validation.Valid; public class SubscriptionConstraints { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java index 6b2f236c3a..769f0d0ae0 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionOAuthPolicy.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.constraints.NotNull; import java.util.Objects; -import javax.validation.constraints.NotNull; public class SubscriptionOAuthPolicy { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java index cf58548f24..b1f33c0a78 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/SubscriptionPolicy.java @@ -2,15 +2,15 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.base.MoreObjects; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Null; import pl.allegro.tech.hermes.api.constraints.AdminPermitted; import pl.allegro.tech.hermes.api.helpers.Patch; import java.util.Map; import java.util.Objects; -import javax.annotation.Nullable; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Null; public class SubscriptionPolicy { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java index b8bf6df72d..069511a0f5 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java @@ -6,16 +6,16 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.OptBoolean; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.time.Instant; import java.util.Collections; import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.validation.Valid; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; @JsonIgnoreProperties(value = {"createdAt", "modifiedAt"}, allowGetters = true) public class Topic { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java index 6dd1bca621..e507b9eb35 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicConstraints.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - -import javax.validation.Valid; +import jakarta.validation.Valid; public class TopicConstraints { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java index 85d3371e9d..2ac58c2ada 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicDataOfflineStorage.java @@ -2,10 +2,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; /** * Topic offline storage metadata - not used in Hermes, but exposed as part of API for other systems to use. diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java index 0bed674983..96528ce2e5 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicLabel.java @@ -3,8 +3,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Objects; - -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; public class TopicLabel { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java index 31fadfb5bc..32c903fdb2 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicName.java @@ -3,10 +3,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Strings; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Pattern; import java.util.Objects; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; import static pl.allegro.tech.hermes.api.constraints.Names.ALLOWED_NAME_REGEX; diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java index d2cfd7f5ad..1874fbff9c 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ContentTypeValidator.java @@ -1,12 +1,11 @@ package pl.allegro.tech.hermes.api.constraints; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import pl.allegro.tech.hermes.api.ContentType; import pl.allegro.tech.hermes.api.DeliveryType; import pl.allegro.tech.hermes.api.Subscription; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - public class ContentTypeValidator implements ConstraintValidator { @Override diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java index 16b186fec8..7c4785c578 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/constraints/ValidContentType.java @@ -1,10 +1,11 @@ package pl.allegro.tech.hermes.api.constraints; +import jakarta.validation.Constraint; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; import static java.lang.annotation.ElementType.TYPE; diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java index 2a7423f25a..c206f43c37 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/AllTopicClientsEndpoint.java @@ -1,12 +1,13 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; + import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("topics/{topic}/clients") public interface AllTopicClientsEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java index a414922ead..10bd4f4315 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/BlacklistEndpoint.java @@ -1,18 +1,18 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.BlacklistStatus; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("blacklist") public interface BlacklistEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java index f891e22f02..8e1c694e3f 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ConsistencyEndpoint.java @@ -1,13 +1,14 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; + import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("consistency") public interface ConsistencyEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java index cd69419339..b17d3f7df0 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/FilterEndpoint.java @@ -1,15 +1,14 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput; import pl.allegro.tech.hermes.api.MessageFiltersVerificationResult; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("filters") public interface FilterEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java index 24907463ec..3f52307b91 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/GroupEndpoint.java @@ -1,19 +1,19 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.Group; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("groups") public interface GroupEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java index 4f1a64a45b..62a125b88e 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ModeEndpoint.java @@ -1,14 +1,14 @@ package pl.allegro.tech.hermes.api.endpoints; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; @Path("mode") public interface ModeEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java index ba711831ac..0eea82013d 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OAuthProviderEndpoint.java @@ -1,20 +1,20 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.OAuthProvider; import pl.allegro.tech.hermes.api.PatchData; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("oauth/providers") public interface OAuthProviderEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java index dc4cca0cb9..0f09a7f1be 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OfflineRetransmissionEndpoint.java @@ -1,19 +1,19 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.OfflineRetransmissionRequest; import pl.allegro.tech.hermes.api.OfflineRetransmissionTask; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("offline-retransmission/tasks") public interface OfflineRetransmissionEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java index cf63b35470..aa8bd545fb 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/OwnerEndpoint.java @@ -1,15 +1,15 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import pl.allegro.tech.hermes.api.Owner; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("owners") public interface OwnerEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java index f56db1798b..87c9b7a817 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/QueryEndpoint.java @@ -1,5 +1,9 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import pl.allegro.tech.hermes.api.Group; import pl.allegro.tech.hermes.api.Subscription; import pl.allegro.tech.hermes.api.SubscriptionNameWithMetrics; @@ -7,12 +11,8 @@ import pl.allegro.tech.hermes.api.TopicNameWithMetrics; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("query") public interface QueryEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java index d558622e79..b89bb7a5d1 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/ReadinessEndpoint.java @@ -1,18 +1,18 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.DatacenterReadiness; import pl.allegro.tech.hermes.api.Readiness; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("readiness/datacenters") public interface ReadinessEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java index 85be3309db..0c4e00e80a 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SchemaEndpoint.java @@ -1,16 +1,16 @@ package pl.allegro.tech.hermes.api.endpoints; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("topics/{topicName}/schema") public interface SchemaEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java index f8316029bd..d7806bca7e 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionEndpoint.java @@ -1,5 +1,16 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.ConsumerGroup; import pl.allegro.tech.hermes.api.OffsetRetransmissionDate; import pl.allegro.tech.hermes.api.PatchData; @@ -8,19 +19,8 @@ import pl.allegro.tech.hermes.api.SubscriptionMetrics; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("topics/{topicName}/subscriptions") public interface SubscriptionEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java index ae5813a92e..a610eac1b6 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/SubscriptionOwnershipEndpoint.java @@ -1,14 +1,14 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import pl.allegro.tech.hermes.api.Subscription; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("subscriptions/owner") public interface SubscriptionOwnershipEndpoint { diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java index 07a950dbe3..23bc974c6d 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/TopicEndpoint.java @@ -1,5 +1,16 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.MessageTextPreview; import pl.allegro.tech.hermes.api.PatchData; import pl.allegro.tech.hermes.api.Topic; @@ -7,19 +18,8 @@ import pl.allegro.tech.hermes.api.TopicWithSchema; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY; @Path("topics") diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java index cb5948ea9e..6c2178870e 100644 --- a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java +++ b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/endpoints/UnhealthyEndpoint.java @@ -1,14 +1,15 @@ package pl.allegro.tech.hermes.api.endpoints; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; + import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; @Path("unhealthy") public interface UnhealthyEndpoint { diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java index 0ef25961a4..0702ecc198 100644 --- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java +++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/ReactiveHermesClient.java @@ -129,7 +129,7 @@ private Mono retry(Mono sendOnceResult) { return sendOnceResult .flatMap(this::unwrapFailedAttemptAsException) .retryWhen(retrySpec) - .subscriberContext(ctx -> ctx.put(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext())) + .contextWrite(ctx -> ctx.put(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext())) .onErrorResume(Exception.class, this::unwrapRetryExhaustedException); } @@ -193,7 +193,7 @@ private void handleRetryAttempt(Retry.RetrySignal retrySignal) { } private Mono getNextAttempt() { - return Mono.subscriberContext() + return Mono.deferContextual(Mono::just) .map(ctx -> ctx.getOrDefault(RETRY_CONTEXT_KEY, HermesRetryContext.emptyRetryContext()) .getAndIncrementAttempt() ); diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java index 5dd9df1484..3d59d58548 100644 --- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java +++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/jersey/JerseyHermesSender.java @@ -1,16 +1,16 @@ package pl.allegro.tech.hermes.client.jersey; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.client.HermesMessage; import pl.allegro.tech.hermes.client.HermesResponse; import pl.allegro.tech.hermes.client.HermesSender; import java.net.URI; import java.util.concurrent.CompletableFuture; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.InvocationCallback; -import javax.ws.rs.core.Response; import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse; diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/restTemplate/RestTemplateHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/restTemplate/RestTemplateHermesSender.java deleted file mode 100644 index be73924ca3..0000000000 --- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/restTemplate/RestTemplateHermesSender.java +++ /dev/null @@ -1,86 +0,0 @@ -package pl.allegro.tech.hermes.client.restTemplate; // CHECKSTYLE.SUPPRESS: PackageName - -import org.springframework.http.HttpEntity; -import org.springframework.http.ResponseEntity; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.concurrent.ListenableFutureCallback; -import org.springframework.web.client.AsyncRestTemplate; -import org.springframework.web.client.HttpStatusCodeException; -import pl.allegro.tech.hermes.client.HermesMessage; -import pl.allegro.tech.hermes.client.HermesResponse; -import pl.allegro.tech.hermes.client.HermesSender; - -import java.net.URI; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.CompletableFuture; - -import static java.util.stream.Collectors.toMap; -import static pl.allegro.tech.hermes.client.HermesResponseBuilder.hermesResponse; - -/** - * RestTemplateHermesSender. - * - * @deprecated as of Hermes 2.2.10, in favor of {@link pl.allegro.tech.hermes.client.webclient.WebClientHermesSender} - */ -@Deprecated -public class RestTemplateHermesSender implements HermesSender { - - private final AsyncRestTemplate template; - - public RestTemplateHermesSender(AsyncRestTemplate template) { - this.template = template; - } - - @Override - public CompletableFuture send(URI uri, HermesMessage message) { - CompletableFuture future = new CompletableFuture<>(); - template.postForEntity(uri, new HttpEntity<>(message.getBody(), new LinkedMultiValueMap() { - { - message.consumeHeaders(this::add); - } - }), String.class) - .addCallback(new ListenableFutureCallback>() { - @Override - public void onSuccess(ResponseEntity response) { - future.complete(fromRestTemplateResponse(message, response)); - } - - @Override - public void onFailure(Throwable exception) { - if (exception instanceof HttpStatusCodeException) { - future.complete(fromHttpStatusCodeException(message, (HttpStatusCodeException) exception)); - } else { - future.completeExceptionally(exception); - } - } - }); - return future; - } - - private HermesResponse fromRestTemplateResponse(HermesMessage message, ResponseEntity response) { - return hermesResponse(message) - .withHttpStatus(response.getStatusCode().value()) - .withBody(response.toString()) - .withHeaderSupplier(header -> convertToCaseInsensitiveMap(response.getHeaders().toSingleValueMap()) - .getOrDefault(header, null)) - .build(); - } - - private HermesResponse fromHttpStatusCodeException(HermesMessage message, HttpStatusCodeException exception) { - return hermesResponse(message) - .withHttpStatus(exception.getStatusCode().value()) - .withBody(exception.getResponseBodyAsString()) - .build(); - } - - private TreeMap convertToCaseInsensitiveMap(Map hashMap) { - return hashMap.entrySet().stream() - .collect(toMap( - Map.Entry::getKey, - Map.Entry::getValue, - (oldVal, newVal) -> newVal, - () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER) - )); - } -} diff --git a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java index a92f4a6bc9..a258aec589 100644 --- a/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java +++ b/hermes-client/src/main/java/pl/allegro/tech/hermes/client/webclient/WebClientHermesSender.java @@ -36,7 +36,7 @@ public Mono sendReactively(URI uri, HermesMessage message) { .switchIfEmpty(NO_BODY) .map(body -> hermesResponse(message) .withBody(body) - .withHttpStatus(response.rawStatusCode()) + .withHttpStatus(response.statusCode().value()) .withHeaderSupplier(header -> convertToCaseInsensitiveMap(response.headers().asHttpHeaders().toSingleValueMap()).get(header)) .build())); diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy index adb02d929a..b265ad683f 100644 --- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy +++ b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy @@ -6,15 +6,13 @@ import okhttp3.OkHttpClient import org.springframework.web.reactive.function.client.WebClient import pl.allegro.tech.hermes.client.webclient.WebClientHermesSender import org.junit.ClassRule -import org.springframework.web.client.AsyncRestTemplate import pl.allegro.tech.hermes.client.jersey.JerseyHermesSender import pl.allegro.tech.hermes.client.okhttp.OkHttpHermesSender -import pl.allegro.tech.hermes.client.restTemplate.RestTemplateHermesSender import spock.lang.Shared import spock.lang.Specification import spock.lang.Unroll -import javax.ws.rs.client.ClientBuilder +import jakarta.ws.rs.client.ClientBuilder import static com.github.tomakehurst.wiremock.client.WireMock.aResponse import static com.github.tomakehurst.wiremock.client.WireMock.containing @@ -58,7 +56,6 @@ class HermesSenderTest extends Specification { where: sender | name new JerseyHermesSender(ClientBuilder.newClient()) | 'JerseySender' - new RestTemplateHermesSender(new AsyncRestTemplate()) | 'RestTemplateSender' new OkHttpHermesSender(new OkHttpClient()) | 'OkHttpSender' new WebClientHermesSender(WebClient.create()) | 'WebClientSender' } @@ -86,7 +83,6 @@ class HermesSenderTest extends Specification { where: sender | name new JerseyHermesSender(ClientBuilder.newClient()) | 'JerseySender' - new RestTemplateHermesSender(new AsyncRestTemplate()) | 'RestTemplateSender' new OkHttpHermesSender(new OkHttpClient()) | 'OkHttpSender' new WebClientHermesSender(WebClient.create()) | 'WebClientSender' } @@ -114,7 +110,6 @@ class HermesSenderTest extends Specification { where: sender | name new JerseyHermesSender(ClientBuilder.newClient()) | 'JerseySender' - new RestTemplateHermesSender(new AsyncRestTemplate()) | 'RestTemplateSender' new OkHttpHermesSender(new OkHttpClient()) | 'OkHttpSender' new WebClientHermesSender(WebClient.create()) | 'WebClientSender' } @@ -150,17 +145,14 @@ class HermesSenderTest extends Specification { where: sender | name | header new JerseyHermesSender(ClientBuilder.newClient()) | 'JerseySender' | 'Hermes-Message-Id' - new RestTemplateHermesSender(new AsyncRestTemplate()) | 'RestTemplateSender' | 'Hermes-Message-Id' new OkHttpHermesSender(new OkHttpClient()) | 'OkHttpSender' | 'Hermes-Message-Id' new WebClientHermesSender(WebClient.create()) | 'WebClientSender' | 'Hermes-Message-Id' new JerseyHermesSender(ClientBuilder.newClient()) | 'JerseySender' | 'hermes-message-id' - new RestTemplateHermesSender(new AsyncRestTemplate()) | 'RestTemplateSender' | 'hermes-message-id' new OkHttpHermesSender(new OkHttpClient()) | 'OkHttpSender' | 'hermes-message-id' new WebClientHermesSender(WebClient.create()) | 'WebClientSender' | 'hermes-message-id' new JerseyHermesSender(ClientBuilder.newClient()) | 'JerseySender' | 'HERMES-MESSAGE-ID' - new RestTemplateHermesSender(new AsyncRestTemplate()) | 'RestTemplateSender' | 'HERMES-MESSAGE-ID' new OkHttpHermesSender(new OkHttpClient()) | 'OkHttpSender' | 'HERMES-MESSAGE-ID' new WebClientHermesSender(WebClient.create()) | 'WebClientSender' | 'HERMES-MESSAGE-ID' } diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientTest.groovy index 5045ad086b..e8903c19e2 100644 --- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientTest.groovy +++ b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesClientTest.groovy @@ -173,7 +173,7 @@ class ReactiveHermesClientTest extends Specification { when: client.publish(TOPIC, CONTENT_TYPE, CONTENT) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) .subscribe() and: @@ -205,7 +205,7 @@ class ReactiveHermesClientTest extends Specification { when: client.publish(TOPIC, CONTENT_TYPE, CONTENT) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) .subscribe() and: diff --git a/hermes-common/build.gradle b/hermes-common/build.gradle index cd9af3528e..ccf959276b 100644 --- a/hermes-common/build.gradle +++ b/hermes-common/build.gradle @@ -40,13 +40,14 @@ dependencies { api group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics api group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: versions.micrometer_metrics - implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.7.10' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' - + implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '2.0.4' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.7' api(group: 'org.apache.kafka', name: 'kafka-clients', version: versions.kafka) { exclude group: 'net.sf.jopt-simple' } + api group: 'jakarta.inject', name: 'jakarta.inject-api', version: '2.0.1' + testImplementation project(':hermes-test-helper') testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java index ca9b8ecbcb..d541791598 100644 --- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java +++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/MetricRegistryFactory.java @@ -12,6 +12,7 @@ import com.codahale.metrics.jvm.MemoryUsageGaugeSet; import com.google.common.base.Joiner; import com.google.common.collect.Sets; +import jakarta.inject.Named; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.allegro.tech.hermes.common.metric.HermesMetrics; @@ -26,7 +27,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.inject.Named; public class MetricRegistryFactory { diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java index 32f3b0e099..3f6d6ee30e 100644 --- a/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java +++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/wrapper/AvroMessageContentUnwrapper.java @@ -1,9 +1,8 @@ package pl.allegro.tech.hermes.common.message.wrapper; +import jakarta.annotation.Nullable; import pl.allegro.tech.hermes.api.Topic; -import javax.annotation.Nullable; - interface AvroMessageContentUnwrapper { AvroMessageContentUnwrapperResult unwrap(byte[] data, Topic topic, @Nullable Integer headerId, @Nullable Integer headerVersion); diff --git a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java index 09dc1dd4d5..d546ba6044 100644 --- a/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java +++ b/hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperGroupRepository.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.infrastructure.zookeeper; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; import org.apache.curator.framework.CuratorFramework; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; @@ -15,7 +16,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; public class ZookeeperGroupRepository extends ZookeeperBasedRepository implements GroupRepository { diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java index 180d76a377..f66e1fca9a 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/ConsumerEndpoint.java @@ -1,13 +1,13 @@ package pl.allegro.tech.hermes.consumers; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import pl.allegro.tech.hermes.consumers.supervisor.process.RunningSubscriptionStatus; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("status") public interface ConsumerEndpoint { diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java index 8d00540d0d..8ed2dc2c48 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java @@ -6,6 +6,7 @@ import io.micrometer.core.instrument.composite.CompositeMeterRegistry; import io.micrometer.prometheus.PrometheusConfig; import io.micrometer.prometheus.PrometheusMeterRegistry; +import jakarta.inject.Named; import org.apache.curator.framework.CuratorFramework; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -75,7 +76,6 @@ import java.time.Clock; import java.util.Arrays; import java.util.List; -import javax.inject.Named; import static io.micrometer.core.instrument.Clock.SYSTEM; import static java.util.Collections.emptyList; diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java index 49f6148544..51057e3cab 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ConsumerSenderConfiguration.java @@ -9,6 +9,7 @@ import com.google.api.gax.rpc.TransportChannelProvider; import com.google.auth.oauth2.GoogleCredentials; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Named; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.Request; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -24,7 +25,6 @@ import pl.allegro.tech.hermes.consumers.consumer.oauth.OAuthAccessTokens; import pl.allegro.tech.hermes.consumers.consumer.sender.MessageBatchSenderFactory; import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSenderFactory; -import pl.allegro.tech.hermes.consumers.consumer.sender.MessageSendingResult; import pl.allegro.tech.hermes.consumers.consumer.sender.ProtocolMessageSenderProvider; import pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub.GooglePubSubMessageSenderProvider; import pl.allegro.tech.hermes.consumers.consumer.sender.googlepubsub.GooglePubSubMessageTransformerCreator; @@ -57,7 +57,6 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; -import javax.inject.Named; import javax.jms.Message; @Configuration diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java index a467581035..038687d981 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/GooglePubSubConfiguration.java @@ -7,6 +7,7 @@ import com.google.api.gax.rpc.TransportChannelProvider; import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.inject.Named; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,7 +17,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import javax.inject.Named; @Configuration @EnableConfigurationProperties({ diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java index df8e5e5b2a..a31f027fe1 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/OAuthConfiguration.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.inject.Named; import org.apache.curator.framework.CuratorFramework; import org.eclipse.jetty.client.HttpClient; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -25,7 +26,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; -import javax.inject.Named; @Configuration @EnableConfigurationProperties(OAuthProperties.class) diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java index f03e80b700..c959d00994 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/SchemaConfiguration.java @@ -1,7 +1,9 @@ package pl.allegro.tech.hermes.consumers.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.apache.avro.Schema; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; @@ -22,8 +24,6 @@ import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver; import java.net.URI; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; @Configuration @EnableConfigurationProperties({ diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java index b7de5d2544..7ab095095e 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/oauth/client/OAuthTokenResponse.java @@ -2,10 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotEmpty; import pl.allegro.tech.hermes.consumers.consumer.oauth.OAuthAccessToken; -import javax.validation.constraints.NotEmpty; - public class OAuthTokenResponse { @NotEmpty diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java index 640af7032f..c5458fbaee 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/MessageSendingResult.java @@ -10,9 +10,9 @@ import java.util.function.Predicate; import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS; +import static jakarta.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static java.util.stream.Collectors.joining; -import static javax.ws.rs.core.Response.Status.OK; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; public interface MessageSendingResult { String CAUSE_UNKNOWN = "unknown"; diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java index d73c0d7ed5..0690740b76 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/SingleMessageSendingResult.java @@ -2,6 +2,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Throwables; +import jakarta.ws.rs.core.Response; import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; @@ -14,14 +15,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Predicate; -import javax.ws.rs.core.Response; import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE; import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; -import static javax.ws.rs.core.Response.Status.Family.CLIENT_ERROR; -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; -import static javax.ws.rs.core.Response.Status.Family.familyOf; +import static jakarta.ws.rs.core.Response.Status.Family.CLIENT_ERROR; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.Family.familyOf; public class SingleMessageSendingResult implements MessageSendingResult { diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java index 6fad89eac9..8784afb9bc 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsFactory.java @@ -1,8 +1,10 @@ package pl.allegro.tech.hermes.consumers.consumer.sender.http; import org.eclipse.jetty.client.HttpClient; +import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; import org.eclipse.jetty.http2.client.HTTP2Client; import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.HttpCookieStore; import pl.allegro.tech.hermes.common.metric.executor.InstrumentedExecutorServiceFactory; @@ -21,17 +23,19 @@ public HttpClientsFactory( } public HttpClient createClientForHttp1(String name, Http1ClientParameters http1ClientParameters) { + ClientConnector clientConnector = new ClientConnector(); + sslContextFactoryProvider.provideSslContextFactory() + .ifPresent(clientConnector::setSslContextFactory); + HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP(clientConnector); + HttpClient client = new HttpClient(transport); + ExecutorService executor = executorFactory.getExecutorService( name, http1ClientParameters.getThreadPoolSize(), http1ClientParameters.isThreadPoolMonitoringEnabled()); - - HttpClient client = sslContextFactoryProvider.provideSslContextFactory() - .map(HttpClient::new) - .orElseGet(HttpClient::new); + client.setExecutor(executor); client.setMaxConnectionsPerDestination(http1ClientParameters.getMaxConnectionsPerDestination()); client.setMaxRequestsQueuedPerDestination(http1ClientParameters.getMaxRequestsQueuedPerDestination()); - client.setExecutor(executor); client.setCookieStore(new HttpCookieStore.Empty()); client.setIdleTimeout(http1ClientParameters.getIdleTimeout().toMillis()); client.setFollowRedirects(http1ClientParameters.isFollowRedirectsEnabled()); @@ -40,18 +44,23 @@ public HttpClient createClientForHttp1(String name, Http1ClientParameters http1C } public HttpClient createClientForHttp2(String name, Http2ClientParameters http2ClientParameters) { + ClientConnector clientConnector = new ClientConnector(); + sslContextFactoryProvider.provideSslContextFactory() + .ifPresentOrElse(clientConnector::setSslContextFactory, + () -> { + throw new IllegalStateException("Cannot create http/2 client due to lack of ssl context factory"); + }); + HTTP2Client http2Client = new HTTP2Client(clientConnector); + ExecutorService executor = executorFactory.getExecutorService( name, http2ClientParameters.getThreadPoolSize(), http2ClientParameters.isThreadPoolMonitoringEnabled()); - - HTTP2Client http2Client = new HTTP2Client(); http2Client.setExecutor(executor); + HttpClientTransportOverHTTP2 transport = new HttpClientTransportOverHTTP2(http2Client); + HttpClient client = new HttpClient(transport); - HttpClient client = sslContextFactoryProvider.provideSslContextFactory() - .map(sslContextFactory -> new HttpClient(transport, sslContextFactory)) - .orElseThrow(() -> new IllegalStateException("Cannot create http/2 client due to lack of ssl context factory")); client.setMaxRequestsQueuedPerDestination(http2ClientParameters.getMaxRequestsQueuedPerDestination()); client.setCookieStore(new HttpCookieStore.Empty()); client.setIdleTimeout(http2ClientParameters.getIdleTimeout().toMillis()); diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java index c38706dd66..90bbe304af 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/HttpClientsWorkloadReporter.java @@ -122,7 +122,7 @@ int getHttp2SerialClientQueueSize() { private final Function getHttp2PendingConnectionsCount = http2Client -> getHttp2ConnectionPool(http2Client) - .map(MultiplexConnectionPool::getPendingCount) + .map(MultiplexConnectionPool::getPendingConnectionCount) .mapToInt(i -> i) .sum(); diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java index 78e0ab619f..1b8f22b92a 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/SslContextFactoryProvider.java @@ -28,9 +28,9 @@ public SslContextFactoryProvider(SslContextFactory sslContextFactory, SslContext this.sslContextParams = sslContextParams; } - public Optional provideSslContextFactory() { + public Optional provideSslContextFactory() { if (sslContextParams.isEnabled()) { - org.eclipse.jetty.util.ssl.SslContextFactory sslCtx = new org.eclipse.jetty.util.ssl.SslContextFactory(); + org.eclipse.jetty.util.ssl.SslContextFactory.Client sslCtx = new org.eclipse.jetty.util.ssl.SslContextFactory.Client(); sslCtx.setEndpointIdentificationAlgorithm("HTTPS"); sslCtx.setSslContext(sslContextFactory().create().getSslContext()); return Optional.of(sslCtx); diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java index bc880daa1d..a78502454b 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http1HeadersProvider.java @@ -8,7 +8,7 @@ import java.util.function.Function; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY; import static pl.allegro.tech.hermes.api.ContentType.AVRO; diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java index 645a26f4b0..4d61a75184 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/headers/Http2HeadersProvider.java @@ -8,7 +8,7 @@ import java.util.function.Function; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY; import static pl.allegro.tech.hermes.api.ContentType.AVRO; diff --git a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java index 5fddebd048..cd2acff247 100644 --- a/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java +++ b/hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java @@ -11,7 +11,7 @@ import java.net.InetSocketAddress; import java.util.List; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS; import static pl.allegro.tech.hermes.consumers.health.Checks.SUBSCRIPTIONS_COUNT; diff --git a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java index 1807eda5c3..9bd46f1ad0 100644 --- a/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java +++ b/hermes-consumers/src/test/java/pl/allegro/tech/hermes/consumers/consumer/sender/http/JettyMessageSenderTest.java @@ -35,9 +35,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static java.lang.String.format; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.TEST_MESSAGE_CONTENT; import static pl.allegro.tech.hermes.consumers.test.MessageBuilder.testMessage; diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java index ceabcffd94..9d7381e59b 100644 --- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java +++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java @@ -6,6 +6,7 @@ import io.micrometer.core.instrument.composite.CompositeMeterRegistry; import io.micrometer.prometheus.PrometheusConfig; import io.micrometer.prometheus.PrometheusMeterRegistry; +import jakarta.inject.Named; import org.apache.curator.framework.CuratorFramework; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -76,7 +77,6 @@ import java.time.Clock; import java.util.List; -import javax.inject.Named; import static io.micrometer.core.instrument.Clock.SYSTEM; diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java index 26e382c5fa..fa0d718b3c 100644 --- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java +++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/SchemaConfiguration.java @@ -1,7 +1,9 @@ package pl.allegro.tech.hermes.frontend.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.apache.avro.Schema; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; @@ -22,8 +24,6 @@ import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver; import java.net.URI; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; @Configuration @EnableConfigurationProperties({ diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java index cafda10e2f..44a42cc7f5 100644 --- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java +++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/producer/kafka/KafkaBrokerMessageProducer.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.frontend.producer.kafka; +import jakarta.inject.Singleton; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.PartitionInfo; @@ -13,7 +14,6 @@ import pl.allegro.tech.hermes.frontend.publishing.message.Message; import java.util.List; -import javax.inject.Singleton; @Singleton public class KafkaBrokerMessageProducer implements BrokerMessageProducer { diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java index 08c2dbc58a..5858aefea9 100644 --- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java +++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/handlers/end/MessageErrorProcessor.java @@ -4,6 +4,7 @@ import io.undertow.server.HttpServerExchange; import io.undertow.util.Headers; import io.undertow.util.HttpString; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.allegro.tech.hermes.api.ErrorDescription; @@ -14,7 +15,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Map; -import javax.ws.rs.core.MediaType; import static pl.allegro.tech.hermes.api.ErrorCode.INTERNAL_ERROR; import static pl.allegro.tech.hermes.api.ErrorDescription.error; diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java index 6f0c89278e..ad1d7c7913 100644 --- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java +++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcer.java @@ -6,7 +6,7 @@ import pl.allegro.tech.hermes.common.message.wrapper.UnsupportedContentTypeException; import tech.allegro.schema.json2avro.converter.JsonAvroConverter; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_JSON; diff --git a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java index a48eb8042a..6f9c727bd3 100644 --- a/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java +++ b/hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/services/HealthCheckService.java @@ -1,6 +1,6 @@ package pl.allegro.tech.hermes.frontend.services; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class HealthCheckService { diff --git a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java index 291f0d1a88..c76b7d81d1 100644 --- a/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java +++ b/hermes-frontend/src/test/java/pl/allegro/tech/hermes/frontend/publishing/message/MessageContentTypeEnforcerTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.frontend.publishing.message; +import jakarta.ws.rs.core.MediaType; import org.apache.avro.Schema; import org.junit.Test; import pl.allegro.tech.hermes.api.ContentType; @@ -10,8 +11,6 @@ import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader; import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder; -import javax.ws.rs.core.MediaType; - import static org.assertj.core.api.Assertions.assertThat; public class MessageContentTypeEnforcerTest { diff --git a/hermes-management/build.gradle b/hermes-management/build.gradle index 52384269bd..55579b7110 100644 --- a/hermes-management/build.gradle +++ b/hermes-management/build.gradle @@ -29,7 +29,7 @@ dependencies { } implementation group: 'commons-jxpath', name: 'commons-jxpath', version: '1.3' - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' + implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1' api group: 'org.javers', name: 'javers-core', version: '5.2.5' diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java index 9e1a661934..b6038c2740 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/AllTopicClientsEndpoint.java @@ -1,15 +1,15 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.management.domain.clients.AllTopicClientsService; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName; @Component diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java index 4a3be7cea1..bd796708ad 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/BlacklistEndpoint.java @@ -2,6 +2,18 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.BlacklistStatus; @@ -11,21 +23,9 @@ import pl.allegro.tech.hermes.management.domain.blacklist.TopicBlacklistService; import java.util.List; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.status; import static pl.allegro.tech.hermes.api.BlacklistStatus.BLACKLISTED; import static pl.allegro.tech.hermes.api.BlacklistStatus.NOT_BLACKLISTED; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java index cd31d10597..bb835b5112 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsistencyEndpoint.java @@ -1,5 +1,15 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.InconsistentGroup; import pl.allegro.tech.hermes.management.api.auth.HermesSecurityAwareRequestUser; @@ -10,18 +20,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @RolesAllowed(Roles.ADMIN) diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java index c792a4f1ae..7d78d77e7a 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ConsoleEndpoint.java @@ -2,14 +2,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.management.domain.console.ConsoleService; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - @Component @Path("/") @Api(value = "/", description = "Hermes console") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java index 0f41de3cbf..0cc80867fe 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/CorsFilter.java @@ -1,14 +1,13 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.management.config.CorsProperties; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; - @Provider public class CorsFilter implements ContainerResponseFilter { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java index 0131e94235..104eaa6553 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/FilterEndpoint.java @@ -1,18 +1,17 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.MessageFiltersVerificationInput; import pl.allegro.tech.hermes.api.MessageFiltersVerificationResult; import pl.allegro.tech.hermes.api.TopicName; import pl.allegro.tech.hermes.management.domain.filtering.FilteringService; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @Path("filters") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java index 5033fb6833..58a0663ae7 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/GroupsEndpoint.java @@ -2,6 +2,19 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.Group; @@ -13,21 +26,8 @@ import pl.allegro.tech.hermes.management.domain.group.GroupService; import java.util.List; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @Path("/groups") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java index 270de21d15..b8abc1c208 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ModeEndpoint.java @@ -2,21 +2,20 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.management.api.auth.Roles; import pl.allegro.tech.hermes.management.domain.mode.ModeService; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_ONLY_ADMIN; import static pl.allegro.tech.hermes.management.domain.mode.ModeService.ManagementMode.READ_WRITE; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java index 63fcf58f28..c4daf90171 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OAuthProvidersEndpoint.java @@ -2,6 +2,19 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.OAuthProvider; @@ -11,22 +24,9 @@ import pl.allegro.tech.hermes.management.domain.oauth.OAuthProviderService; import java.util.List; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.status; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.status; @Component @Path("/oauth/providers") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java index 9d480bcf20..25bc4d382a 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineClientsEndpoint.java @@ -1,5 +1,10 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -10,13 +15,8 @@ import pl.allegro.tech.hermes.management.domain.clients.OfflineClientsService; import java.util.Optional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @Path("/topics") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java index acec793dfe..2349656f48 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OfflineRetransmissionEndpoint.java @@ -1,6 +1,17 @@ package pl.allegro.tech.hermes.management.api; import io.swagger.annotations.Api; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -14,19 +25,8 @@ import pl.allegro.tech.hermes.management.domain.retransmit.OfflineRetransmissionService; import java.util.List; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @Path("offline-retransmission/tasks") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java index 4d7fa8acd5..e6b9cb7ccc 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/OwnersEndpoint.java @@ -3,6 +3,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.Owner; @@ -13,14 +19,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @Path("/owners") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java index fceb856418..c7c8bf183d 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/QueryEndpoint.java @@ -1,5 +1,9 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.Group; @@ -13,12 +17,8 @@ import pl.allegro.tech.hermes.management.domain.topic.TopicService; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("query") @Component diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java index e62f19fad7..1a552e6003 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadOnlyFilter.java @@ -1,5 +1,10 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.annotation.Priority; +import jakarta.ws.rs.ServiceUnavailableException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.glassfish.jersey.server.ContainerRequest; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.management.api.auth.AuthorizationFilter; @@ -7,11 +12,6 @@ import pl.allegro.tech.hermes.management.domain.mode.ModeService; import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.ServiceUnavailableException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; @Provider @Priority(AuthorizationFilter.AUTHORIZATION_FILTER_PRIORITY + 2) diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java index 470f6e4887..f8f3b379be 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/ReadinessEndpoint.java @@ -1,5 +1,13 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.DatacenterReadiness; import pl.allegro.tech.hermes.api.Readiness; @@ -7,16 +15,8 @@ import pl.allegro.tech.hermes.management.domain.readiness.ReadinessService; import java.util.List; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.NOT_READY; import static pl.allegro.tech.hermes.api.DatacenterReadiness.ReadinessStatus.READY; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java index a3b5daebcc..3ef288a9ed 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/RolesEndpoint.java @@ -2,6 +2,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.SecurityContext; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.management.api.auth.Roles; @@ -10,14 +16,8 @@ import java.util.Collection; import java.util.Collections; import java.util.function.Consumer; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.SecurityContext; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Component @Path("/roles") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java index 5234c95d92..6403dd031e 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SchemaEndpoint.java @@ -1,6 +1,20 @@ package pl.allegro.tech.hermes.management.api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.api.RawSchema; import pl.allegro.tech.hermes.api.Topic; @@ -13,22 +27,8 @@ import pl.allegro.tech.hermes.schema.SchemaVersion; import java.util.Optional; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName; @Path("topics/{topicName}/schema") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java index 0698f8ccf3..9eaf69334e 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsEndpoint.java @@ -1,6 +1,22 @@ package pl.allegro.tech.hermes.management.api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.api.ConsumerGroup; import pl.allegro.tech.hermes.api.MessageTrace; @@ -24,26 +40,10 @@ import java.util.List; import java.util.Optional; -import javax.annotation.security.RolesAllowed; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.api.TopicName.fromQualifiedName; @Path("topics/{topicName}/subscriptions") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java index b22fe6997c..c6ad63e80c 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/SubscriptionsOwnershipEndpoint.java @@ -1,5 +1,9 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.api.OwnerId; import pl.allegro.tech.hermes.api.Subscription; @@ -9,12 +13,8 @@ import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; @Path("subscriptions/owner") public class SubscriptionsOwnershipEndpoint { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java index e8e2c60d69..7f87849f30 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/TopicsEndpoint.java @@ -2,6 +2,22 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.MessageTextPreview; @@ -26,28 +42,12 @@ import java.util.List; import java.util.Optional; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; import static com.google.common.base.Strings.isNullOrEmpty; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; +import static jakarta.ws.rs.core.Response.status; import static java.lang.String.format; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM; -import static javax.ws.rs.core.Response.status; @Component @Path("/topics") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java index 2a3cea8c80..f1d4cefa5f 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UiResource.java @@ -1,12 +1,11 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.glassfish.jersey.server.mvc.Viewable; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - -import static javax.ws.rs.core.MediaType.TEXT_HTML; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML; @Path("/") public class UiResource { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java index 3e3005c727..dae9810ab8 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/UnhealthyEndpoint.java @@ -1,5 +1,12 @@ package pl.allegro.tech.hermes.management.api; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.GenericEntity; +import jakarta.ws.rs.core.Response; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.api.OwnerId; import pl.allegro.tech.hermes.api.UnhealthySubscription; @@ -9,16 +16,9 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; @Path("unhealthy") public class UnhealthyEndpoint { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java index fefde17151..6a43d32208 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/WorkloadConstraintsEndpoint.java @@ -2,6 +2,19 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jakarta.annotation.security.RolesAllowed; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.SubscriptionConstraints; import pl.allegro.tech.hermes.api.SubscriptionName; @@ -14,23 +27,10 @@ import pl.allegro.tech.hermes.management.domain.workload.constraints.WorkloadConstraintsService; import java.util.List; -import javax.annotation.security.RolesAllowed; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.OK; @Component @Path("/workload-constraints") diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java index 475501905d..214e99c5fd 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AllowAllSecurityProvider.java @@ -1,10 +1,10 @@ package pl.allegro.tech.hermes.management.api.auth; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.SecurityContext; import org.apache.commons.lang.NotImplementedException; import java.security.Principal; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.SecurityContext; public class AllowAllSecurityProvider implements SecurityProvider { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java index d9f8ac272e..9e8ba437fd 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/AuthorizationFilter.java @@ -1,12 +1,12 @@ package pl.allegro.tech.hermes.management.api.auth; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.ext.Provider; import org.springframework.beans.factory.annotation.Autowired; import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.ext.Provider; @Provider @Priority(AuthorizationFilter.AUTHORIZATION_FILTER_PRIORITY) diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java index 4a8507345f..d137b15701 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/HermesSecurityAwareRequestUser.java @@ -1,12 +1,11 @@ package pl.allegro.tech.hermes.management.api.auth; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.SecurityContext; import pl.allegro.tech.hermes.api.OwnerId; import pl.allegro.tech.hermes.management.api.auth.SecurityProvider.OwnershipResolver; import pl.allegro.tech.hermes.management.domain.auth.RequestUser; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.SecurityContext; - public class HermesSecurityAwareRequestUser implements RequestUser { private final String username; private final boolean isAdmin; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java index c3f7103bca..65c8c3b83e 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/ManagementRights.java @@ -1,13 +1,12 @@ package pl.allegro.tech.hermes.management.api.auth; +import jakarta.ws.rs.container.ContainerRequestContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.Group; import pl.allegro.tech.hermes.api.Topic; import pl.allegro.tech.hermes.management.config.GroupProperties; -import javax.ws.rs.container.ContainerRequestContext; - /** * Make sure these implementations conform to what is configured via RolesAllowed annotations in endpoints. */ diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java index 626262c6de..7806a61420 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/auth/SecurityProvider.java @@ -1,10 +1,9 @@ package pl.allegro.tech.hermes.management.api.auth; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.SecurityContext; import pl.allegro.tech.hermes.api.OwnerId; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.SecurityContext; - public interface SecurityProvider { HermesSecurity security(ContainerRequestContext requestContext); diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java index 040b3e239c..512ba3b3e6 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AbstractExceptionMapper.java @@ -1,12 +1,11 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import pl.allegro.tech.hermes.api.ErrorCode; import pl.allegro.tech.hermes.api.ErrorDescription; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - abstract class AbstractExceptionMapper implements ExceptionMapper { @Override diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java index 596486523c..c10e42caab 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/AuthExceptionMapper.java @@ -1,11 +1,10 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; import pl.allegro.tech.hermes.management.api.auth.AuthException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - @Provider public class AuthExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java index 5e2c1c0c07..69a6054a31 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ConstraintViolationMapper.java @@ -3,14 +3,14 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.glassfish.jersey.server.validation.ValidationErrorData; import org.glassfish.jersey.server.validation.internal.ValidationHelper; import pl.allegro.tech.hermes.api.ErrorCode; import java.util.List; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; @Provider public class ConstraintViolationMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java index 2fe93e6484..0939d066f6 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/HermesExceptionMapper.java @@ -1,13 +1,12 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorDescription; import pl.allegro.tech.hermes.common.exception.HermesException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - @Provider public class HermesExceptionMapper implements ExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java index 7c6e20c327..7c2e24a17a 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IOExceptionMapper.java @@ -1,10 +1,10 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; import java.io.IOException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; @Provider public class IOExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java index bc18926543..2e0fa74bf1 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/IllegalArgumentExceptionMapper.java @@ -1,10 +1,9 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - @Provider public class IllegalArgumentExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java index cb768a4124..145ac5d5dd 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonMappingExceptionMapper.java @@ -1,11 +1,10 @@ package pl.allegro.tech.hermes.management.api.mappers; import com.fasterxml.jackson.databind.JsonMappingException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - @Provider public class JsonMappingExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java index 77a2047760..df1c7b5e50 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/JsonParseExceptionMapper.java @@ -1,11 +1,10 @@ package pl.allegro.tech.hermes.management.api.mappers; import com.fasterxml.jackson.core.JsonParseException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - @Provider public class JsonParseExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java index 99f01e9f31..8b713d23cd 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ManagementExceptionMapper.java @@ -1,13 +1,12 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorDescription; import pl.allegro.tech.hermes.management.domain.ManagementException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - @Provider public class ManagementExceptionMapper implements ExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java index 6d9100dd17..199880661e 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/NotSupportedExceptionMapper.java @@ -1,11 +1,10 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.NotSupportedException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; -import javax.ws.rs.NotSupportedException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - @Provider public class NotSupportedExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java index bacf7aaa9c..1818c91371 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/ParseExceptionMapper.java @@ -1,11 +1,10 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; import pl.allegro.tech.hermes.management.infrastructure.query.parser.ParseException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - @Provider public class ParseExceptionMapper extends AbstractExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java index e18419e1b1..18884b3171 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/RuntimeExceptionMapper.java @@ -1,15 +1,14 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.allegro.tech.hermes.api.ErrorCode; import pl.allegro.tech.hermes.api.ErrorDescription; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - @Provider public class RuntimeExceptionMapper implements ExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java index 0e645e043c..547661b082 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/SchemaExceptionMapper.java @@ -1,13 +1,12 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorDescription; import pl.allegro.tech.hermes.schema.SchemaException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - @Provider public class SchemaExceptionMapper implements ExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java index b94f12b1ac..e3680aced5 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/mappers/WebApplicationExceptionMapper.java @@ -1,14 +1,13 @@ package pl.allegro.tech.hermes.management.api.mappers; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.ErrorCode; import pl.allegro.tech.hermes.api.ErrorDescription; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - @Provider public class WebApplicationExceptionMapper implements ExceptionMapper { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java index 85f902ae9d..33cdedf61d 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/reader/QueryBodyReader.java @@ -1,6 +1,11 @@ package pl.allegro.tech.hermes.management.api.reader; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import org.springframework.beans.factory.annotation.Autowired; import pl.allegro.tech.hermes.api.Query; import pl.allegro.tech.hermes.management.infrastructure.query.parser.QueryParser; @@ -11,11 +16,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; @Provider public class QueryBodyReader implements MessageBodyReader { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java index 1b9c2bd2f9..4c4b8cadd1 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/validator/ApiPreconditions.java @@ -1,14 +1,14 @@ package pl.allegro.tech.hermes.management.api.validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.groups.Default; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.constraints.AdminPermitted; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.groups.Default; @Component public class ApiPreconditions { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java index 9ad9bddc82..0226d34d77 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/api/writer/UnhealthySubscriptionListPlainTextBodyWriter.java @@ -1,5 +1,11 @@ package pl.allegro.tech.hermes.management.api.writer; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import pl.allegro.tech.hermes.api.SubscriptionHealthProblem; import pl.allegro.tech.hermes.api.UnhealthySubscription; @@ -9,15 +15,9 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import static java.util.stream.Collectors.joining; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; @Provider @Produces(TEXT_PLAIN) diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java index 6b2e46dcd6..8539c9b2e7 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/CrowdConfiguration.java @@ -1,8 +1,12 @@ package pl.allegro.tech.hermes.management.config; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.config.ConnectionConfig; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.core5.util.Timeout; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -31,15 +35,24 @@ public ClientHttpRequestFactory clientHttpRequestFactory() { @Bean(name = "crowdRestTemplate") public RestTemplate restTemplate(CrowdProperties properties) { + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setMaxConnTotal(properties.getMaxConnections()) + .setMaxConnPerRoute(properties.getMaxConnectionsPerRoute()) + .setDefaultConnectionConfig( + ConnectionConfig.custom() + .setSocketTimeout(Timeout.ofMilliseconds(properties.getSocketTimeoutMillis())) + .setConnectTimeout(Timeout.ofMilliseconds(properties.getConnectionTimeoutMillis())) + .build()) + .build(); + RequestConfig requestConfig = RequestConfig.custom() - .setConnectTimeout(properties.getConnectionTimeoutMillis()) - .setSocketTimeout(properties.getSocketTimeoutMillis()) + .setConnectTimeout(Timeout.ofMilliseconds(properties.getConnectionTimeoutMillis())) + .setResponseTimeout(Timeout.ofMilliseconds(properties.getSocketTimeoutMillis())) .build(); HttpClient client = HttpClientBuilder.create() - .setMaxConnTotal(properties.getMaxConnections()) - .setMaxConnPerRoute(properties.getMaxConnectionsPerRoute()) .setDefaultRequestConfig(requestConfig) + .setConnectionManager(connectionManager) .build(); ClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(client); diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteClientConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteClientConfiguration.java index 22f22b39fc..ec5c9e6263 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteClientConfiguration.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/GraphiteClientConfiguration.java @@ -1,8 +1,11 @@ package pl.allegro.tech.hermes.management.config; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.core5.util.Timeout; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -50,15 +53,19 @@ public GraphiteClient graphiteClient(@Qualifier("graphiteRestTemplate") RestTemp @Bean("graphiteRestTemplate") public RestTemplate restTemplate(GraphiteClientProperties properties) { + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setMaxConnTotal(properties.getMaxConnections()) + .setMaxConnPerRoute(properties.getMaxConnectionsPerRoute()) + .build(); + RequestConfig requestConfig = RequestConfig.custom() - .setConnectTimeout(properties.getConnectionTimeoutMillis()) - .setSocketTimeout(properties.getSocketTimeoutMillis()) + .setConnectTimeout(Timeout.ofMilliseconds(properties.getConnectionTimeoutMillis())) + .setResponseTimeout(Timeout.ofMilliseconds(properties.getSocketTimeoutMillis())) .build(); HttpClient client = HttpClientBuilder.create() - .setMaxConnTotal(properties.getMaxConnections()) - .setMaxConnPerRoute(properties.getMaxConnectionsPerRoute()) .setDefaultRequestConfig(requestConfig) + .setConnectionManager(connectionManager) .build(); ClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(client); diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java index 84d2a363cf..a183f9ed0b 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/JerseyResourceConfig.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.management.config; +import jakarta.ws.rs.ApplicationPath; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ServerProperties; import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature; @@ -8,8 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.ApplicationPath; - @ApplicationPath("/") public class JerseyResourceConfig extends ResourceConfig { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java index e645be9bc3..ccbd520dc1 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/SchemaRepositoryConfiguration.java @@ -1,7 +1,9 @@ package pl.allegro.tech.hermes.management.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.apache.avro.Schema; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; @@ -27,8 +29,6 @@ import pl.allegro.tech.hermes.schema.resolver.SchemaRepositoryInstanceResolver; import java.net.URI; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; import static pl.allegro.tech.hermes.schema.SubjectNamingStrategy.qualifiedName; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java index cc7cd378dd..2dfe56d48c 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/storage/StorageConfiguration.java @@ -1,7 +1,6 @@ package pl.allegro.tech.hermes.management.config.storage; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.curator.framework.CuratorFramework; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -40,9 +39,6 @@ import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClientManager; import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperRepositoryManager; -import javax.annotation.PostConstruct; - -import static java.util.stream.Collectors.toList; import static org.slf4j.LoggerFactory.getLogger; @Configuration diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java index b63488762e..e3a69286cf 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/consistency/DcConsistencyService.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.annotation.PreDestroy; import org.springframework.stereotype.Component; import pl.allegro.tech.hermes.api.Group; import pl.allegro.tech.hermes.api.InconsistentGroup; @@ -30,7 +31,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.function.Function; -import javax.annotation.PreDestroy; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java index d4e0554c09..7958986dc6 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/health/HealthCheckScheduler.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.micrometer.core.instrument.MeterRegistry; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -14,7 +15,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; @Component public class HealthCheckScheduler { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java index 848cc6bf91..9604d8e9ea 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/subscription/SubscriptionOwnerCache.java @@ -4,6 +4,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.annotation.PreDestroy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -18,7 +19,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.PreDestroy; @Component public class SubscriptionOwnerCache { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java index 7756c90404..d84f13e1df 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicOwnerCache.java @@ -4,6 +4,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.annotation.PreDestroy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -18,7 +19,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.PreDestroy; @Component public class TopicOwnerCache { diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java index e77d52d3b3..5562b69a17 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/audit/EventAuditor.java @@ -6,7 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.client.RestTemplate; -import pl.allegro.tech.hermes.api.Anonymizable; import pl.allegro.tech.hermes.api.PatchData; import pl.allegro.tech.hermes.management.domain.Auditor; diff --git a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java index b677dd86d5..8c9d080ccd 100644 --- a/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java +++ b/hermes-management/src/main/java/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClient.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.management.infrastructure.graphite; import com.google.common.base.Strings; +import jakarta.ws.rs.core.UriBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; @@ -13,7 +14,6 @@ import java.io.UnsupportedEncodingException; import java.net.URI; import java.util.List; -import javax.ws.rs.core.UriBuilder; import static com.google.common.base.Preconditions.checkArgument; import static org.apache.commons.lang.exception.ExceptionUtils.getRootCauseMessage; diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/api/auth/ManagementRightsSpec.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/api/auth/ManagementRightsSpec.groovy index 0113fa27ff..3d73fb1342 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/api/auth/ManagementRightsSpec.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/api/auth/ManagementRightsSpec.groovy @@ -1,19 +1,19 @@ package pl.allegro.tech.hermes.management.api.auth +import jakarta.ws.rs.container.ContainerRequestContext +import jakarta.ws.rs.core.Cookie +import jakarta.ws.rs.core.MediaType +import jakarta.ws.rs.core.MultivaluedMap +import jakarta.ws.rs.core.Request +import jakarta.ws.rs.core.Response +import jakarta.ws.rs.core.SecurityContext +import jakarta.ws.rs.core.UriInfo import pl.allegro.tech.hermes.api.Group import pl.allegro.tech.hermes.management.config.GroupProperties import pl.allegro.tech.hermes.test.helper.builder.GroupBuilder import spock.lang.Specification import spock.lang.Unroll -import javax.ws.rs.container.ContainerRequestContext -import javax.ws.rs.core.Cookie -import javax.ws.rs.core.MediaType -import javax.ws.rs.core.MultivaluedMap -import javax.ws.rs.core.Request -import javax.ws.rs.core.Response -import javax.ws.rs.core.SecurityContext -import javax.ws.rs.core.UriInfo import java.security.Principal class ManagementRightsSpec extends Specification { diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy index a65a2f8751..811447481f 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/InflightSizeValidatorTest.groovy @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.management.domain.subscription.validator +import jakarta.validation.ConstraintViolationException import pl.allegro.tech.hermes.api.Subscription import pl.allegro.tech.hermes.api.SubscriptionPolicy import pl.allegro.tech.hermes.domain.subscription.SubscriptionRepository @@ -11,11 +12,8 @@ import spock.lang.Shared import spock.lang.Specification import spock.lang.Subject -import javax.validation.ConstraintViolationException - import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription - class InflightSizeValidatorTest extends Specification { @Shared diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidatorTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidatorTest.groovy index 5683189956..3463870483 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidatorTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/subscription/validator/MessageFilterTypeValidatorTest.groovy @@ -4,7 +4,6 @@ import pl.allegro.tech.hermes.api.ContentType import pl.allegro.tech.hermes.api.MessageFilterSpecification import pl.allegro.tech.hermes.api.Subscription import pl.allegro.tech.hermes.api.Topic -import pl.allegro.tech.hermes.management.domain.subscription.validator.MessageFilterTypeValidator; import pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder import spock.lang.Specification diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy index 3e43b96fda..42a18fbc38 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorTest.groovy @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.management.domain.topic.validator +import jakarta.validation.ConstraintViolationException import pl.allegro.tech.hermes.api.ContentType import pl.allegro.tech.hermes.api.Topic import pl.allegro.tech.hermes.api.TopicLabel @@ -16,8 +17,6 @@ import spock.lang.Specification import spock.lang.Subject import spock.lang.Unroll -import javax.validation.ConstraintViolationException - import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic class TopicValidatorTest extends Specification { diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy index 7e8a8791a0..bca9772132 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidatorWithRealApiPreconditionsTest.groovy @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.management.domain.topic.validator +import jakarta.validation.ConstraintViolationException import pl.allegro.tech.hermes.api.RetentionTime import pl.allegro.tech.hermes.management.api.validator.ApiPreconditions import pl.allegro.tech.hermes.management.domain.auth.TestRequestUser @@ -9,8 +10,6 @@ import spock.lang.Specification import spock.lang.Subject import spock.lang.Unroll -import javax.validation.ConstraintViolationException - import static java.util.concurrent.TimeUnit.DAYS import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy index bae970f0a2..5856e16077 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/graphite/RestTemplateGraphiteClientTest.groovy @@ -2,13 +2,12 @@ package pl.allegro.tech.hermes.management.infrastructure.graphite import com.github.tomakehurst.wiremock.client.WireMock import com.github.tomakehurst.wiremock.junit.WireMockRule +import jakarta.ws.rs.core.MediaType import org.junit.Rule import org.springframework.web.client.RestTemplate import pl.allegro.tech.hermes.test.helper.util.Ports import spock.lang.Specification -import javax.ws.rs.core.MediaType - import static pl.allegro.tech.hermes.api.MetricDecimalValue.of class RestTemplateGraphiteClientTest extends Specification { diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepositoryTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepositoryTest.groovy index 2480a91fc4..dd53e322ee 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepositoryTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/metrics/HybridSubscriptionMetricsRepositoryTest.groovy @@ -1,8 +1,8 @@ package pl.allegro.tech.hermes.management.infrastructure.metrics import pl.allegro.tech.hermes.api.MetricLongValue -import pl.allegro.tech.hermes.api.SubscriptionMetrics import pl.allegro.tech.hermes.api.PersistentSubscriptionMetrics +import pl.allegro.tech.hermes.api.SubscriptionMetrics import pl.allegro.tech.hermes.api.TopicName import pl.allegro.tech.hermes.infrastructure.zookeeper.ZookeeperPaths import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionLagSource diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParserTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParserTest.groovy index 8b17ce83fa..7d2673111f 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParserTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/query/parser/json/JsonQueryParserTest.groovy @@ -2,8 +2,8 @@ package pl.allegro.tech.hermes.management.infrastructure.query.parser.json import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule -import pl.allegro.tech.hermes.api.Topic import pl.allegro.tech.hermes.api.Query +import pl.allegro.tech.hermes.api.Topic import pl.allegro.tech.hermes.management.infrastructure.query.parser.ParseException import pl.allegro.tech.hermes.management.infrastructure.query.parser.QueryParser import spock.lang.Specification diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManagerTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManagerTest.groovy index 31f9786eb3..5aeea5df53 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManagerTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/infrastructure/zookeeper/ZookeeperClientManagerTest.groovy @@ -1,8 +1,8 @@ package pl.allegro.tech.hermes.management.infrastructure.zookeeper +import pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider import pl.allegro.tech.hermes.management.config.storage.StorageClustersProperties import pl.allegro.tech.hermes.management.config.storage.StorageProperties -import pl.allegro.tech.hermes.infrastructure.dc.DefaultDatacenterNameProvider import pl.allegro.tech.hermes.management.utils.MultiZookeeperIntegrationTest class ZookeeperClientManagerTest extends MultiZookeeperIntegrationTest { diff --git a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/utils/MultiZookeeperIntegrationTest.groovy b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/utils/MultiZookeeperIntegrationTest.groovy index fcff24afe0..f30d5e1ab7 100644 --- a/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/utils/MultiZookeeperIntegrationTest.groovy +++ b/hermes-management/src/test/groovy/pl/allegro/tech/hermes/management/utils/MultiZookeeperIntegrationTest.groovy @@ -1,9 +1,9 @@ package pl.allegro.tech.hermes.management.utils import org.apache.curator.test.TestingServer +import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider import pl.allegro.tech.hermes.management.config.storage.StorageClustersProperties import pl.allegro.tech.hermes.management.config.storage.StorageProperties -import pl.allegro.tech.hermes.infrastructure.dc.DatacenterNameProvider import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClient import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperClientManager import pl.allegro.tech.hermes.test.helper.util.Ports diff --git a/hermes-mock/build.gradle b/hermes-mock/build.gradle index 65b9137c29..a99cc32bfc 100644 --- a/hermes-mock/build.gradle +++ b/hermes-mock/build.gradle @@ -18,9 +18,6 @@ dependencies { testImplementation group: 'org.apache.groovy', name: 'groovy-json', version: versions.groovy testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey testImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: versions.jersey - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: versions.jetty - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: versions.jetty - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlets', version: versions.jetty testImplementation group: 'org.junit.jupiter', name :'junit-jupiter', version: versions.junit_jupiter testRuntimeOnly group: 'org.junit.vintage', name : 'junit-vintage-engine', version: versions.junit_jupiter } diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java index ae1b6a29ca..6d522b1f79 100644 --- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java +++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/HermesMockDefine.java @@ -4,7 +4,7 @@ import com.github.tomakehurst.wiremock.matching.ValueMatcher; import com.github.tomakehurst.wiremock.stubbing.StubMapping; import org.apache.avro.Schema; -import org.apache.http.HttpStatus; +import org.apache.hc.core5.http.HttpStatus; import pl.allegro.tech.hermes.mock.exchange.Response; import pl.allegro.tech.hermes.mock.matching.ContentMatchers; diff --git a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java index 14a787f4e6..9703618549 100644 --- a/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java +++ b/hermes-mock/src/main/java/pl/allegro/tech/hermes/mock/exchange/Response.java @@ -1,6 +1,8 @@ package pl.allegro.tech.hermes.mock.exchange; -import org.apache.http.HttpStatus; + + +import org.apache.hc.core5.http.HttpStatus; import java.time.Duration; diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy index ea0613a2d8..81f27e59d8 100644 --- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy +++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockAvroTest.groovy @@ -3,7 +3,7 @@ package pl.allegro.tech.hermes.mock import com.fasterxml.jackson.databind.ObjectMapper import org.apache.avro.Schema import org.apache.avro.reflect.ReflectData -import org.apache.http.HttpStatus +import wiremock.org.apache.hc.core5.http.HttpStatus; import org.junit.ClassRule import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy index e085ce9d7b..70dd5c5ac8 100644 --- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy +++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockJsonTest.groovy @@ -1,6 +1,6 @@ package pl.allegro.tech.hermes.mock -import org.apache.http.HttpStatus +import wiremock.org.apache.hc.core5.http.HttpStatus; import org.junit.ClassRule import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher import pl.allegro.tech.hermes.test.helper.util.Ports diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy index b9e4e0f5fa..35f4400ba3 100644 --- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy +++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/HermesMockTest.groovy @@ -2,7 +2,7 @@ package pl.allegro.tech.hermes.mock import org.apache.avro.Schema import org.apache.avro.reflect.ReflectData -import org.apache.http.HttpStatus +import wiremock.org.apache.hc.core5.http.HttpStatus; import org.junit.ClassRule import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher import pl.allegro.tech.hermes.test.helper.util.Ports diff --git a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/ResponseTest.groovy b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/ResponseTest.groovy index 009ab8608c..99a5a4def4 100644 --- a/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/ResponseTest.groovy +++ b/hermes-mock/src/test/groovy/pl/allegro/tech/hermes/mock/ResponseTest.groovy @@ -1,8 +1,8 @@ package pl.allegro.tech.hermes.mock -import org.apache.http.HttpStatus import pl.allegro.tech.hermes.mock.exchange.Response import spock.lang.Specification +import wiremock.org.apache.hc.core5.http.HttpStatus; import static pl.allegro.tech.hermes.mock.exchange.Response.Builder.aResponse diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java index 1612de63af..c95e331b6c 100644 --- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java +++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/BadSchemaRequestException.java @@ -1,9 +1,8 @@ package pl.allegro.tech.hermes.schema; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.ErrorCode; -import javax.ws.rs.core.Response; - public class BadSchemaRequestException extends SchemaException { public BadSchemaRequestException(String subject, Response response) { diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java index 1bfae3eaeb..c7f2e399d7 100644 --- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java +++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/InternalSchemaRepositoryException.java @@ -1,9 +1,8 @@ package pl.allegro.tech.hermes.schema; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.api.ErrorCode; -import javax.ws.rs.core.Response; - public class InternalSchemaRepositoryException extends SchemaException { public InternalSchemaRepositoryException(String subject, Response response) { diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java index 55053be3ec..ced558137c 100644 --- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java +++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClient.java @@ -1,6 +1,9 @@ package pl.allegro.tech.hermes.schema.confluent; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.allegro.tech.hermes.api.RawSchema; @@ -21,12 +24,9 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; /** * This implementation of RawSchemaClient is compatible with Confluent Schema Registry API diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java index 2232340a33..bfc4133e1e 100644 --- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java +++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryResponse.java @@ -2,10 +2,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; import pl.allegro.tech.hermes.api.RawSchemaWithMetadata; import java.util.Objects; -import javax.validation.constraints.NotNull; class SchemaRegistryResponse { diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java index 19f20d61b1..a3f9c31f9a 100644 --- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java +++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/DefaultSchemaRepositoryInstanceResolver.java @@ -1,8 +1,9 @@ package pl.allegro.tech.hermes.schema.resolver; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; + import java.net.URI; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; public class DefaultSchemaRepositoryInstanceResolver implements SchemaRepositoryInstanceResolver { diff --git a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java index c7cd0cb88f..10c00b13c9 100644 --- a/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java +++ b/hermes-schema/src/main/java/pl/allegro/tech/hermes/schema/resolver/SchemaRepositoryInstanceResolver.java @@ -1,6 +1,6 @@ package pl.allegro.tech.hermes.schema.resolver; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; public interface SchemaRepositoryInstanceResolver { diff --git a/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepositoryTest.groovy b/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepositoryTest.groovy index 22a11ee802..f02b605e7e 100644 --- a/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepositoryTest.groovy +++ b/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/CachedSchemaVersionsRepositoryTest.groovy @@ -1,11 +1,11 @@ package pl.allegro.tech.hermes.schema import com.google.common.util.concurrent.MoreExecutors +import jakarta.ws.rs.core.Response import pl.allegro.tech.hermes.api.TopicName import pl.allegro.tech.hermes.test.helper.cache.FakeTicker import spock.lang.Specification -import javax.ws.rs.core.Response import java.time.Duration import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.topic diff --git a/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurerTest.groovy b/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurerTest.groovy index a331c684cf..27c27ebd04 100644 --- a/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurerTest.groovy +++ b/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/SchemaExistenceEnsurerTest.groovy @@ -1,9 +1,8 @@ package pl.allegro.tech.hermes.schema -import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder; +import pl.allegro.tech.hermes.test.helper.builder.TopicBuilder import spock.lang.Specification - class SchemaExistenceEnsurerTest extends Specification { SchemaRepository schemaRepository SchemaExistenceEnsurer schemaEnsurer diff --git a/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClientTest.groovy b/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClientTest.groovy index 1e8d17699b..9f45f674d5 100644 --- a/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClientTest.groovy +++ b/hermes-schema/src/test/groovy/pl/allegro/tech/hermes/schema/confluent/SchemaRegistryRawSchemaClientTest.groovy @@ -5,6 +5,7 @@ import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder import com.github.tomakehurst.wiremock.client.WireMock import com.github.tomakehurst.wiremock.matching.UrlPattern +import jakarta.ws.rs.client.ClientBuilder import pl.allegro.tech.hermes.api.RawSchema import pl.allegro.tech.hermes.api.TopicName import pl.allegro.tech.hermes.schema.BadSchemaRequestException @@ -19,8 +20,6 @@ import spock.lang.Shared import spock.lang.Specification import spock.lang.Subject -import javax.ws.rs.client.ClientBuilder - import static com.github.tomakehurst.wiremock.client.WireMock.aResponse import static com.github.tomakehurst.wiremock.client.WireMock.deleteRequestedFor import static com.github.tomakehurst.wiremock.client.WireMock.equalTo diff --git a/hermes-test-helper/build.gradle b/hermes-test-helper/build.gradle index 5344c8199a..0b65649a8e 100644 --- a/hermes-test-helper/build.gradle +++ b/hermes-test-helper/build.gradle @@ -34,6 +34,9 @@ dependencies { implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.5.0' implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jackson + //TODO: remove after migrating from apache oltu + implementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1.1' + implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.authzserver', version: '1.0.2' implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.resourceserver', version: '1.0.2' implementation group: 'io.undertow', name: 'undertow-servlet', version: versions.undertow diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java index e2c289a725..8f600104c2 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/AsyncMessagePublisher.java @@ -1,13 +1,13 @@ package pl.allegro.tech.hermes.test.helper.client; -import javax.ws.rs.client.AsyncInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.InvocationCallback; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.AsyncInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import static com.google.common.base.Preconditions.checkArgument; -import static javax.ws.rs.client.Entity.text; +import static jakarta.ws.rs.client.Entity.text; public class AsyncMessagePublisher { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java index ec7ad307f5..08b4919c96 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/Hermes.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonXmlBindJsonProvider; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.proxy.WebResourceFactory; @@ -26,11 +26,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.function.Function; -import javax.ws.rs.Path; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.WebTarget; public class Hermes { @@ -70,9 +70,9 @@ private static ClientConfig getDefaultPublisherConfig() { private static ClientBuilder getClientBuilder(ClientConfig clientConfig) { return ClientBuilder.newBuilder().withConfig(clientConfig).register( - new JacksonJaxbJsonProvider( + new JacksonXmlBindJsonProvider( new ObjectMapper().registerModule(new JavaTimeModule()), - JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS + JacksonXmlBindJsonProvider.DEFAULT_ANNOTATIONS ) ); } diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java index 89b6319ff7..de7666924f 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/OAuth2AuthenticationFeature.java @@ -2,8 +2,8 @@ import java.io.IOException; import java.util.function.Function; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; public class OAuth2AuthenticationFeature implements ClientRequestFilter { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java index 9076d445ce..ec871bdddf 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PasswordAuthenticationFeature.java @@ -1,8 +1,8 @@ package pl.allegro.tech.hermes.test.helper.client; import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; public class PasswordAuthenticationFeature implements ClientRequestFilter { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java index e16c3da8c1..7a71f58838 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/client/PublishingRetryCallback.java @@ -1,12 +1,12 @@ package pl.allegro.tech.hermes.test.helper.client; -import javax.ws.rs.client.AsyncInvoker; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.InvocationCallback; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.AsyncInvoker; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.InvocationCallback; +import jakarta.ws.rs.core.Response; import static com.google.common.base.Preconditions.checkArgument; -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; class PublishingRetryCallback implements InvocationCallback { private final AsyncInvoker invoker; diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java index 3b60c4fb5a..249eb557a0 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ManuallyTriggeredScheduledExecutorService.java @@ -8,7 +8,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; public class ManuallyTriggeredScheduledExecutorService implements ScheduledExecutorService { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java index 0fe35e458f..4e9fcf7cb6 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/concurrent/ScheduledTask.java @@ -8,7 +8,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; class ScheduledTask implements ScheduledFuture { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java index 6624aad7b4..ce34e6bde3 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesAPIOperations.java @@ -15,11 +15,11 @@ import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy; import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy; diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java index 044cfbdc3a..0d477beee5 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/HermesPublisher.java @@ -4,11 +4,11 @@ import pl.allegro.tech.hermes.test.helper.client.Hermes; import java.util.Map; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.Response; public class HermesPublisher { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java index 40428c3135..43297b5bcf 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/JerseyClientFactory.java @@ -3,8 +3,8 @@ import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientProperties; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; public class JerseyClientFactory { diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java index f764708b06..3c465277ee 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/RemoteServiceEndpoint.java @@ -24,7 +24,7 @@ import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED; import static com.jayway.awaitility.Awaitility.await; import static java.util.stream.Collectors.toList; -import static javax.ws.rs.core.Response.Status.MOVED_PERMANENTLY; +import static jakarta.ws.rs.core.Response.Status.MOVED_PERMANENTLY; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust; diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java index 0a3c5d7332..785cfce584 100644 --- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java +++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/endpoint/Waiter.java @@ -4,7 +4,7 @@ import pl.allegro.tech.hermes.api.Subscription; import pl.allegro.tech.hermes.api.Topic; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static com.jayway.awaitility.Awaitility.waitAtMost; import static pl.allegro.tech.hermes.test.helper.endpoint.TimeoutAdjuster.adjust; diff --git a/hermes-tracker-elasticsearch/build.gradle b/hermes-tracker-elasticsearch/build.gradle index 095e1a6c9e..9641184d82 100644 --- a/hermes-tracker-elasticsearch/build.gradle +++ b/hermes-tracker-elasticsearch/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { implementation project(':hermes-common') implementation project(':hermes-tracker') - implementation 'org.slf4j:slf4j-api:1.7.12' + implementation 'org.slf4j:slf4j-api:2.0.4' api group: 'org.elasticsearch.client', name: 'transport', version: '6.8.12' testImplementation project(path: ":hermes-tracker", configuration: "testArtifacts") diff --git a/integration/build.gradle b/integration/build.gradle index 40ffb3770b..073e1d58ad 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -36,10 +36,6 @@ dependencies { integration group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: versions.jersey integration group: 'org.freemarker', name: 'freemarker', version: '2.3.21' integration group: 'org.schemarepo', name: 'schema-repo-common', version: '0.1.3' - integration group: 'org.eclipse.jetty', name: 'jetty-alpn-openjdk8-server', version: '9.4.28.v20200408' - integration group: 'org.eclipse.jetty', name: 'jetty-alpn-openjdk8-client', version: '9.4.30.v20200611' - integration group: 'org.eclipse.jetty', name: 'jetty-servlet', version: versions.jetty - integration group: 'org.eclipse.jetty', name: 'jetty-servlets', version: versions.jetty integration group: 'org.glassfish.jersey.bundles.repackaged', name: 'jersey-guava', version: '2.23.2' integration(group: 'org.hornetq', name: 'hornetq-jms-server', version: '2.4.1.Final') { diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/AsyncPublisherAutoRetryTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/AsyncPublisherAutoRetryTest.java index f8c893d842..277199f45e 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/AsyncPublisherAutoRetryTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/AsyncPublisherAutoRetryTest.java @@ -6,12 +6,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.web.client.AsyncRestTemplate; import org.springframework.web.reactive.function.client.WebClient; import pl.allegro.tech.hermes.client.HermesClient; import pl.allegro.tech.hermes.client.HermesClientBuilder; import pl.allegro.tech.hermes.client.HermesSender; -import pl.allegro.tech.hermes.client.restTemplate.RestTemplateHermesSender; import pl.allegro.tech.hermes.client.webclient.WebClientHermesSender; import pl.allegro.tech.hermes.integration.env.EnvironmentAware; @@ -42,32 +40,6 @@ public void before() { stubFor(post(urlEqualTo(EXISTING_TOPIC_URL)).willReturn(aResponse().withStatus(200))); } - @Test - public void shouldRetryPublishingMessageEnoughTimesWhenServerReturns500UsingAsyncRestTemplate() { - //given - HermesSender sender = new RestTemplateHermesSender(new AsyncRestTemplate()); - int retries = 5; - HermesClient hermesClient = retryingHermesClient(retries, sender); - - //when - hermesClient.publish(NOT_EXISTING_TOPIC, "{}").join(); - - //then - verify(retries + 1, postRequestedFor(urlEqualTo(NOT_EXISTING_TOPIC_URL))); - } - - @Test - public void shouldNotRetryIfMessageWasPublishedUsingAsyncRestTemplate() { - HermesSender sender = new RestTemplateHermesSender(new AsyncRestTemplate()); - HermesClient hermesClient = retryingHermesClient(10, sender); - - //when - hermesClient.publish(EXISTING_TOPIC, "{}").join(); - - //then - verify(1, postRequestedFor(urlEqualTo(EXISTING_TOPIC_URL))); - } - @Test public void shouldRetryPublishingMessageEnoughTimesWhenServerReturns500UsingWebClient() { //given diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/AttachingKeepAliveHeaderTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/AttachingKeepAliveHeaderTest.java index 9b2f9e5964..33624b42d1 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/AttachingKeepAliveHeaderTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/AttachingKeepAliveHeaderTest.java @@ -1,15 +1,14 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties; import pl.allegro.tech.hermes.integration.env.FrontendStarter; import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher; import pl.allegro.tech.hermes.test.helper.message.TestMessage; import pl.allegro.tech.hermes.test.helper.util.Ports; import java.util.function.Consumer; -import javax.ws.rs.core.Response; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_KEEP_ALIVE_HEADER_ENABLED; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchDeliveryTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchDeliveryTest.java index 9b0092dff3..7594e3a4d9 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchDeliveryTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchDeliveryTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.BatchSubscriptionPolicy; @@ -15,7 +16,6 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; import static java.util.Arrays.stream; import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchRetryPolicyTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchRetryPolicyTest.java index 9388853d23..b4a1f21dd1 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchRetryPolicyTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/BatchRetryPolicyTest.java @@ -23,8 +23,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static java.util.Comparator.comparingLong; -import static javax.ws.rs.core.Response.Status.CREATED; import static org.apache.http.HttpStatus.SC_BAD_REQUEST; import static org.apache.http.HttpStatus.SC_CREATED; import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/ConsumingHttp2Test.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/ConsumingHttp2Test.java index c2438832bf..03bb6b8fd8 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/ConsumingHttp2Test.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/ConsumingHttp2Test.java @@ -3,6 +3,7 @@ import io.undertow.Undertow; import io.undertow.server.HttpHandler; import io.undertow.util.HttpString; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Subscription; @@ -18,11 +19,10 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.net.ssl.SSLContext; -import javax.ws.rs.core.Response; import static io.undertow.UndertowOptions.ENABLE_HTTP2; import static io.undertow.util.Protocols.HTTP_2_0; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static org.assertj.core.api.Assertions.fail; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringAvroTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringAvroTest.java index cc65b9fb91..48ae1111b2 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringAvroTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringAvroTest.java @@ -12,7 +12,7 @@ import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint; import static com.google.common.collect.ImmutableMap.of; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static pl.allegro.tech.hermes.api.ContentType.AVRO; import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringHeadersTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringHeadersTest.java index 878d8ac9e1..6c1773b08a 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringHeadersTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringHeadersTest.java @@ -11,8 +11,8 @@ import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint; import static com.google.common.collect.ImmutableMap.of; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringJsonTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringJsonTest.java index b088269741..6aa5f73315 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringJsonTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/FilteringJsonTest.java @@ -12,7 +12,7 @@ import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint; import static com.google.common.collect.ImmutableMap.of; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/GooglePubSubConsumingTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/GooglePubSubConsumingTest.java index 3382a6b9fd..02d60e5761 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/GooglePubSubConsumingTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/GooglePubSubConsumingTest.java @@ -2,6 +2,7 @@ import com.google.pubsub.v1.ProjectSubscriptionName; import com.google.pubsub.v1.TopicName; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -10,9 +11,8 @@ import pl.allegro.tech.hermes.test.helper.message.TestMessage; import java.io.IOException; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HealthCheckTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HealthCheckTest.java index b124ebb425..cf91960095 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HealthCheckTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HealthCheckTest.java @@ -1,13 +1,13 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.client.WebTarget; import org.testng.annotations.Test; import pl.allegro.tech.hermes.test.helper.endpoint.JerseyClientFactory; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.WebTarget; import static com.jayway.awaitility.Awaitility.await; -import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; +import static jakarta.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; public class HealthCheckTest extends AbstractFrontendShutdownTest { diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingHttpsTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingHttpsTest.java index 718b7783e2..45329eac2e 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingHttpsTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingHttpsTest.java @@ -12,7 +12,6 @@ import pl.allegro.tech.hermes.common.ssl.SSLContextHolder; import pl.allegro.tech.hermes.common.ssl.provided.ProvidedKeyManagersProvider; import pl.allegro.tech.hermes.common.ssl.provided.ProvidedTrustManagersProvider; -import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties; import pl.allegro.tech.hermes.integration.env.FrontendStarter; import pl.allegro.tech.hermes.test.helper.message.TestMessage; import pl.allegro.tech.hermes.test.helper.util.Ports; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingTest.java index eb8ff1e03d..2fd0de8826 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesClientPublishingTest.java @@ -1,7 +1,6 @@ package pl.allegro.tech.hermes.integration; import okhttp3.OkHttpClient; -import org.springframework.web.client.AsyncRestTemplate; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Topic; @@ -10,13 +9,12 @@ import pl.allegro.tech.hermes.client.HermesResponse; import pl.allegro.tech.hermes.client.jersey.JerseyHermesSender; import pl.allegro.tech.hermes.client.okhttp.OkHttpHermesSender; -import pl.allegro.tech.hermes.client.restTemplate.RestTemplateHermesSender; import pl.allegro.tech.hermes.test.helper.message.TestMessage; import java.net.URI; +import static jakarta.ws.rs.client.ClientBuilder.newClient; import static java.net.URI.create; -import static javax.ws.rs.client.ClientBuilder.newClient; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.client.HermesClientBuilder.hermesClient; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; @@ -44,15 +42,6 @@ public void shouldPublishUsingJerseyClient() { runTestSuiteForHermesClient(client); } - @Test - public void shouldPublishUsingRestTemplate() { - // given - HermesClient client = hermesClient(new RestTemplateHermesSender(new AsyncRestTemplate())).withURI(topicURI).build(); - - // when & then - runTestSuiteForHermesClient(client); - } - @Test public void shouldPublishUsingOkHttpClient() { // given diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesServerGracefulShutdownTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesServerGracefulShutdownTest.java index 147953fa44..1f9530d2db 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesServerGracefulShutdownTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/HermesServerGracefulShutdownTest.java @@ -1,10 +1,9 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.Test; import pl.allegro.tech.hermes.test.helper.message.TestMessage; -import javax.ws.rs.core.Response; - import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; public class HermesServerGracefulShutdownTest extends AbstractFrontendShutdownTest { diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java index effc0c74e3..0c309f2916 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/IntegrationTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration; import com.google.common.collect.ImmutableMap; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -15,9 +16,7 @@ import pl.allegro.tech.hermes.test.helper.endpoint.HermesEndpoints; import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.integration.env.SharedServices.services; public class IntegrationTest extends HermesIntegrationEnvironment { diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/JmsConsumingTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/JmsConsumingTest.java index 1e3ef5c7a4..dfc1bd0cfb 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/JmsConsumingTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/JmsConsumingTest.java @@ -1,5 +1,11 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Topic; @@ -9,12 +15,6 @@ import java.util.UUID; import javax.jms.Message; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import static pl.allegro.tech.hermes.integration.helper.ClientBuilderHelper.createRequestWithTraceHeaders; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaRetransmissionServiceTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaRetransmissionServiceTest.java index 69f17553a8..b1350aa8a7 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaRetransmissionServiceTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaRetransmissionServiceTest.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Multimaps; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.ContentType; @@ -18,10 +19,9 @@ import java.time.Clock; import java.time.OffsetDateTime; import java.util.List; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.api.PatchData.patchData; import static pl.allegro.tech.hermes.integration.env.SharedServices.services; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaSingleMessageReaderTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaSingleMessageReaderTest.java index 14acb620e3..45d060bc31 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaSingleMessageReaderTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/KafkaSingleMessageReaderTest.java @@ -1,6 +1,8 @@ package pl.allegro.tech.hermes.integration; import com.googlecode.catchexception.CatchException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import net.javacrumbs.jsonunit.core.Option; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -14,8 +16,6 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; import static com.googlecode.catchexception.CatchException.catchException; import static java.util.stream.IntStream.range; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MessageBufferLoadingTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MessageBufferLoadingTest.java index 32a2babc96..bc36f3d96e 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MessageBufferLoadingTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MessageBufferLoadingTest.java @@ -27,11 +27,11 @@ import java.util.Collections; import static com.jayway.awaitility.Awaitility.await; +import static jakarta.ws.rs.core.Response.Status.ACCEPTED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static java.nio.charset.Charset.defaultCharset; import static java.time.Instant.now; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.ACCEPTED; -import static javax.ws.rs.core.Response.Status.CREATED; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_BROKER_LIST; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.MESSAGES_LOCAL_STORAGE_DIRECTORY; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java index 5685c65f48..6ae36a291b 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MetricsTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration; import com.googlecode.catchexception.CatchException; +import jakarta.ws.rs.BadRequestException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.MessageFilterSpecification; @@ -19,12 +20,11 @@ import pl.allegro.tech.hermes.test.helper.message.TestMessage; import java.util.UUID; -import javax.ws.rs.BadRequestException; import static com.google.common.collect.ImmutableMap.of; import static com.googlecode.catchexception.CatchException.catchException; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static java.lang.Integer.MAX_VALUE; -import static javax.ws.rs.core.Response.Status.CREATED; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.api.BatchSubscriptionPolicy.Builder.batchSubscriptionPolicy; import static pl.allegro.tech.hermes.integration.helper.GraphiteEndpoint.subscriptionMetricsStub; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MultipleKafkaTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MultipleKafkaTest.java index 60fa11f739..2ac657786b 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/MultipleKafkaTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/MultipleKafkaTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -16,9 +17,7 @@ import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint; import pl.allegro.tech.hermes.test.helper.util.Ports; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.consumers.ConsumerConfigurationProperties.CONSUMER_HEALTH_CHECK_PORT; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_HTTP2_ENABLED; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/OAuthIntegrationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/OAuthIntegrationTest.java index 2d8674341e..fd06941327 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/OAuthIntegrationTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/OAuthIntegrationTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration; import com.jayway.awaitility.Duration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -13,9 +14,8 @@ import pl.allegro.tech.hermes.test.helper.oauth.server.OAuthTestServer; import java.io.IOException; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.clientCredentialsGrantOAuthPolicy; import static pl.allegro.tech.hermes.api.SubscriptionOAuthPolicy.passwordGrantOAuthPolicy; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroOnTopicWithoutSchemaTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroOnTopicWithoutSchemaTest.java index 3c49b2af63..9d8adc73b2 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroOnTopicWithoutSchemaTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroOnTopicWithoutSchemaTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration; import com.github.tomakehurst.wiremock.WireMockServer; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -13,9 +14,7 @@ import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher; import pl.allegro.tech.hermes.test.helper.util.Ports; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static pl.allegro.tech.hermes.api.ContentType.AVRO; import static pl.allegro.tech.hermes.api.ErrorCode.SCHEMA_COULD_NOT_BE_LOADED; import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroTest.java index 8556c677d0..c32d9b237a 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingAvroTest.java @@ -1,5 +1,10 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import net.javacrumbs.jsonunit.core.Option; import org.apache.avro.Schema; import org.testng.annotations.BeforeClass; @@ -19,17 +24,12 @@ import java.time.Clock; import java.util.UUID; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.OK; import static java.util.Collections.singletonMap; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.OK; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_BINARY; import static pl.allegro.tech.hermes.api.AvroMediaType.AVRO_JSON; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingTest.java index e3cc54d445..240c04bc04 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingTest.java @@ -1,5 +1,11 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; import org.glassfish.jersey.client.ClientConfig; import org.testng.annotations.BeforeMethod; @@ -24,16 +30,10 @@ import java.io.IOException; import java.net.SocketTimeoutException; import java.util.UUID; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.client.ClientBuilder.newClient; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.CREATED; + +import static jakarta.ws.rs.client.ClientBuilder.newClient; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static org.glassfish.jersey.client.ClientProperties.REQUEST_ENTITY_PROCESSING; import static org.glassfish.jersey.client.RequestEntityProcessing.CHUNKED; import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingWithFailoverTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingWithFailoverTest.java index 574bd32a61..0e2c465d7d 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingWithFailoverTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/PublishingWithFailoverTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Topic; @@ -7,8 +8,6 @@ import pl.allegro.tech.hermes.test.helper.endpoint.RemoteServiceEndpoint; import pl.allegro.tech.hermes.test.helper.message.TestMessage; -import javax.ws.rs.core.Response; - import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/ReadinessCheckTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/ReadinessCheckTest.java index 438f5943d2..e12955fb37 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/ReadinessCheckTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/ReadinessCheckTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Topic; @@ -8,11 +9,10 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; import static com.jayway.awaitility.Awaitility.await; +import static jakarta.ws.rs.core.Response.Status.CREATED; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.ws.rs.core.Response.Status.CREATED; import static pl.allegro.tech.hermes.api.Topic.Ack.ALL; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.TopicBuilder.randomTopic; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/TopicBlacklistTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/TopicBlacklistTest.java index a0170706a0..c758b57bbf 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/TopicBlacklistTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/TopicBlacklistTest.java @@ -1,16 +1,16 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Topic; import pl.allegro.tech.hermes.test.helper.message.TestMessage; import java.util.Arrays; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.api.BlacklistStatus.BLACKLISTED; import static pl.allegro.tech.hermes.api.BlacklistStatus.NOT_BLACKLISTED; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/UndeliveredLogTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/UndeliveredLogTest.java index 4be9334e96..d0e295434f 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/UndeliveredLogTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/UndeliveredLogTest.java @@ -1,14 +1,13 @@ package pl.allegro.tech.hermes.integration; +import jakarta.ws.rs.core.Response; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.EndpointAddress; import pl.allegro.tech.hermes.api.Subscription; import pl.allegro.tech.hermes.api.Topic; import pl.allegro.tech.hermes.test.helper.message.TestMessage; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; import static org.assertj.core.api.Assertions.assertThat; import static pl.allegro.tech.hermes.api.SubscriptionPolicy.Builder.subscriptionPolicy; import static pl.allegro.tech.hermes.test.helper.builder.SubscriptionBuilder.subscription; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java index 61129fc504..e05de1949f 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/FrontendAuthenticationConfigurationTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration.auth; import io.undertow.util.StatusCodes; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -18,9 +19,8 @@ import java.io.IOException; import java.util.Map; import java.util.Properties; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_ENABLED; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.KAFKA_BROKER_LIST; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java index 6553b4e428..4e1869c2df 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/auth/TopicAuthorisationTest.java @@ -1,6 +1,7 @@ package pl.allegro.tech.hermes.integration.auth; import io.undertow.util.StatusCodes; +import jakarta.ws.rs.core.Response; import org.assertj.core.description.Description; import org.assertj.core.description.TextDescription; import org.testng.annotations.AfterClass; @@ -18,9 +19,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.Family.SUCCESSFUL; +import static jakarta.ws.rs.core.Response.Status.Family.SUCCESSFUL; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_ENABLED; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_AUTHENTICATION_MODE; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_SSL_ENABLED; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java index 829ec4b7ad..d844af4b25 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/env/FrontendStarter.java @@ -17,7 +17,7 @@ import static com.jayway.awaitility.Awaitility.await; import static com.jayway.awaitility.Duration.TEN_SECONDS; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_FORCE_TOPIC_MAX_MESSAGE_SIZE; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_GRACEFUL_SHUTDOWN_ENABLED; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_MESSAGE_PREVIEW_ENABLED; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java index b75ea10bab..d2b71845cc 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/helper/ClientBuilderHelper.java @@ -1,11 +1,10 @@ package pl.allegro.tech.hermes.integration.helper; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; import pl.allegro.tech.hermes.integration.metadata.TraceContext; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; - public class ClientBuilderHelper { public static Invocation.Builder createRequestWithTraceHeaders(String uri, String topicName, TraceContext traceContext) { diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java index b5b05b3d4f..a94d3e08af 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/CrowdOwnerSourceIntegrationTest.java @@ -2,6 +2,9 @@ import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -11,9 +14,6 @@ import pl.allegro.tech.hermes.management.domain.owner.CrowdOwnerSource; import java.util.List; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; @@ -116,7 +116,7 @@ public void shouldGetAnExceptionOnReadTimeout() { .withStatus(200) .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBody("{ \"expand\": \"group\", \"groups\": []}") - .withFixedDelay(3000))); + .withFixedDelay(3500))); //when diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java index d295d4cefd..55a5802255 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/GroupManagementTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration.management; +import jakarta.ws.rs.core.Response; import org.assertj.core.api.Assertions; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.ErrorCode; @@ -8,7 +9,6 @@ import pl.allegro.tech.hermes.management.TestSecurityProvider; import java.util.stream.Stream; -import javax.ws.rs.core.Response; import static pl.allegro.tech.hermes.api.ErrorCode.GROUP_NAME_IS_INVALID; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/HealthCheckTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/HealthCheckTest.java index db66653016..e7e086bc0a 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/HealthCheckTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/HealthCheckTest.java @@ -1,12 +1,12 @@ package pl.allegro.tech.hermes.integration.management; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.testng.annotations.Test; import pl.allegro.tech.hermes.integration.IntegrationTest; import pl.allegro.tech.hermes.test.helper.endpoint.JerseyClientFactory; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; import static com.jayway.awaitility.Awaitility.await; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ListUnhealthySubscriptionsForOwnerTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ListUnhealthySubscriptionsForOwnerTest.java index 2b251c78d5..6324f7732f 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ListUnhealthySubscriptionsForOwnerTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ListUnhealthySubscriptionsForOwnerTest.java @@ -1,6 +1,10 @@ package pl.allegro.tech.hermes.integration.management; import com.google.common.collect.ImmutableSet; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.GenericType; import org.javers.common.collections.Lists; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -14,12 +18,8 @@ import pl.allegro.tech.hermes.integration.helper.GraphiteEndpoint; import java.util.List; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.GenericType; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import static org.assertj.core.api.Assertions.catchThrowable; import static pl.allegro.tech.hermes.api.MonitoringDetails.Severity; import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OAuthProviderManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OAuthProviderManagementTest.java index 5232c5b1ba..42806bc603 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OAuthProviderManagementTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OAuthProviderManagementTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration.management; +import jakarta.ws.rs.core.Response; import org.assertj.core.api.Assertions; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.ErrorCode; @@ -8,7 +9,6 @@ import pl.allegro.tech.hermes.integration.IntegrationTest; import java.util.List; -import javax.ws.rs.core.Response; import static pl.allegro.tech.hermes.api.PatchData.patchData; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java index b24ccd7255..c9fd00cc0c 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/OfflineRetransmissionManagementTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration.management; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -12,7 +13,6 @@ import java.time.Instant; import java.util.List; -import javax.ws.rs.core.Response; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java index 7946cff625..7d1d241e82 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/ReadOnlyModeTest.java @@ -1,5 +1,6 @@ package pl.allegro.tech.hermes.integration.management; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -8,8 +9,6 @@ import pl.allegro.tech.hermes.management.TestSecurityProvider; import pl.allegro.tech.hermes.management.domain.mode.ModeService; -import javax.ws.rs.core.Response; - import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; import static pl.allegro.tech.hermes.test.helper.builder.GroupBuilder.group; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SchemaManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SchemaManagementTest.java index 523d620fdd..6117c6580a 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SchemaManagementTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SchemaManagementTest.java @@ -1,12 +1,11 @@ package pl.allegro.tech.hermes.integration.management; +import jakarta.ws.rs.core.Response; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.Topic; import pl.allegro.tech.hermes.integration.IntegrationTest; import pl.allegro.tech.hermes.test.helper.avro.AvroUserSchemaLoader; -import javax.ws.rs.core.Response; - import static pl.allegro.tech.hermes.api.ContentType.AVRO; import static pl.allegro.tech.hermes.api.TopicWithSchema.topicWithSchema; import static pl.allegro.tech.hermes.integration.test.HermesAssertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java index 7187c0e3f3..e0ea8667e2 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/SubscriptionManagementTest.java @@ -2,6 +2,11 @@ import com.google.common.collect.ImmutableMap; import com.jayway.awaitility.Duration; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Response; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,20 +38,15 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Response; import static com.jayway.awaitility.Awaitility.await; import static com.jayway.awaitility.Awaitility.waitAtMost; +import static jakarta.ws.rs.client.ClientBuilder.newClient; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; +import static jakarta.ws.rs.core.Response.Status.OK; import static java.net.URI.create; -import static javax.ws.rs.client.ClientBuilder.newClient; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.FORBIDDEN; -import static javax.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.api.PatchData.patchData; import static pl.allegro.tech.hermes.api.SubscriptionHealth.Status.UNHEALTHY; import static pl.allegro.tech.hermes.api.SubscriptionHealthProblem.malfunctioning; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java index 529ae634fb..f94665caa9 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/management/TopicManagementTest.java @@ -2,6 +2,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import org.assertj.core.api.Assertions; import org.testng.annotations.Test; import pl.allegro.tech.hermes.api.BlacklistStatus; @@ -21,12 +23,10 @@ import java.util.Collections; import java.util.List; import java.util.stream.Stream; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.assertj.core.api.Assertions.catchThrowable; import static pl.allegro.tech.hermes.api.ContentType.AVRO; import static pl.allegro.tech.hermes.api.ContentType.JSON; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java index 4e93b67adc..c320442858 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesFrontendInstance.java @@ -1,14 +1,13 @@ package pl.allegro.tech.hermes.integration.setup; +import jakarta.ws.rs.core.Response; import pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties; import pl.allegro.tech.hermes.integration.env.FrontendStarter; import pl.allegro.tech.hermes.test.helper.endpoint.HermesPublisher; import pl.allegro.tech.hermes.test.helper.endpoint.JerseyClientFactory; import pl.allegro.tech.hermes.test.helper.util.Ports; -import javax.ws.rs.core.Response; - -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_HTTP2_ENABLED; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_READINESS_CHECK_ENABLED; import static pl.allegro.tech.hermes.frontend.FrontendConfigurationProperties.FRONTEND_READINESS_CHECK_INTERVAL_SECONDS; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java index ec9e9975a8..e3586a4a5c 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/setup/HermesManagementInstance.java @@ -1,7 +1,6 @@ package pl.allegro.tech.hermes.integration.setup; import com.google.common.collect.ImmutableMap; -import com.jayway.awaitility.core.ConditionTimeoutException; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java index 38f826afd0..79cb612445 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HermesAssertions.java @@ -2,10 +2,10 @@ import com.github.tomakehurst.wiremock.verification.LoggedRequest; import com.google.pubsub.v1.PubsubMessage; +import jakarta.ws.rs.core.Response; import org.assertj.core.api.Assertions; import javax.jms.Message; -import javax.ws.rs.core.Response; public final class HermesAssertions extends Assertions { diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java index 9859f0b868..3143fb18ca 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/integration/test/HttpResponseAssertion.java @@ -1,11 +1,11 @@ package pl.allegro.tech.hermes.integration.test; +import jakarta.ws.rs.core.Response; import org.assertj.core.api.AbstractAssert; import pl.allegro.tech.hermes.api.ErrorCode; import pl.allegro.tech.hermes.api.ErrorDescription; import java.util.Arrays; -import javax.ws.rs.core.Response; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java b/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java index 6c8e3b223b..80553233f4 100644 --- a/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java +++ b/integration/src/integration/java/pl/allegro/tech/hermes/management/TestSecurityProvider.java @@ -1,5 +1,7 @@ package pl.allegro.tech.hermes.management; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.SecurityContext; import org.apache.commons.lang.NotImplementedException; import pl.allegro.tech.hermes.api.OwnerId; import pl.allegro.tech.hermes.management.api.auth.SecurityProvider; @@ -8,8 +10,6 @@ import java.util.Arrays; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.SecurityContext; import static java.util.stream.Collectors.toSet;