Merge branch 'master' into alexeyk/unused-imports

Author: AlexeyKuznetsov-DD

.github/chainguard/self.add-release-to-cloudfoundry.sts.yaml

@@ -180,7 +180,7 @@ default:
     - |
       # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
       sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
-    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx$GRADLE_MEM -Xms$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
     - *normalize_node_index
     # for weird reasons, gradle will always "chmod 700" the .gradle folder
@@ -377,10 +377,10 @@ test_published_artifacts:
     - rm -rf "${mvn_local_repo}/com/datadoghq"
     - export GPG_PRIVATE_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_private_key --with-decryption --query "Parameter.Value" --out text)
     - export GPG_PASSWORD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.signing.gpg_passphrase --with-decryption --query "Parameter.Value" --out text)
-    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms2G -Xmx2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - ./gradlew publishToMavenLocal $GRADLE_ARGS
     - cd test-published-dependencies
-    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms1G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms1G -Xmx1G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - ./gradlew --version
     - ./gradlew check --info $GRADLE_ARGS
   after_script:

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 package datadog.communication.serialization;
 
-import static groovy.util.GroovyTestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -49,8 +49,8 @@ public void testBufferReset() {
 
     gb.put((byte) 42);
     ByteBuffer slice = gb.slice();
-    assertEquals(gb.messageCount(), 0);
-    assertEquals(slice.get(), 42);
+    assertEquals(0, gb.messageCount());
+    assertEquals(42, slice.get());
   }
 
   @Test
@@ -73,13 +73,13 @@ public void testPutVariants() {
     gb.put(new byte[] {-128}, 0, 1);
 
     ByteBuffer slice = gb.slice();
-    assertEquals(slice.getShort(), (short) 1);
-    assertEquals(slice.getChar(), (char) 2);
-    assertEquals(slice.getInt(), 4);
-    assertEquals(slice.getLong(), 8L);
-    assertEquals(slice.getFloat(), 16.0f);
-    assertEquals(slice.getDouble(), 32.0);
-    assertEquals(slice.get(), (byte) 64);
-    assertEquals(slice.get(), (byte) -128);
+    assertEquals((short) 1, slice.getShort());
+    assertEquals((char) 2, slice.getChar());
+    assertEquals(4, slice.getInt());
+    assertEquals(8L, slice.getLong());
+    assertEquals(16.0f, slice.getFloat());
+    assertEquals(32.0, slice.getDouble());
+    assertEquals((byte) 64, slice.get());
+    assertEquals((byte) -128, slice.get());
   }
 }

communication/src/test/java/datadog/communication/serialization/GrowableBufferTest.java

@@ -268,7 +268,7 @@ abstract class ProcessManager extends Specification {
     while (reader.read(buffer) != -1) {
       buffer.flip()
       while (buffer.hasRemaining()) {
-        int c = buffer.get()
+        char c = buffer.get()
         if (c == '\n' || c == '\r') {
           break
         }