From 1eb8a6b0eb0ece34f46df2fe9202c633e5a72af7 Mon Sep 17 00:00:00 2001
From: Guinevere Saenger <guinevere@pulumi.com>
Date: Mon, 11 Dec 2023 20:22:07 -0800
Subject: [PATCH] Update Java (#260)

* Migrate to automated Java update format. Adds new version file for java gen and edits Makefile.

* Make Java
---
 .ci-mgmt.yaml                                  |  1 -
 .pulumi-java-gen.version                       |  1 +
 .upgrade-config.yml                            |  1 -
 Makefile                                       |  5 ++---
 sdk/java/build.gradle                          |  3 ++-
 .../dnsimple/outputs/GetCertificateResult.java | 18 +++++++++---------
 .../pulumi/dnsimple/outputs/GetZoneResult.java | 12 ++++++------
 7 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 .pulumi-java-gen.version

diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
index 89662c00..e55aaf19 100644
--- a/.ci-mgmt.yaml
+++ b/.ci-mgmt.yaml
@@ -5,4 +5,3 @@ env:
   DNSIMPLE_ACCOUNT: ${{ secrets.DNSIMPLE_ACCOUNT }}
 makeTemplate: bridged
 team: ecosystem
-javaGenVersion: "v0.9.7"
diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version
new file mode 100644
index 00000000..b5d0ec55
--- /dev/null
+++ b/.pulumi-java-gen.version
@@ -0,0 +1 @@
+0.9.8
\ No newline at end of file
diff --git a/.upgrade-config.yml b/.upgrade-config.yml
index c190f315..3c50f4b0 100644
--- a/.upgrade-config.yml
+++ b/.upgrade-config.yml
@@ -5,4 +5,3 @@ upstream-provider-name: terraform-provider-dnsimple
 pulumi-infer-version: true
 remove-plugins: true
 pr-reviewers: iwahbe # Team: pulumi/Providers
-javaVersion: "v0.9.7"
diff --git a/Makefile b/Makefile
index 03b7a18c..01032857 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ TFGEN := pulumi-tfgen-$(PACK)
 PROVIDER := pulumi-resource-$(PACK)
 VERSION := $(shell pulumictl get version)
 JAVA_GEN := pulumi-java-gen
-JAVA_GEN_VERSION := v0.9.7
 TESTPARALLELISM := 10
 WORKING_DIR := $(shell pwd)
 PULUMI_CONVERT := 0
@@ -132,8 +131,8 @@ upstream.finalize:
 upstream.rebase:
 	scripts/upstream.sh "$@" start_rebase
 
-bin/pulumi-java-gen:
-	pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java
+bin/pulumi-java-gen: .pulumi-java-gen.version
+	pulumictl download-binary -n pulumi-language-java -v v$(shell cat .pulumi-java-gen.version) -r pulumi/pulumi-java
 
 # To make an immediately observable change to .ci-mgmt.yaml:
 #
diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle
index 3c8a9b30..17d9d842 100644
--- a/sdk/java/build.gradle
+++ b/sdk/java/build.gradle
@@ -30,6 +30,7 @@ java {
 compileJava {
     options.fork = true
     options.forkOptions.jvmArgs.addAll(["-Xmx16g"])
+    options.encoding = "UTF-8"
 }
 
 repositories {
@@ -43,7 +44,7 @@ repositories {
 dependencies {
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.code.gson:gson:2.8.9")
-    implementation("com.pulumi:pulumi:0.9.7")
+    implementation("com.pulumi:pulumi:0.9.8")
 }
 
 task sourcesJar(type: Jar) {
diff --git a/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetCertificateResult.java b/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetCertificateResult.java
index 996ca799..dbc80357 100644
--- a/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetCertificateResult.java
+++ b/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetCertificateResult.java
@@ -148,15 +148,15 @@ public Builder serverCertificate(String serverCertificate) {
             return this;
         }
         public GetCertificateResult build() {
-            final var o = new GetCertificateResult();
-            o.certificateChains = certificateChains;
-            o.certificateId = certificateId;
-            o.domain = domain;
-            o.id = id;
-            o.privateKey = privateKey;
-            o.rootCertificate = rootCertificate;
-            o.serverCertificate = serverCertificate;
-            return o;
+            final var _resultValue = new GetCertificateResult();
+            _resultValue.certificateChains = certificateChains;
+            _resultValue.certificateId = certificateId;
+            _resultValue.domain = domain;
+            _resultValue.id = id;
+            _resultValue.privateKey = privateKey;
+            _resultValue.rootCertificate = rootCertificate;
+            _resultValue.serverCertificate = serverCertificate;
+            return _resultValue;
         }
     }
 }
diff --git a/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetZoneResult.java b/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetZoneResult.java
index 0fb6262d..c5aa38ed 100644
--- a/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetZoneResult.java
+++ b/sdk/java/src/main/java/com/pulumi/dnsimple/outputs/GetZoneResult.java
@@ -73,12 +73,12 @@ public Builder reverse(Boolean reverse) {
             return this;
         }
         public GetZoneResult build() {
-            final var o = new GetZoneResult();
-            o.accountId = accountId;
-            o.id = id;
-            o.name = name;
-            o.reverse = reverse;
-            return o;
+            final var _resultValue = new GetZoneResult();
+            _resultValue.accountId = accountId;
+            _resultValue.id = id;
+            _resultValue.name = name;
+            _resultValue.reverse = reverse;
+            return _resultValue;
         }
     }
 }