From 83cc7cf31f5dd8f3d63a612541d682cdd476d0a2 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 15:13:07 +0200 Subject: [PATCH 1/7] may be this is better --- .../nl/vpro/util/LeaveDefaultsProxyHandler.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/vpro-shared-util/src/main/java/nl/vpro/util/LeaveDefaultsProxyHandler.java b/vpro-shared-util/src/main/java/nl/vpro/util/LeaveDefaultsProxyHandler.java index 2f01b54b2..1dc47a8af 100644 --- a/vpro-shared-util/src/main/java/nl/vpro/util/LeaveDefaultsProxyHandler.java +++ b/vpro-shared-util/src/main/java/nl/vpro/util/LeaveDefaultsProxyHandler.java @@ -1,7 +1,6 @@ package nl.vpro.util; import java.lang.invoke.MethodHandles; -import java.lang.reflect.Constructor; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -14,17 +13,6 @@ public class LeaveDefaultsProxyHandler implements InvocationHandler { private final Object delegate; - final static Constructor CONSTRUCTOR; - static { - try { - CONSTRUCTOR = MethodHandles.Lookup.class.getDeclaredConstructor(Class.class, int.class); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } - if (!CONSTRUCTOR.isAccessible()) { - CONSTRUCTOR.setAccessible(true); - } - } public LeaveDefaultsProxyHandler(Object delegate) { this.delegate = delegate; @@ -34,10 +22,11 @@ public LeaveDefaultsProxyHandler(Object delegate) { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (method.isDefault()) { final Class declaringClass = method.getDeclaringClass(); - return CONSTRUCTOR.newInstance(declaringClass, MethodHandles.Lookup.PRIVATE) + return MethodHandles.lookup().in(declaringClass) .unreflectSpecial(method, declaringClass) .bindTo(proxy) .invokeWithArguments(args); + } else { return method.invoke(delegate, args); } From 18be5232e774e025aeea5172ab1649566f6d7a84 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 15:52:21 +0200 Subject: [PATCH 2/7] Update pull.yml --- .github/workflows/pull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 63a896141..8c01a8c55 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -20,6 +20,6 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 8 + java-version: 11 - name: Build with Maven run: mvn -fae -DskipITs=false -Dinteg.cluster.name=docker-elasticsearch -B package From 82f0c41ddf299c589791b27ca4ebd94db95b2775 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 23:05:29 +0200 Subject: [PATCH 3/7] Publish test results. --- .github/workflows/pull.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 8c01a8c55..c4ddf0a69 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -23,3 +23,8 @@ jobs: java-version: 11 - name: Build with Maven run: mvn -fae -DskipITs=false -Dinteg.cluster.name=docker-elasticsearch -B package + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action@v2.1.0 + if: always() + with: + junit_files: "**/target/surefire-reports/*.xml" From 90606d4d9d3d803b10cb597b01c4ea20af5bf3a0 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 23:06:11 +0200 Subject: [PATCH 4/7] upped action. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c3e27130..c4631f99c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: uses: codecov/codecov-action@v3 continue-on-error: true - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v2.0.0 + uses: EnricoMi/publish-unit-test-result-action@v2.1.0 if: always() with: check_name: Tests results java ${{ matrix.java }}, os ${{ matrix.os }} From 85d9213aec95d8d24d683c36d92295930d80f5a1 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 23:08:46 +0200 Subject: [PATCH 5/7] Added cancel action for pull requests too --- .github/workflows/build.yml | 2 +- .github/workflows/pull.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4631f99c..5a886d0f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn steps: - name: Cancel previous Action - uses: styfle/cancel-workflow-action@0.10.0 + uses: styfle/cancel-workflow-action@0.11.0 if: github.ref == 'refs/heads/main' - uses: getong/elasticsearch-action@v1.2 with: diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index c4ddf0a69..ad7620f37 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -12,6 +12,8 @@ jobs: env: MAVEN_OPTS: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn steps: + - name: Cancel previous Action + uses: styfle/cancel-workflow-action@0.11.0 - uses: getong/elasticsearch-action@v1.2 with: elasticsearch version: '7.6.1' From b2ee884cac65d1667acfa6932fbe86a9fe183a68 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 23:18:24 +0200 Subject: [PATCH 6/7] Upped checkout action. --- .github/workflows/branch.yml | 2 +- .github/workflows/pull.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 16263b07a..c43f60f4d 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache local Maven repository uses: actions/cache@v2 with: diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index ad7620f37..58709353d 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -17,7 +17,7 @@ jobs: - uses: getong/elasticsearch-action@v1.2 with: elasticsearch version: '7.6.1' - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d7e67003..43efab5d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: steps: - name: echo run: echo {{ $github.ref }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: 'temurin' From 89022f7f81b45699fe1b2188921b89aa9a3bacd4 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Thu, 20 Oct 2022 23:30:33 +0200 Subject: [PATCH 7/7] May be we can find out why this test is sometimes failing. --- .../src/main/java/nl/vpro/util/FileCachingInputStream.java | 1 - .../test/java/nl/vpro/util/FileCachingInputStreamTest.java | 6 ++---- vpro-shared-util/src/test/resources/log4j2.xml | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vpro-shared-util/src/main/java/nl/vpro/util/FileCachingInputStream.java b/vpro-shared-util/src/main/java/nl/vpro/util/FileCachingInputStream.java index 25e7f8c6f..e08e186e3 100644 --- a/vpro-shared-util/src/main/java/nl/vpro/util/FileCachingInputStream.java +++ b/vpro-shared-util/src/main/java/nl/vpro/util/FileCachingInputStream.java @@ -562,7 +562,6 @@ private int readFromFile(byte[] b, int offset, int length) throws IOException { future.completeExceptionally(e); close(); Thread.currentThread().interrupt(); - throw new InterruptedIOException(e.getMessage()); } result = tempFileInputStream.read(b, offset, length); diff --git a/vpro-shared-util/src/test/java/nl/vpro/util/FileCachingInputStreamTest.java b/vpro-shared-util/src/test/java/nl/vpro/util/FileCachingInputStreamTest.java index 12c8f941b..957e0fc38 100644 --- a/vpro-shared-util/src/test/java/nl/vpro/util/FileCachingInputStreamTest.java +++ b/vpro-shared-util/src/test/java/nl/vpro/util/FileCachingInputStreamTest.java @@ -242,7 +242,7 @@ public void readFileGetsInterrupted(InputStream input, Long expectedCount) throw boolean isInterrupted = false; try{ try ( - FileCachingInputStream inputStream = FileCachingInputStream.builder() + FileCachingInputStream inputStream = FileCachingInputStream.builder() .outputBuffer(2) .batchSize(3) .batchConsumer((f) -> { @@ -279,12 +279,10 @@ public void readFileGetsInterrupted(InputStream input, Long expectedCount) throw } log.info("EOF !, {}", r); throw new AssertionFailedError("should not reach this, it should have been interrupted!"); - } } catch (ClosedByInterruptException | InterruptedIOException ie) { isInterrupted = true; - log.info("Caught {}", ie.getClass() + " " + ie.getMessage()); - + log.info("Caught {}", ie.getClass() + " " + ie.getMessage(), ie); } finally { isInterrupted |= thisThread.isInterrupted(); closed.getAndIncrement(); diff --git a/vpro-shared-util/src/test/resources/log4j2.xml b/vpro-shared-util/src/test/resources/log4j2.xml index a86f768d9..77828faeb 100644 --- a/vpro-shared-util/src/test/resources/log4j2.xml +++ b/vpro-shared-util/src/test/resources/log4j2.xml @@ -6,9 +6,12 @@ + + +