Inline some boolean arguments that are always true

3 files changed, 6 insertions, 10 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java
index 3d46ab1d35d..5786eb9e398 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzCredentialsService.java
@@ -47,8 +47,7 @@ class AthenzCredentialsService {
                                                 identityConfig.domain(),
                                                 identityConfig.service(),
                                                 rawDocument,
-                                                CryptoUtils.toPem(csr),
-                                                true);
+                                                CryptoUtils.toPem(csr));
         InstanceIdentity instanceIdentity = athenzService.sendInstanceRegisterRequest(instanceRegisterInformation,
                                                                                       document.ztsEndpoint);
         return toAthenzCredentials(instanceIdentity, keyPair, document);
@@ -62,8 +61,7 @@ class AthenzCredentialsService {
                                                                document.dnsSuffix,
                                                                document.providerUniqueId,
                                                                newKeyPair);
-        InstanceRefreshInformation refreshInfo = new InstanceRefreshInformation(CryptoUtils.toPem(csr),
-                                                                                /*requestServiceToken*/true);
+        InstanceRefreshInformation refreshInfo = new InstanceRefreshInformation(CryptoUtils.toPem(csr));
         InstanceIdentity instanceIdentity =
                 athenzService.sendInstanceRefreshRequest(document.providerService,
                                                          identityConfig.domain(),
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRefreshInformation.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRefreshInformation.java
index 621eafca3bb..dd893cb3143 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRefreshInformation.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRefreshInformation.java
@@ -15,10 +15,9 @@ public class InstanceRefreshInformation {
     @JsonProperty("csr")
     private final String csr;
     @JsonProperty("token")
-    private final boolean requestServiceToken;
+    private final boolean requestServiceToken = true;
 
-    public InstanceRefreshInformation(String csr, boolean requestServiceToken) {
+    public InstanceRefreshInformation(String csr) {
         this.csr = csr;
-        this.requestServiceToken = requestServiceToken;
     }
 }
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRegisterInformation.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRegisterInformation.java
index 61ab810abd5..e2355cb7a2d 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRegisterInformation.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/InstanceRegisterInformation.java
@@ -26,14 +26,13 @@ public class InstanceRegisterInformation {
     @JsonProperty("csr")
     private final String csr;
     @JsonProperty("token")
-    private final boolean token;
+    private final boolean token = true;
 
-    public InstanceRegisterInformation(String provider, String domain, String service, String attestationData, String csr, boolean token) {
+    public InstanceRegisterInformation(String provider, String domain, String service, String attestationData, String csr) {
         this.provider = provider;
         this.domain = domain;
         this.service = service;
         this.attestationData = attestationData;
         this.csr = csr;
-        this.token = token;
     }
 }