From 4efd22e2f1a2a16aa5ea7c9c5c045ecf7ae28530 Mon Sep 17 00:00:00 2001 From: Ender Demirkaya Date: Tue, 13 Jul 2021 16:25:10 -0700 Subject: [PATCH] Revert "Java 11 support (#609)" to fix build This reverts commit 229dd2c8604421ef081afca57907ac0405d38cf9. --- CONTRIBUTING.md | 2 +- build.gradle | 3 +-- docker/buildkite/Dockerfile | 6 +++--- .../cadence/internal/testservice/DecisionTaskToken.java | 2 +- .../com/uber/cadence/converter/JsonDataConverterTest.java | 2 +- src/test/java/com/uber/cadence/workflow/WorkflowTest.java | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4a82f49b1..cd18bd21e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ This doc is intended for contributors to `cadence-java-client` (hopefully that's ## Development Environment -* Java 11 (currently, we use Java 11 to compile Java 8 code). +* Java 8. * Thrift 0.9.3 * Gradle build tool * Docker diff --git a/build.gradle b/build.gradle index 9ec15bbf9..e5a6f9abb 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ java { dependencies { errorproneJavac('com.google.errorprone:javac:9+181-r4173-1') - errorprone('com.google.errorprone:error_prone_core:2.3.4') + errorprone('com.google.errorprone:error_prone_core:2.3.3') compile group: 'com.uber.tchannel', name: 'tchannel-core', version: '0.8.30' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' @@ -61,7 +61,6 @@ dependencies { compile group: 'com.google.guava', name: 'guava', version: '28.1-jre' compile group: 'com.cronutils', name: 'cron-utils', version: '9.0.0' compile group: 'io.micrometer', name: 'micrometer-core', version: '1.1.2' - compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'com.googlecode.junit-toolbox', name: 'junit-toolbox', version: '2.4' diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile index 44ec307ef..12ea9ecf3 100644 --- a/docker/buildkite/Dockerfile +++ b/docker/buildkite/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:alpine +FROM openjdk:8-alpine # Apache Thrift version ENV APACHE_THRIFT_VERSION=0.9.3 @@ -6,7 +6,7 @@ ENV APACHE_THRIFT_VERSION=0.9.3 # Install dependencies using apk RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc # Git is needed in order to update the dls submodule -RUN apk add git libstdc++ +RUN apk add --virtual git # Compile source RUN set -ex ;\ @@ -22,4 +22,4 @@ RUN set -ex ;\ RUN apk del build-dependencies wget && rm -rf /var/cache/apk/* RUN mkdir /cadence-java-client -WORKDIR /cadence-java-client +WORKDIR /cadence-java-client \ No newline at end of file diff --git a/src/main/java/com/uber/cadence/internal/testservice/DecisionTaskToken.java b/src/main/java/com/uber/cadence/internal/testservice/DecisionTaskToken.java index 9daadc03b..8a2c15394 100644 --- a/src/main/java/com/uber/cadence/internal/testservice/DecisionTaskToken.java +++ b/src/main/java/com/uber/cadence/internal/testservice/DecisionTaskToken.java @@ -33,7 +33,7 @@ final class DecisionTaskToken { DecisionTaskToken(ExecutionId executionId, int historySize) { this.executionId = Objects.requireNonNull(executionId); - this.historySize = historySize; + this.historySize = Objects.requireNonNull(historySize); } ExecutionId getExecutionId() { diff --git a/src/test/java/com/uber/cadence/converter/JsonDataConverterTest.java b/src/test/java/com/uber/cadence/converter/JsonDataConverterTest.java index 1d89090c6..1dfffd4e1 100644 --- a/src/test/java/com/uber/cadence/converter/JsonDataConverterTest.java +++ b/src/test/java/com/uber/cadence/converter/JsonDataConverterTest.java @@ -260,7 +260,7 @@ public void testException() { assertNotNull(causeFromConverted); assertEquals(DataConverterException.class, causeFromConverted.getClass()); assertNotNull(causeFromConverted.getCause()); - assertEquals(IllegalArgumentException.class, causeFromConverted.getCause().getClass()); + assertEquals(StackOverflowError.class, causeFromConverted.getCause().getClass()); assertNotNull(causeFromConverted.getSuppressed()); assertEquals(1, causeFromConverted.getSuppressed().length); diff --git a/src/test/java/com/uber/cadence/workflow/WorkflowTest.java b/src/test/java/com/uber/cadence/workflow/WorkflowTest.java index 7925d84e5..69c16af25 100644 --- a/src/test/java/com/uber/cadence/workflow/WorkflowTest.java +++ b/src/test/java/com/uber/cadence/workflow/WorkflowTest.java @@ -972,7 +972,7 @@ public void testUntypedAsyncStartWithTimeout() throws Exception { WorkflowStub workflowStub = workflowClient.newUntypedWorkflowStub( "TestWorkflow1::execute", newWorkflowOptionsBuilder(taskList).build()); - Long timeout = Long.valueOf(200); + Long timeout = new Long(200); CompletableFuture future = workflowStub.startAsyncWithTimeout(timeout, TimeUnit.MILLISECONDS, taskList); testUntypedAndStackTraceHelper(workflowStub, future.get()); @@ -3386,7 +3386,7 @@ public void testSignalWorkflowAsyncWithTimeout() throws Exception { CompletableFuture future = workflowStub.startAsync(taskList); future.get(); - Long timeout = Long.valueOf(200); + Long timeout = new Long(200); String testSignalInput = "hello"; CompletableFuture resultFuture = workflowStub