Skip to content

Commit

Permalink
Update dependencies (#5407)
Browse files Browse the repository at this point in the history 
- Apache Curator 5.5.0 -> 5.6.0
- Brotli4j 1.12.0 -> 1.15.0
- Envoy contorl plain 1.0.42
- Dropwizard 2.1.8 -> 2.1.10
- Dropwizard Metrics 4.2.21 -> 4.2.24
- GraphQL Java 20.4 -> 21.3
- gRPC Java 1.58.0 -> 1.61.0
- gRPC Kotlin 1.4.0 -> 1.4.1
- Guava 32.1.3 -> 33.0.0
- Jackson 2.15.3 -> 2.16.1
- Jetty 9.4.51 -> 9.4.52, 10.0.17 -> 10.0.19, 11.0.17 -> 11.0.19, 12.0.5
- JUnit 5.10.0 -> 5.10.1
- Kafka client 3.6.0 -> 3.6.1
- Kotlin 1.9.0 -> 1.9.22
- krotoDC 1.0.5 - 1.0.6
- Logback 1.2.11 -> 1.2.13, 1.3.11 -> 1.3.14, 1.4.11 -> 1.4.14
- Micrometer 1.11.5 -> 1.12.2
- Micrometer Tracing 1.1.6 -> 1.2.2
- Netty 4.1.100 -> 4.1.106
- Netty io_uring 0.0.23 -> 0.0.24
- Protobuf 3.24.0 -> 3.25.1
- Reactor 3.5.11 -> 3.6.2
- Resilience4j 2.1.0 -> 2.2.0
- ScalaPB 0.11.13 -> 0.11.15
- Spring 6.0.11 -> 6.1.3
- Spring Boot 2.7.14 -> 2.7.18, 3.1.2 -> 3.2.2
- Tomcat 8.5.94 -> 8.5.98, 9.0.82 -> 9.0.85, 10.1.15 -> 10.1.18
- Build
  - Apache HttpClient 5.2.1 -> 5.3
  - AssertJ 3.24.2 -> 3.25.2
  - Checker Framework 2.5.5 -> 2.5.6
  - Dagger 2.48.1 -> 2.50
  - DGS 7.6.0 -> 8.2.2
  - Error Prone 2.22.0 -> 2.24.1
  - Finagle 22.12.0 -> 23.11.0
  - Gradle 8.3 -> 8.5
  - completable-futures 0.3.5 -> 0.3.6
  - gax-grpc 2.35.0 -> 2.40.0
  - GraphQL Kotlin 6.5.6 -> 7.0.2
  - java-websocket 1.5.4 -> 1.5.5
  - JCTools 4.0.1 -> 4.0.2
  - jmh-gradle-plugin 0.7.1 -> 0.7.2
  - jsoup 1.16.1 -> 1.17.2
  - ktlint-gradle-plugin 11.5.1 -> 12.1.0
  - node-gradle-plugin 5.0.0 -> 7.0.1
  - SLF4J 2.0.7 -> 2.0.11
  - Testcontainers 1.18.3 -> 1.19.3
  • Loading branch information
@ikhoon
ikhoon authored Jan 29, 2024
1 parent e64cea1 commit 1862b71
Show file tree
Hide file tree
Showing 63 changed files with 1,169 additions and 1,056 deletions.
40 changes: 20 additions & 20 deletions ...c/jmh/kotlin/com/linecorp/armeria/internal/common/kotlin/AnnotatedServiceFlowBenchmark.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,32 @@ import java.util.stream.IntStream
@Warmup(iterations = 1)
@Suppress("unused")
open class AnnotatedServiceFlowBenchmark {

lateinit var server: Server
lateinit var client: WebClient

@Setup
open fun setup() {
server = Server.builder()
.annotatedService(
"/benchmark",
object {
@Get("/flow")
@ProducesJsonSequences
fun flowBm(): Flow<String> = flow {
(0 until 1000).forEach {
emit("$it")
}
}
server =
Server.builder()
.annotatedService(
"/benchmark",
object {
@Get("/flow")
@ProducesJsonSequences
fun flowBm(): Flow<String> =
flow {
(0 until 1000).forEach {
emit("$it")
}
}

@Get("/publisher")
@ProducesJsonSequences
fun publisherBm(): Publisher<String> =
Flux.fromStream(IntStream.range(0, 1000).mapToObj { it.toString() })
}
)
.build()
.also { it.start().join() }
@Get("/publisher")
@ProducesJsonSequences
fun publisherBm(): Publisher<String> = Flux.fromStream(IntStream.range(0, 1000).mapToObj { it.toString() })
},
)
.build()
.also { it.start().join() }

client = WebClient.of("h2c://127.0.0.1:${server.activeLocalPort()}")
}
Expand Down
9 changes: 6 additions & 3 deletions core/src/test/java/com/linecorp/armeria/client/EndpointTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.testing.EqualsTester;

import com.linecorp.armeria.client.Endpoint.Type;
import com.linecorp.armeria.common.Attributes;
Expand Down Expand Up @@ -454,9 +455,10 @@ void equals() {
final Endpoint a1 = Endpoint.of("a");
final Endpoint a2 = Endpoint.of("a");

assertThat(a1).isNotEqualTo(new Object());
assertThat(a1).isEqualTo(a1);
assertThat(a1).isEqualTo(a2);
new EqualsTester()
.addEqualityGroup(a1, a2)
.addEqualityGroup(new Object())
.testEquals();
}

@Test
Expand All @@ -468,6 +470,7 @@ void portEquals() {
final Endpoint e = Endpoint.of("a", 80).withIpAddr("::1");
final Endpoint f = Endpoint.of("a", 80).withWeight(500); // Weight not part of comparison
final Endpoint g = Endpoint.of("g", 80);

assertThat(a).isNotEqualTo(b);
assertThat(b).isEqualTo(c);
assertThat(b).isNotEqualTo(d);
Expand Down
14 changes: 9 additions & 5 deletions core/src/test/java/com/linecorp/armeria/client/circuitbreaker/EventCountTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

import org.junit.jupiter.api.Test;

import com.google.common.testing.EqualsTester;

class EventCountTest {

@Test
Expand Down Expand Up @@ -56,10 +58,12 @@ void testInvalidArguments() {

@Test
void testEquals() {
final EventCount ec = EventCount.of(1, 1);
assertThat(ec).isEqualTo(ec);
assertThat(EventCount.of(0, 0)).isEqualTo(EventCount.of(0, 0));
assertThat(EventCount.of(1, 0)).isNotEqualTo(EventCount.of(0, 0));
assertThat(EventCount.of(1, 0)).isNotEqualTo(new Object());
new EqualsTester()
.addEqualityGroup(EventCount.of(0, 0), EventCount.of(0, 0))
.addEqualityGroup(EventCount.of(1, 0), EventCount.of(1, 0))
.addEqualityGroup(EventCount.of(0, 1), EventCount.of(0, 1))
.addEqualityGroup(EventCount.of(1, 1), EventCount.of(1, 1))
.addEqualityGroup(new Object())
.testEquals();
}
}
19 changes: 8 additions & 11 deletions core/src/test/java/com/linecorp/armeria/common/HttpHeadersBaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.junit.jupiter.api.Test;

import com.google.common.collect.ImmutableList;
import com.google.common.testing.EqualsTester;

import io.netty.handler.codec.http2.Http2Headers.PseudoHeaderName;
import io.netty.util.AsciiString;
Expand Down Expand Up @@ -410,13 +411,9 @@ void headersWithSameNamesAndValuesShouldBeEquivalent() {
headers2.add("name2", "value2");
headers2.add("name2", "value3");

assertThat(headers2).isEqualTo(headers1);
assertThat(headers1).isEqualTo(headers2);
assertThat(headers1).isEqualTo(headers1);
assertThat(headers2).isEqualTo(headers2);
assertThat(headers2.hashCode()).isEqualTo(headers1.hashCode());
assertThat(headers1.hashCode()).isEqualTo(headers1.hashCode());
assertThat(headers2.hashCode()).isEqualTo(headers2.hashCode());
new EqualsTester()
.addEqualityGroup(headers1, headers2)
.testEquals();
}

@Test
Expand Down Expand Up @@ -452,10 +449,10 @@ void headersWithDifferentNamesAndValuesShouldNotBeEquivalent() {
h1.set("name1", "value1");
final HttpHeadersBase h2 = newEmptyHeaders();
h2.set("name2", "value2");
assertThat(h1).isNotEqualTo(h2);
assertThat(h2).isNotEqualTo(h1);
assertThat(h1).isEqualTo(h1);
assertThat(h2).isEqualTo(h2);
new EqualsTester()
.addEqualityGroup(h1)
.addEqualityGroup(h2)
.testEquals();
}

@Test
Expand Down
20 changes: 9 additions & 11 deletions core/src/test/java/com/linecorp/armeria/common/QueryParamsBaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.testing.EqualsTester;

class QueryParamsBaseTest {

Expand Down Expand Up @@ -406,13 +407,9 @@ void paramsWithSameNamesAndValuesShouldBeEquivalent() {
params2.add("name2", "value2");
params2.add("name2", "value3");

assertThat(params2).isEqualTo(params1);
assertThat(params1).isEqualTo(params2);
assertThat(params1).isEqualTo(params1);
assertThat(params2).isEqualTo(params2);
assertThat(params2.hashCode()).isEqualTo(params1.hashCode());
assertThat(params1.hashCode()).isEqualTo(params1.hashCode());
assertThat(params2.hashCode()).isEqualTo(params2.hashCode());
new EqualsTester()
.addEqualityGroup(params1, params2)
.testEquals();
}

@Test
Expand Down Expand Up @@ -448,10 +445,11 @@ void paramsWithDifferentNamesAndValuesShouldNotBeEquivalent() {
p1.set("name1", "value1");
final QueryParamsBase p2 = newEmptyParams();
p2.set("name2", "value2");
assertThat(p1).isNotEqualTo(p2);
assertThat(p2).isNotEqualTo(p1);
assertThat(p1).isEqualTo(p1);
assertThat(p2).isEqualTo(p2);

new EqualsTester()
.addEqualityGroup(p1)
.addEqualityGroup(p2)
.testEquals();
}

@Test
Expand Down
15 changes: 6 additions & 9 deletions core/src/test/java/com/linecorp/armeria/internal/common/ArmeriaHttp2HeadersTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.junit.jupiter.api.Test;

import com.google.common.collect.ImmutableList;
import com.google.common.testing.EqualsTester;

import com.linecorp.armeria.common.ContentDisposition;
import com.linecorp.armeria.common.HttpHeaderNames;
Expand Down Expand Up @@ -367,13 +368,9 @@ void headersWithSameNamesAndValuesShouldBeEquivalent() {
headers2.add("name2", "value2");
headers2.add("name2", "value3");

assertThat(headers2).isEqualTo(headers1);
assertThat(headers1).isEqualTo(headers2);
assertThat(headers1).isEqualTo(headers1);
assertThat(headers2).isEqualTo(headers2);
assertThat(headers2.hashCode()).isEqualTo(headers1.hashCode());
assertThat(headers1.hashCode()).isEqualTo(headers1.hashCode());
assertThat(headers2.hashCode()).isEqualTo(headers2.hashCode());
new EqualsTester()
.addEqualityGroup(headers1, headers2)
.testEquals();
}

@Test
Expand Down Expand Up @@ -411,8 +408,8 @@ void headersWithDifferentNamesAndValuesShouldNotBeEquivalent() {
h2.set("name2", "value2");
assertThat(h1).isNotEqualTo(h2);
assertThat(h2).isNotEqualTo(h1);
assertThat(h1).isEqualTo(h1);
assertThat(h2).isEqualTo(h2);
assertThat(h1.equals(h1)).isTrue();
assertThat(h2.equals(h2)).isTrue();
}

@Test
Expand Down
13 changes: 8 additions & 5 deletions core/src/test/java/com/linecorp/armeria/internal/common/ByteArrayBytesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;

import com.google.common.testing.EqualsTester;

import com.linecorp.armeria.common.ByteBufAccessMode;

import io.netty.buffer.ByteBuf;
Expand Down Expand Up @@ -100,12 +102,13 @@ void equals() {
final ByteBufBytes bufData =
new ByteBufBytes(Unpooled.directBuffer().writeInt(0x01020304), true);

assertThat(a).isEqualTo(a);
assertThat(a).isEqualTo(b);
new EqualsTester()
.addEqualityGroup(a, b)
.addEqualityGroup(c)
.addEqualityGroup(d)
.addEqualityGroup(new Object())
.testEquals();
assertThat(a.array()).isEqualTo(bufData.array());
assertThat(a).isNotEqualTo(c);
assertThat(a).isNotEqualTo(d);
assertThat(a).isNotEqualTo(new Object());

bufData.close();
}
Expand Down
13 changes: 8 additions & 5 deletions core/src/test/java/com/linecorp/armeria/internal/common/ByteBufBytesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

import org.junit.jupiter.api.Test;

import com.google.common.testing.EqualsTester;

import com.linecorp.armeria.common.ByteBufAccessMode;

import io.netty.buffer.ByteBuf;
Expand Down Expand Up @@ -185,12 +187,13 @@ void equals() {
final ByteBufBytes d = new ByteBufBytes(Unpooled.directBuffer().writeInt(0x04050607), true);
final ByteArrayBytes arrayData = new ByteArrayBytes(new byte[] { 1, 2, 3, 4 });

assertThat(a).isEqualTo(a);
assertThat(a).isEqualTo(b);
new EqualsTester()
.addEqualityGroup(a, b)
.addEqualityGroup(c)
.addEqualityGroup(d)
.addEqualityGroup(new Object())
.testEquals();
assertThat(a.array()).isEqualTo(arrayData.array());
assertThat(a).isNotEqualTo(c);
assertThat(a).isNotEqualTo(d);
assertThat(a).isNotEqualTo(new Object());

a.close();
b.close();
Expand Down
Loading

0 comments on commit 1862b71

Please sign in to comment.