Access default value through a static variable for cleaner access, an…

…d removing the need to initialise unnecessary class instances
jenkinsci · Feb 24, 2019 · 44bf265 · 44bf265
1 parent 21bdeb9
commit 44bf265
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java b/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java
@@ -111,14 +111,12 @@ public String getIamMfaSerialNumber() {
 
     @NonNull
     public Integer getStsTokenDuration() {
-        DescriptorImpl descriptor = new DescriptorImpl();
-        return stsTokenDuration == null ? descriptor.defaultStsTokenDuration() : stsTokenDuration;
+        return stsTokenDuration == null ? DescriptorImpl.defaultStsTokenDuration : stsTokenDuration;
     }
 
     @DataBoundSetter
     public void setStsTokenDuration(@NonNull Integer stsTokenDuration) {
-        DescriptorImpl descriptor = new DescriptorImpl();
-        this.stsTokenDuration = stsTokenDuration.equals(descriptor.defaultStsTokenDuration()) ? null : stsTokenDuration;
+        this.stsTokenDuration = stsTokenDuration.equals(DescriptorImpl.defaultStsTokenDuration) ? null : stsTokenDuration;
     }
 
     public boolean requiresToken() {
@@ -192,9 +190,7 @@ public String getDisplayName() {
             return Messages.AWSCredentialsImpl_DisplayName();
         }
 
-        public Integer defaultStsTokenDuration() {
-            return STS_CREDENTIALS_DURATION_SECONDS;
-        }
+        public static final Integer defaultStsTokenDuration = STS_CREDENTIALS_DURATION_SECONDS;
 
         public FormValidation doCheckSecretKey(@QueryParameter("accessKey") final String accessKey,
                                                @QueryParameter("iamRoleArn") final String iamRoleArn,

diff --git a/...sources/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl/credentials.jelly b/...sources/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl/credentials.jelly
@@ -44,7 +44,7 @@
         <f:textbox/>
       </f:entry>
       <f:entry title="${%STS Token Duration (sec)}" field="stsTokenDuration">
-        <f:textbox default="${descriptor.defaultStsTokenDuration()}"/>
+        <f:textbox default="${descriptor.defaultStsTokenDuration}"/>
       </f:entry>
     </f:advanced>
   </f:section>