Upgrade to Java 11

src/main/java/hudson/plugins/spotinst/api/SpotinstApi.java

@@ -16,9 +16,9 @@
 import hudson.plugins.spotinst.model.redis.LockGroupControllerRequest;
 import hudson.plugins.spotinst.model.redis.LockGroupControllerResponse;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/hudson/plugins/spotinst/cloud/AwsSpotinstCloud.java

@@ -298,26 +298,34 @@ protected BlResponse<Boolean> checkIsStatefulGroup() {
  ApiResponse<AwsGroup> groupResponse = awsGroupRepo.getGroup(groupId, this.accountId);
 
  if (groupResponse.isRequestSucceed()) {
- Boolean result = false;
- AwsGroup awsGroup = groupResponse.getValue();
+ Boolean result = getIsStatefulFromGroup(groupResponse.getValue());
+
+ retVal = new BlResponse<>(result);
+ }
+ else {
+ LOGGER.error(String.format("Failed to get group %s. Errors: %s", groupId, groupResponse.getErrors()));
+ retVal = new BlResponse<>(false);
+ }
+
+ return retVal;
+ }
+
+ private static Boolean getIsStatefulFromGroup(AwsGroup awsGroup) {
+ boolean retVal = false;
+
+ if(awsGroup != null) {
  AwsGroupStrategy groupStrategy = awsGroup.getStrategy();
 
  if (groupStrategy != null) {
  AwsGroupPersistence groupPersistence = groupStrategy.getPersistence();
 
  if (groupPersistence != null) {
- result = BooleanUtils.isTrue(groupPersistence.getShouldPersistPrivateIp()) ||
+ retVal = BooleanUtils.isTrue(groupPersistence.getShouldPersistPrivateIp()) ||
  BooleanUtils.isTrue(groupPersistence.getShouldPersistBlockDevices()) ||
  BooleanUtils.isTrue(groupPersistence.getShouldPersistRootDevice()) ||
  StringUtils.isNotEmpty(groupPersistence.getBlockDevicesMode());
  }
  }
-
- retVal = new BlResponse<>(result);
- }
- else {
- LOGGER.error(String.format("Failed to get group %s. Errors: %s", groupId, groupResponse.getErrors()));
- retVal = new BlResponse<>(false);
  }
 
  return retVal;

src/main/java/hudson/plugins/spotinst/cloud/BaseSpotinstCloud.java

@@ -177,6 +177,11 @@ public Collection<PlannedNode> provision(Label label, int excessWorkload) {
  return Collections.emptyList();
  }
 
+ @Override
+ public Collection<NodeProvisioner.PlannedNode> provision(CloudState state, int excessWorkload) {
+ return this.provision(state.getLabel(), excessWorkload);
+ }
+
  @Override
  public boolean canProvision(Label label) {
  boolean canProvision = true;
@@ -193,6 +198,11 @@ public boolean canProvision(Label label) {
  return canProvision;
  }
 
+ @Override
+ public boolean canProvision(CloudState state) {
+ return this.canProvision(state.getLabel());
+ }
+
  @Override
  public DescriptorImpl getDescriptor() {
  return (DescriptorImpl) super.getDescriptor();

src/main/java/hudson/plugins/spotinst/cloud/monitor/AwsSpotinstCloudInstanceTypeMonitor.java

@@ -5,7 +5,7 @@
 import hudson.plugins.spotinst.cloud.AwsSpotinstCloud;
 import hudson.slaves.Cloud;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/hudson/plugins/spotinst/cloud/monitor/SpotinstCloudsCommunicationMonitor.java

@@ -6,7 +6,7 @@
 import hudson.plugins.spotinst.common.GroupLockingManager;
 import hudson.plugins.spotinst.common.SpotinstCloudCommunicationState;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/hudson/plugins/spotinst/jobs/SpotinstSyncGroupsController.java

@@ -10,7 +10,7 @@
 import hudson.plugins.spotinst.jobs.jobSynchronizer.JobSynchronizer;
 import hudson.slaves.Cloud;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/resources/index.jelly

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+ <div>
+ This plugin allows Jenkins to start agents with the Spot framework and terminate them as they become idle.
+ </div>
+</j:jelly>