From 7609aec288f75f67d493e251961caed1aa1be1b7 Mon Sep 17 00:00:00 2001 From: xausky Date: Wed, 10 Dec 2025 14:27:21 +0800 Subject: [PATCH] feat(jakarta): Migrate library to Jakarta EE 9+ namespace This commit upgrades all dependency artifacts and source code from the legacy javax.* namespace to the new jakarta.* namespace. This change is required to support modern application servers (e.g., Tomcat 10+, WildFly 26+, Jetty 11+). BREAKING CHANGE: All users integrating this library must now use Jakarta EE compatible environments and update their own source code to use the jakarta.* imports. Compatibility with old Java EE environments (e.g., Tomcat 9, WildFly 25) is dropped. --- build.gradle | 8 ++--- gradle.properties | 2 +- gradle/additional-artifacts.gradle | 9 +++-- .../com/cdancy/jenkins/rest/JenkinsApi.java | 10 +----- .../jenkins/rest/JenkinsApiMetadata.java | 6 ++-- .../jenkins/rest/JenkinsAuthentication.java | 5 ++- .../cdancy/jenkins/rest/JenkinsClient.java | 9 +++-- .../com/cdancy/jenkins/rest/JenkinsUtils.java | 26 +++------------ .../jenkins/rest/binders/BindMapToForm.java | 3 +- .../config/JenkinsAuthenticationModule.java | 3 +- .../rest/config/JenkinsHttpApiModule.java | 5 ++- .../jenkins/rest/domain/common/Error.java | 15 ++++----- .../rest/domain/common/LongResponse.java | 5 ++- .../rest/domain/common/RequestStatus.java | 19 +++++------ .../jenkins/rest/domain/crumb/Crumb.java | 7 ++-- .../jenkins/rest/domain/job/Action.java | 4 +-- .../jenkins/rest/domain/job/Artifact.java | 3 +- .../jenkins/rest/domain/job/BuildInfo.java | 9 +++-- .../jenkins/rest/domain/job/ChangeSet.java | 7 ++-- .../rest/domain/job/ChangeSetList.java | 7 ++-- .../jenkins/rest/domain/job/Culprit.java | 3 +- .../jenkins/rest/domain/job/JobInfo.java | 5 ++- .../jenkins/rest/domain/job/JobList.java | 4 +-- .../rest/domain/job/ProgressiveText.java | 3 +- .../jenkins/rest/domain/plugins/Plugin.java | 25 +++++++------- .../jenkins/rest/domain/plugins/Plugins.java | 12 +++---- .../jenkins/rest/domain/queue/Executable.java | 3 +- .../jenkins/rest/domain/queue/QueueItem.java | 5 ++- .../jenkins/rest/domain/queue/Task.java | 3 +- .../rest/domain/statistics/OverallLoad.java | 3 +- .../rest/domain/system/SystemInfo.java | 14 ++++---- .../cdancy/jenkins/rest/domain/user/User.java | 3 -- .../rest/fallbacks/JenkinsFallbacks.java | 10 ++---- .../rest/features/ConfigurationAsCodeApi.java | 18 ++++------ .../jenkins/rest/features/CrumbIssuerApi.java | 20 +++++------ .../cdancy/jenkins/rest/features/JobsApi.java | 33 +++++-------------- .../rest/features/PluginManagerApi.java | 19 +++-------- .../jenkins/rest/features/QueueApi.java | 21 ++++-------- .../jenkins/rest/features/StatisticsApi.java | 14 ++++---- .../jenkins/rest/features/SystemApi.java | 22 ++++++------- .../cdancy/jenkins/rest/features/UserApi.java | 22 ++++--------- .../filters/JenkinsAuthenticationFilter.java | 9 ++--- .../JenkinsNoCrumbAuthenticationFilter.java | 8 ++--- .../filters/JenkinsUserInjectionFilter.java | 11 +++---- .../rest/filters/ScrubNullFolderParam.java | 7 ++-- .../rest/handlers/JenkinsErrorHandler.java | 10 +++--- .../rest/parsers/BuildNumberToInteger.java | 6 ++-- .../jenkins/rest/parsers/CrumbParser.java | 4 +-- .../rest/parsers/FolderPathParser.java | 2 +- .../rest/parsers/LocationToQueueId.java | 2 +- .../parsers/OptionalFolderPathParser.java | 2 +- .../rest/parsers/OutputToProgressiveText.java | 2 +- .../rest/parsers/RequestStatusParser.java | 2 +- .../parsers/SystemInfoFromJenkinsHeaders.java | 7 ++-- .../jenkins/rest/BaseJenkinsApiLiveTest.java | 9 +++-- .../jenkins/rest/BaseJenkinsMockTest.java | 11 +++---- .../cdancy/jenkins/rest/BaseJenkinsTest.java | 13 ++++---- .../jenkins/rest/JenkinsApiMetadataTest.java | 8 ++--- .../rest/JenkinsAuthenticationMockTest.java | 6 ++-- .../ConfigurationAsCodeApiLiveTest.java | 5 ++- .../ConfigurationAsCodeApiMockTest.java | 4 +-- .../rest/features/CrumbIssuerApiLiveTest.java | 3 +- .../rest/features/CrumbIssuerApiMockTest.java | 15 ++++----- .../rest/features/JobsApiLiveTest.java | 4 +-- .../rest/features/JobsApiMockTest.java | 15 ++++----- .../features/PluginManagerApiLiveTest.java | 7 ++-- .../features/PluginManagerApiMockTest.java | 16 ++++----- .../rest/features/QueueApiLiveTest.java | 14 +++----- .../rest/features/QueueApiMockTest.java | 18 ++++------ .../rest/features/StatisticsApiLiveTest.java | 3 +- .../rest/features/StatisticsApiMockTest.java | 7 ++-- .../rest/features/SystemApiLiveTest.java | 5 ++- .../rest/features/SystemApiMockTest.java | 16 ++++----- .../rest/features/UserApiLiveTest.java | 7 ++-- .../rest/features/UserApiMockTest.java | 4 +-- .../JenkinsAuthenticationFilterLiveTest.java | 10 +++--- .../JenkinsAuthenticationFilterMockTest.java | 13 +++----- 77 files changed, 271 insertions(+), 438 deletions(-) diff --git a/build.gradle b/build.gradle index 07497766..0f605fa6 100644 --- a/build.gradle +++ b/build.gradle @@ -15,13 +15,13 @@ repositories { } dependencies { - ext.jcloudsVersion = '2.5.0' + ext.jcloudsVersion = '2.7.0' ext.autoValueVersion = '1.11.0' ext.autoServiceVersion = '1.1.1' - ext.guiceVersion = '5.1.0' + ext.guiceVersion = '7.0.0' - implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' - implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' implementation ("org.apache.jclouds:jclouds-core:${jcloudsVersion}") implementation ("com.google.inject:guice:${guiceVersion}") implementation ("com.google.inject.extensions:guice-assistedinject:${guiceVersion}") diff --git a/gradle.properties b/gradle.properties index ee02f42c..22cd7081 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = io.github.cdancy -version = 1.0.2 +version=2.0.0-jakarta artifactoryURL = http://127.0.0.1:8080/artifactory artifactoryUser = admin diff --git a/gradle/additional-artifacts.gradle b/gradle/additional-artifacts.gradle index 70743f49..00cb54f5 100644 --- a/gradle/additional-artifacts.gradle +++ b/gradle/additional-artifacts.gradle @@ -10,12 +10,11 @@ shadowJar { relocate 'org.objectweb', "${newBasePackage}.shaded.org.objectweb" relocate 'com.google', "${newBasePackage}.shaded.com.google" relocate 'net.sf', "${newBasePackage}.shaded.net.sf" - relocate 'javax.inject', "${newBasePackage}.shaded.javax.inject" + relocate 'jakarta.inject', "${newBasePackage}.shaded.jakarta.inject" relocate 'org.jclouds', "${newBasePackage}.shaded.org.jclouds" - relocate 'javax.inject', "${newBasePackage}.shaded.javax.inject" - relocate 'javax.annotation', "${newBasePackage}.shaded.javax.annotation" - relocate 'javax.ws.rs', "${newBasePackage}.shaded.javax.ws.rs" - relocate 'javax.xml.bind', "${newBasePackage}.shaded.javax.xml.bind" + relocate 'jakarta.annotation', "${newBasePackage}.shaded.jakarta.annotation" + relocate 'jakarta.ws.rs', "${newBasePackage}.shaded.jakarta.ws.rs" + relocate 'jakarta.xml.bind', "${newBasePackage}.shaded.jakarta.xml.bind" } task sourcesJar(type: Jar) { diff --git a/src/main/java/com/cdancy/jenkins/rest/JenkinsApi.java b/src/main/java/com/cdancy/jenkins/rest/JenkinsApi.java index b87877bc..e4ace71c 100644 --- a/src/main/java/com/cdancy/jenkins/rest/JenkinsApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/JenkinsApi.java @@ -19,17 +19,9 @@ import java.io.Closeable; +import com.cdancy.jenkins.rest.features.*; import org.jclouds.rest.annotations.Delegate; -import com.cdancy.jenkins.rest.features.ConfigurationAsCodeApi; -import com.cdancy.jenkins.rest.features.CrumbIssuerApi; -import com.cdancy.jenkins.rest.features.JobsApi; -import com.cdancy.jenkins.rest.features.PluginManagerApi; -import com.cdancy.jenkins.rest.features.QueueApi; -import com.cdancy.jenkins.rest.features.StatisticsApi; -import com.cdancy.jenkins.rest.features.SystemApi; -import com.cdancy.jenkins.rest.features.UserApi; - public interface JenkinsApi extends Closeable { @Delegate diff --git a/src/main/java/com/cdancy/jenkins/rest/JenkinsApiMetadata.java b/src/main/java/com/cdancy/jenkins/rest/JenkinsApiMetadata.java index 52c10c4a..08fe2e41 100644 --- a/src/main/java/com/cdancy/jenkins/rest/JenkinsApiMetadata.java +++ b/src/main/java/com/cdancy/jenkins/rest/JenkinsApiMetadata.java @@ -20,13 +20,11 @@ import java.net.URI; import java.util.Properties; -import org.jclouds.apis.ApiMetadata; -import org.jclouds.rest.internal.BaseHttpApiMetadata; - import com.cdancy.jenkins.rest.config.JenkinsHttpApiModule; import com.google.auto.service.AutoService; import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; +import org.jclouds.apis.ApiMetadata; +import org.jclouds.rest.internal.BaseHttpApiMetadata; @AutoService(ApiMetadata.class) public class JenkinsApiMetadata extends BaseHttpApiMetadata { diff --git a/src/main/java/com/cdancy/jenkins/rest/JenkinsAuthentication.java b/src/main/java/com/cdancy/jenkins/rest/JenkinsAuthentication.java index dc058385..0f950b36 100644 --- a/src/main/java/com/cdancy/jenkins/rest/JenkinsAuthentication.java +++ b/src/main/java/com/cdancy/jenkins/rest/JenkinsAuthentication.java @@ -19,12 +19,11 @@ import static com.google.common.io.BaseEncoding.base64; -import com.cdancy.jenkins.rest.auth.AuthenticationType; -import com.cdancy.jenkins.rest.exception.UndetectableIdentityException; - import java.nio.charset.StandardCharsets; import java.util.Objects; +import com.cdancy.jenkins.rest.auth.AuthenticationType; +import com.cdancy.jenkins.rest.exception.UndetectableIdentityException; import org.jclouds.domain.Credentials; import org.jclouds.javax.annotation.Nullable; diff --git a/src/main/java/com/cdancy/jenkins/rest/JenkinsClient.java b/src/main/java/com/cdancy/jenkins/rest/JenkinsClient.java index bae330e1..66b69dc3 100644 --- a/src/main/java/com/cdancy/jenkins/rest/JenkinsClient.java +++ b/src/main/java/com/cdancy/jenkins/rest/JenkinsClient.java @@ -17,17 +17,16 @@ package com.cdancy.jenkins.rest; -import com.cdancy.jenkins.rest.auth.AuthenticationType; -import com.cdancy.jenkins.rest.config.JenkinsAuthenticationModule; -import com.google.common.collect.Lists; -import com.google.inject.Module; - import java.io.Closeable; import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Properties; +import com.cdancy.jenkins.rest.auth.AuthenticationType; +import com.cdancy.jenkins.rest.config.JenkinsAuthenticationModule; +import com.google.common.collect.Lists; +import com.google.inject.Module; import org.jclouds.ContextBuilder; import org.jclouds.javax.annotation.Nullable; diff --git a/src/main/java/com/cdancy/jenkins/rest/JenkinsUtils.java b/src/main/java/com/cdancy/jenkins/rest/JenkinsUtils.java index 5b567460..a352e739 100644 --- a/src/main/java/com/cdancy/jenkins/rest/JenkinsUtils.java +++ b/src/main/java/com/cdancy/jenkins/rest/JenkinsUtils.java @@ -17,36 +17,18 @@ package com.cdancy.jenkins.rest; -import static com.cdancy.jenkins.rest.JenkinsConstants.JENKINS_REST_PROPERTY_ID; -import static com.cdancy.jenkins.rest.JenkinsConstants.JENKINS_REST_VARIABLE_ID; -import static com.cdancy.jenkins.rest.JenkinsConstants.CREDENTIALS_ENVIRONMENT_VARIABLE; -import static com.cdancy.jenkins.rest.JenkinsConstants.CREDENTIALS_SYSTEM_PROPERTY; -import static com.cdancy.jenkins.rest.JenkinsConstants.DEFAULT_ENDPOINT; -import static com.cdancy.jenkins.rest.JenkinsConstants.ENDPOINT_ENVIRONMENT_VARIABLE; -import static com.cdancy.jenkins.rest.JenkinsConstants.ENDPOINT_SYSTEM_PROPERTY; -import static com.cdancy.jenkins.rest.JenkinsConstants.JCLOUDS_PROPERTY_ID; -import static com.cdancy.jenkins.rest.JenkinsConstants.JCLOUDS_VARIABLE_ID; -import static com.cdancy.jenkins.rest.JenkinsConstants.API_TOKEN_ENVIRONMENT_VARIABLE; -import static com.cdancy.jenkins.rest.JenkinsConstants.API_TOKEN_SYSTEM_PROPERTY; +import static com.cdancy.jenkins.rest.JenkinsConstants.*; -import com.google.common.base.Throwables; - -import java.util.List; -import java.util.Map; +import java.lang.reflect.Field; +import java.util.*; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.Objects; -import java.util.Properties; - import org.jclouds.javax.annotation.Nullable; /** diff --git a/src/main/java/com/cdancy/jenkins/rest/binders/BindMapToForm.java b/src/main/java/com/cdancy/jenkins/rest/binders/BindMapToForm.java index ea8ecccf..b681d064 100644 --- a/src/main/java/com/cdancy/jenkins/rest/binders/BindMapToForm.java +++ b/src/main/java/com/cdancy/jenkins/rest/binders/BindMapToForm.java @@ -21,9 +21,8 @@ import java.util.List; import java.util.Map; -import javax.inject.Singleton; - import com.google.common.collect.Lists; +import jakarta.inject.Singleton; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequest.Builder; import org.jclouds.rest.Binder; diff --git a/src/main/java/com/cdancy/jenkins/rest/config/JenkinsAuthenticationModule.java b/src/main/java/com/cdancy/jenkins/rest/config/JenkinsAuthenticationModule.java index a7f1d442..e0768517 100644 --- a/src/main/java/com/cdancy/jenkins/rest/config/JenkinsAuthenticationModule.java +++ b/src/main/java/com/cdancy/jenkins/rest/config/JenkinsAuthenticationModule.java @@ -17,9 +17,10 @@ package com.cdancy.jenkins.rest.config; +import java.util.Objects; + import com.cdancy.jenkins.rest.JenkinsAuthentication; import com.google.inject.AbstractModule; -import java.util.Objects; /** * Configure the provider for JenkinsAuthentication. diff --git a/src/main/java/com/cdancy/jenkins/rest/config/JenkinsHttpApiModule.java b/src/main/java/com/cdancy/jenkins/rest/config/JenkinsHttpApiModule.java index 045e2c9f..dd16ef56 100644 --- a/src/main/java/com/cdancy/jenkins/rest/config/JenkinsHttpApiModule.java +++ b/src/main/java/com/cdancy/jenkins/rest/config/JenkinsHttpApiModule.java @@ -17,6 +17,8 @@ package com.cdancy.jenkins.rest.config; +import com.cdancy.jenkins.rest.JenkinsApi; +import com.cdancy.jenkins.rest.handlers.JenkinsErrorHandler; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; @@ -24,9 +26,6 @@ import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.config.HttpApiModule; -import com.cdancy.jenkins.rest.JenkinsApi; -import com.cdancy.jenkins.rest.handlers.JenkinsErrorHandler; - @ConfiguresHttpApi public class JenkinsHttpApiModule extends HttpApiModule { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/common/Error.java b/src/main/java/com/cdancy/jenkins/rest/domain/common/Error.java index 41db5a7f..efcd7b2f 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/common/Error.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/common/Error.java @@ -17,11 +17,10 @@ package com.cdancy.jenkins.rest.domain.common; +import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import com.google.auto.value.AutoValue; - @AutoValue public abstract class Error { @@ -32,17 +31,17 @@ public abstract class Error { public abstract String message(); public abstract String exceptionName(); - + Error() { } @SerializedNames({ "context", "message", "exceptionName" }) - public static Error create(final String context, - final String message, + public static Error create(final String context, + final String message, final String exceptionName) { - - return new AutoValue_Error(context, - message, + + return new AutoValue_Error(context, + message, exceptionName); } } diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/common/LongResponse.java b/src/main/java/com/cdancy/jenkins/rest/domain/common/LongResponse.java index bed75075..c7cb9690 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/common/LongResponse.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/common/LongResponse.java @@ -19,11 +19,10 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - import com.cdancy.jenkins.rest.JenkinsUtils; import com.google.auto.value.AutoValue; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; /** * Long response to be returned when an endpoint returns diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/common/RequestStatus.java b/src/main/java/com/cdancy/jenkins/rest/domain/common/RequestStatus.java index b9619bc8..25c0b00a 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/common/RequestStatus.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/common/RequestStatus.java @@ -19,28 +19,27 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - import com.cdancy.jenkins.rest.JenkinsUtils; import com.google.auto.value.AutoValue; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; /** - * Generic response to be returned when an endpoint returns + * Generic response to be returned when an endpoint returns * no content (i.e. 204 response code). - * - *

When the response code is valid the `value` parameter will + * + *

When the response code is valid the `value` parameter will * be set to true while a non-valid response has the `value` set to * false along with any potential `error` objects returned from Jenkins. */ @AutoValue public abstract class RequestStatus implements Value, ErrorsHolder { - + @SerializedNames({ "value", "errors" }) - public static RequestStatus create(@Nullable final Boolean value, + public static RequestStatus create(@Nullable final Boolean value, final List errors) { - - return new AutoValue_RequestStatus(value, + + return new AutoValue_RequestStatus(value, JenkinsUtils.nullToEmpty(errors)); } } diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/crumb/Crumb.java b/src/main/java/com/cdancy/jenkins/rest/domain/crumb/Crumb.java index b0125e7a..0a367389 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/crumb/Crumb.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/crumb/Crumb.java @@ -19,13 +19,12 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - +import com.cdancy.jenkins.rest.JenkinsUtils; import com.cdancy.jenkins.rest.domain.common.Error; import com.cdancy.jenkins.rest.domain.common.ErrorsHolder; -import com.cdancy.jenkins.rest.JenkinsUtils; import com.google.auto.value.AutoValue; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class Crumb implements ErrorsHolder { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/Action.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/Action.java index 8f709a65..c64d1ffb 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/Action.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/Action.java @@ -17,13 +17,13 @@ package com.cdancy.jenkins.rest.domain.job; +import java.util.List; + import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import java.util.List; - @AutoValue public abstract class Action { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/Artifact.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/Artifact.java index acaedd6a..0337cc80 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/Artifact.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/Artifact.java @@ -17,11 +17,10 @@ package com.cdancy.jenkins.rest.domain.job; +import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import com.google.auto.value.AutoValue; - @AutoValue public abstract class Artifact { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/BuildInfo.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/BuildInfo.java index 998a08ba..24172517 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/BuildInfo.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/BuildInfo.java @@ -19,11 +19,10 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class BuildInfo { @@ -65,7 +64,7 @@ public abstract class BuildInfo { public abstract String url(); public abstract List changeSets(); - + @Nullable public abstract String builtOn(); @@ -83,7 +82,7 @@ public static BuildInfo create(List artifacts, List actions, b artifacts != null ? ImmutableList.copyOf(artifacts) : ImmutableList. of(), actions != null ? ImmutableList.copyOf(actions) : ImmutableList. of(), building, description, displayName, duration, estimatedDuration, fullDisplayName, - id, keepLog, number, queueId, result, timestamp, url, + id, keepLog, number, queueId, result, timestamp, url, changeSets != null ? ImmutableList.copyOf(changeSets) : ImmutableList. of(), builtOn, culprits != null ? ImmutableList.copyOf(culprits) : ImmutableList. of()); diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSet.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSet.java index ebe103a2..35f35ffc 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSet.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSet.java @@ -19,11 +19,10 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class ChangeSet { @@ -48,7 +47,7 @@ public abstract class ChangeSet { @SerializedNames({ "affectedPaths", "commitId", "timestamp", "author", "authorEmail", "comment" }) public static ChangeSet create(List affectedPaths, String commitId, long timestamp, Culprit author, String authorEmail, String comment) { return new AutoValue_ChangeSet( - affectedPaths != null ? ImmutableList.copyOf(affectedPaths) : ImmutableList. of(), + affectedPaths != null ? ImmutableList.copyOf(affectedPaths) : ImmutableList. of(), commitId, timestamp, author, authorEmail, comment); } } diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSetList.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSetList.java index 89a61c51..cde6b860 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSetList.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/ChangeSetList.java @@ -19,11 +19,10 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class ChangeSetList { @@ -39,7 +38,7 @@ public abstract class ChangeSetList { @SerializedNames({ "items", "kind" }) public static ChangeSetList create(List items, String kind) { return new AutoValue_ChangeSetList( - items != null ? ImmutableList.copyOf(items) : ImmutableList. of(), + items != null ? ImmutableList.copyOf(items) : ImmutableList. of(), kind); } } diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/Culprit.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/Culprit.java index d88f89da..16ef9764 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/Culprit.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/Culprit.java @@ -17,9 +17,8 @@ package com.cdancy.jenkins.rest.domain.job; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class Culprit { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/JobInfo.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/JobInfo.java index 3a3454f8..77378d7c 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/JobInfo.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/JobInfo.java @@ -19,12 +19,11 @@ import java.util.List; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.json.SerializedNames; - import com.cdancy.jenkins.rest.domain.queue.QueueItem; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class JobInfo { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/JobList.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/JobList.java index a5cbedc7..99651a5c 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/JobList.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/JobList.java @@ -17,12 +17,12 @@ package com.cdancy.jenkins.rest.domain.job; +import java.util.List; + import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import java.util.List; - @AutoValue public abstract class JobList { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/job/ProgressiveText.java b/src/main/java/com/cdancy/jenkins/rest/domain/job/ProgressiveText.java index 8e31fdb2..89342d56 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/job/ProgressiveText.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/job/ProgressiveText.java @@ -17,9 +17,8 @@ package com.cdancy.jenkins.rest.domain.job; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class ProgressiveText { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugin.java b/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugin.java index 404d29a4..efe476fe 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugin.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugin.java @@ -18,10 +18,9 @@ package com.cdancy.jenkins.rest.domain.plugins; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class Plugin { @@ -31,8 +30,8 @@ public abstract class Plugin { @Nullable public abstract String backupVersion(); - - @Nullable + + @Nullable public abstract Boolean bundled(); @Nullable @@ -44,28 +43,28 @@ public abstract class Plugin { @Nullable public abstract Boolean enabled(); - @Nullable + @Nullable public abstract Boolean hasUpdate(); - @Nullable + @Nullable public abstract String longName(); - @Nullable + @Nullable public abstract Boolean pinned(); - @Nullable + @Nullable public abstract String requiredCoreVersion(); - @Nullable + @Nullable public abstract String shortName(); - @Nullable + @Nullable public abstract String supportsDynamicLoad(); - @Nullable + @Nullable public abstract String url(); - @Nullable + @Nullable public abstract String version(); Plugin() { @@ -73,7 +72,7 @@ public abstract class Plugin { @SerializedNames({ "active", "backupVersion", "bundled", "deleted", "downgradable", "enabled", - "hasUpdate", "longName", "pinned", + "hasUpdate", "longName", "pinned", "requiredCoreVersion", "shortName", "supportsDynamicLoad", "url", "version"}) public static Plugin create(Boolean active, String backupVersion, Boolean bundled, diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugins.java b/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugins.java index ee0042dd..f719e78d 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugins.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/plugins/Plugins.java @@ -17,23 +17,21 @@ package com.cdancy.jenkins.rest.domain.plugins; +import java.util.List; + import com.cdancy.jenkins.rest.JenkinsUtils; -import com.cdancy.jenkins.rest.domain.common.ErrorsHolder; import com.cdancy.jenkins.rest.domain.common.Error; - +import com.cdancy.jenkins.rest.domain.common.ErrorsHolder; +import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import com.google.auto.value.AutoValue; - -import java.util.List; - @AutoValue public abstract class Plugins implements ErrorsHolder { @Nullable public abstract String clazz(); - + public abstract List plugins(); Plugins() { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/queue/Executable.java b/src/main/java/com/cdancy/jenkins/rest/domain/queue/Executable.java index 0fca9118..bc7c5227 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/queue/Executable.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/queue/Executable.java @@ -17,9 +17,8 @@ package com.cdancy.jenkins.rest.domain.queue; -import org.jclouds.json.SerializedNames; - import com.google.auto.value.AutoValue; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class Executable { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/queue/QueueItem.java b/src/main/java/com/cdancy/jenkins/rest/domain/queue/QueueItem.java index f31a20d3..1caa09f4 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/queue/QueueItem.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/queue/QueueItem.java @@ -19,11 +19,10 @@ import java.util.Map; -import org.jclouds.json.SerializedNames; -import org.jclouds.javax.annotation.Nullable; - import com.google.auto.value.AutoValue; import com.google.common.collect.Maps; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class QueueItem { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/queue/Task.java b/src/main/java/com/cdancy/jenkins/rest/domain/queue/Task.java index a157a459..ef10369f 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/queue/Task.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/queue/Task.java @@ -17,11 +17,10 @@ package com.cdancy.jenkins.rest.domain.queue; +import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import com.google.auto.value.AutoValue; - @AutoValue public abstract class Task { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/statistics/OverallLoad.java b/src/main/java/com/cdancy/jenkins/rest/domain/statistics/OverallLoad.java index e5f3e973..9c98bbd7 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/statistics/OverallLoad.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/statistics/OverallLoad.java @@ -19,11 +19,10 @@ import java.util.Map; +import com.google.auto.value.AutoValue; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; -import com.google.auto.value.AutoValue; - @AutoValue public abstract class OverallLoad { diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/system/SystemInfo.java b/src/main/java/com/cdancy/jenkins/rest/domain/system/SystemInfo.java index 1db3c7de..3cb8f431 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/system/SystemInfo.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/system/SystemInfo.java @@ -17,16 +17,14 @@ package com.cdancy.jenkins.rest.domain.system; +import java.util.List; + import com.cdancy.jenkins.rest.JenkinsUtils; -import com.cdancy.jenkins.rest.domain.common.ErrorsHolder; import com.cdancy.jenkins.rest.domain.common.Error; - -import org.jclouds.json.SerializedNames; -import org.jclouds.javax.annotation.Nullable; - +import com.cdancy.jenkins.rest.domain.common.ErrorsHolder; import com.google.auto.value.AutoValue; - -import java.util.List; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.json.SerializedNames; @AutoValue public abstract class SystemInfo implements ErrorsHolder { @@ -53,7 +51,7 @@ public static SystemInfo create(String hudsonVersion, String jenkinsVersion, Str String instanceIdentity, String sshEndpoint, String server, final List errors) { return new AutoValue_SystemInfo(JenkinsUtils.nullToEmpty(errors), - hudsonVersion, jenkinsVersion, jenkinsSession, + hudsonVersion, jenkinsVersion, jenkinsSession, instanceIdentity, sshEndpoint, server); } } diff --git a/src/main/java/com/cdancy/jenkins/rest/domain/user/User.java b/src/main/java/com/cdancy/jenkins/rest/domain/user/User.java index 153b7246..41547570 100644 --- a/src/main/java/com/cdancy/jenkins/rest/domain/user/User.java +++ b/src/main/java/com/cdancy/jenkins/rest/domain/user/User.java @@ -16,10 +16,7 @@ */ package com.cdancy.jenkins.rest.domain.user; -import java.util.List; - import com.google.auto.value.AutoValue; -import com.google.common.collect.ImmutableList; import org.jclouds.javax.annotation.Nullable; import org.jclouds.json.SerializedNames; diff --git a/src/main/java/com/cdancy/jenkins/rest/fallbacks/JenkinsFallbacks.java b/src/main/java/com/cdancy/jenkins/rest/fallbacks/JenkinsFallbacks.java index b1b9ef86..11748c3e 100644 --- a/src/main/java/com/cdancy/jenkins/rest/fallbacks/JenkinsFallbacks.java +++ b/src/main/java/com/cdancy/jenkins/rest/fallbacks/JenkinsFallbacks.java @@ -17,23 +17,17 @@ package com.cdancy.jenkins.rest.fallbacks; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Predicates.equalTo; -import static com.google.common.base.Throwables.propagate; -import static org.jclouds.http.HttpUtils.returnValueOnCodeOrNull; +import java.util.List; +import com.cdancy.jenkins.rest.domain.common.Error; import com.cdancy.jenkins.rest.domain.common.LongResponse; import com.cdancy.jenkins.rest.domain.common.RequestStatus; -import com.cdancy.jenkins.rest.domain.common.Error; import com.cdancy.jenkins.rest.domain.crumb.Crumb; import com.cdancy.jenkins.rest.domain.plugins.Plugins; import com.cdancy.jenkins.rest.domain.system.SystemInfo; - import com.google.common.collect.Lists; import com.google.gson.JsonSyntaxException; - -import java.util.List; - import org.jclouds.Fallback; import org.jclouds.rest.ResourceNotFoundException; diff --git a/src/main/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApi.java b/src/main/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApi.java index f1a679e6..97fb3388 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApi.java @@ -17,20 +17,14 @@ package com.cdancy.jenkins.rest.features; -import javax.inject.Named; -import javax.ws.rs.POST; -import javax.ws.rs.Path; - import com.cdancy.jenkins.rest.domain.common.RequestStatus; -import com.cdancy.jenkins.rest.parsers.RequestStatusParser; -import org.jclouds.rest.annotations.RequestFilters; -import org.jclouds.rest.annotations.ResponseParser; -import org.jclouds.rest.annotations.Fallback; -import org.jclouds.rest.annotations.Payload; -import org.jclouds.rest.annotations.PayloadParam; - import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; +import com.cdancy.jenkins.rest.parsers.RequestStatusParser; +import jakarta.inject.Named; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import org.jclouds.rest.annotations.*; @RequestFilters(JenkinsAuthenticationFilter.class) @Path("/configuration-as-code") @@ -43,7 +37,7 @@ public interface ConfigurationAsCodeApi { @Payload("{cascYml}") @POST RequestStatus check(@PayloadParam(value = "cascYml") String cascYml); - + @Named("casc:apply") @Path("/apply") @Fallback(JenkinsFallbacks.RequestStatusOnError.class) diff --git a/src/main/java/com/cdancy/jenkins/rest/features/CrumbIssuerApi.java b/src/main/java/com/cdancy/jenkins/rest/features/CrumbIssuerApi.java index 1e90b462..ce36e0f9 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/CrumbIssuerApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/CrumbIssuerApi.java @@ -17,21 +17,19 @@ package com.cdancy.jenkins.rest.features; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; - -import org.jclouds.rest.annotations.Fallback; -import org.jclouds.rest.annotations.ResponseParser; -import org.jclouds.rest.annotations.RequestFilters; -import org.jclouds.rest.annotations.QueryParams; - import com.cdancy.jenkins.rest.domain.crumb.Crumb; import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsNoCrumbAuthenticationFilter; import com.cdancy.jenkins.rest.parsers.CrumbParser; +import jakarta.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import org.jclouds.rest.annotations.Fallback; +import org.jclouds.rest.annotations.QueryParams; +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.rest.annotations.ResponseParser; @RequestFilters(JenkinsNoCrumbAuthenticationFilter.class) @Path("/crumbIssuer/api/xml") diff --git a/src/main/java/com/cdancy/jenkins/rest/features/JobsApi.java b/src/main/java/com/cdancy/jenkins/rest/features/JobsApi.java index 8deb0d95..4e06343e 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/JobsApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/JobsApi.java @@ -18,38 +18,23 @@ package com.cdancy.jenkins.rest.features; import java.io.InputStream; -import com.google.gson.JsonObject; import java.util.List; import java.util.Map; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - -import com.cdancy.jenkins.rest.domain.job.*; -import com.cdancy.jenkins.rest.parsers.*; -import org.jclouds.Fallbacks; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.rest.annotations.BinderParam; -import org.jclouds.rest.annotations.Fallback; -import org.jclouds.rest.annotations.ParamParser; -import org.jclouds.rest.annotations.Payload; -import org.jclouds.rest.annotations.PayloadParam; -import org.jclouds.rest.annotations.RequestFilters; -import org.jclouds.rest.annotations.ResponseParser; - import com.cdancy.jenkins.rest.binders.BindMapToForm; import com.cdancy.jenkins.rest.domain.common.LongResponse; import com.cdancy.jenkins.rest.domain.common.RequestStatus; +import com.cdancy.jenkins.rest.domain.job.*; import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; +import com.cdancy.jenkins.rest.parsers.*; +import com.google.gson.JsonObject; +import jakarta.inject.Named; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import org.jclouds.Fallbacks; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.rest.annotations.*; @RequestFilters(JenkinsAuthenticationFilter.class) @Path("/") diff --git a/src/main/java/com/cdancy/jenkins/rest/features/PluginManagerApi.java b/src/main/java/com/cdancy/jenkins/rest/features/PluginManagerApi.java index 91185fb8..df38befc 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/PluginManagerApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/PluginManagerApi.java @@ -17,27 +17,16 @@ package com.cdancy.jenkins.rest.features; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.QueryParam; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; - import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.plugins.Plugins; import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; import com.cdancy.jenkins.rest.parsers.RequestStatusParser; - -import org.jclouds.rest.annotations.RequestFilters; +import jakarta.inject.Named; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import org.jclouds.javax.annotation.Nullable; -import org.jclouds.rest.annotations.Fallback; -import org.jclouds.rest.annotations.Payload; -import org.jclouds.rest.annotations.PayloadParam; -import org.jclouds.rest.annotations.ResponseParser; +import org.jclouds.rest.annotations.*; @RequestFilters(JenkinsAuthenticationFilter.class) @Consumes(MediaType.APPLICATION_JSON) diff --git a/src/main/java/com/cdancy/jenkins/rest/features/QueueApi.java b/src/main/java/com/cdancy/jenkins/rest/features/QueueApi.java index 513ad3ab..e536ca06 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/QueueApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/QueueApi.java @@ -17,27 +17,20 @@ package com.cdancy.jenkins.rest.features; -import com.cdancy.jenkins.rest.domain.common.RequestStatus; import java.util.List; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; - -import org.jclouds.rest.annotations.Fallback; -import org.jclouds.rest.annotations.RequestFilters; -import org.jclouds.rest.annotations.SelectJson; - +import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.queue.QueueItem; import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; import com.cdancy.jenkins.rest.parsers.RequestStatusParser; +import jakarta.inject.Named; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import org.jclouds.rest.annotations.Fallback; +import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; +import org.jclouds.rest.annotations.SelectJson; @RequestFilters(JenkinsAuthenticationFilter.class) @Consumes(MediaType.APPLICATION_JSON) diff --git a/src/main/java/com/cdancy/jenkins/rest/features/StatisticsApi.java b/src/main/java/com/cdancy/jenkins/rest/features/StatisticsApi.java index f6312559..7e9ca197 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/StatisticsApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/StatisticsApi.java @@ -17,16 +17,14 @@ package com.cdancy.jenkins.rest.features; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; - -import org.jclouds.rest.annotations.RequestFilters; - import com.cdancy.jenkins.rest.domain.statistics.OverallLoad; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; +import jakarta.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import org.jclouds.rest.annotations.RequestFilters; @RequestFilters(JenkinsAuthenticationFilter.class) @Consumes(MediaType.APPLICATION_JSON) diff --git a/src/main/java/com/cdancy/jenkins/rest/features/SystemApi.java b/src/main/java/com/cdancy/jenkins/rest/features/SystemApi.java index 81685d71..cfd52cef 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/SystemApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/SystemApi.java @@ -17,23 +17,21 @@ package com.cdancy.jenkins.rest.features; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.HEAD; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; - import com.cdancy.jenkins.rest.domain.common.RequestStatus; -import com.cdancy.jenkins.rest.parsers.RequestStatusParser; -import org.jclouds.rest.annotations.RequestFilters; -import org.jclouds.rest.annotations.ResponseParser; -import org.jclouds.rest.annotations.Fallback; - import com.cdancy.jenkins.rest.domain.system.SystemInfo; import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; +import com.cdancy.jenkins.rest.parsers.RequestStatusParser; import com.cdancy.jenkins.rest.parsers.SystemInfoFromJenkinsHeaders; +import jakarta.inject.Named; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import org.jclouds.rest.annotations.Fallback; +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.rest.annotations.ResponseParser; @RequestFilters(JenkinsAuthenticationFilter.class) @Consumes(MediaType.APPLICATION_JSON) diff --git a/src/main/java/com/cdancy/jenkins/rest/features/UserApi.java b/src/main/java/com/cdancy/jenkins/rest/features/UserApi.java index 5b4e5739..fbae05b9 100644 --- a/src/main/java/com/cdancy/jenkins/rest/features/UserApi.java +++ b/src/main/java/com/cdancy/jenkins/rest/features/UserApi.java @@ -17,28 +17,18 @@ package com.cdancy.jenkins.rest.features; -import javax.inject.Named; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import org.jclouds.Fallbacks; -import org.jclouds.rest.annotations.Fallback; -import org.jclouds.rest.annotations.Payload; -import org.jclouds.rest.annotations.PayloadParam; -import org.jclouds.rest.annotations.RequestFilters; - +import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.user.ApiToken; import com.cdancy.jenkins.rest.domain.user.User; -import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.fallbacks.JenkinsFallbacks; import com.cdancy.jenkins.rest.filters.JenkinsAuthenticationFilter; import com.cdancy.jenkins.rest.filters.JenkinsUserInjectionFilter; import com.cdancy.jenkins.rest.parsers.RequestStatusParser; -import org.jclouds.rest.annotations.ResponseParser; +import jakarta.inject.Named; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import org.jclouds.Fallbacks; +import org.jclouds.rest.annotations.*; /** * The UserApi. diff --git a/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilter.java b/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilter.java index 89f571da..5e98705c 100644 --- a/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilter.java +++ b/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilter.java @@ -18,20 +18,17 @@ package com.cdancy.jenkins.rest.filters; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.JenkinsAuthentication; import com.cdancy.jenkins.rest.auth.AuthenticationType; import com.cdancy.jenkins.rest.domain.crumb.Crumb; - +import com.google.common.net.HttpHeaders; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; - -import com.google.common.net.HttpHeaders; - import org.jclouds.rest.ResourceNotFoundException; @Singleton diff --git a/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsNoCrumbAuthenticationFilter.java b/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsNoCrumbAuthenticationFilter.java index 9a655833..edbd878f 100644 --- a/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsNoCrumbAuthenticationFilter.java +++ b/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsNoCrumbAuthenticationFilter.java @@ -17,16 +17,14 @@ package com.cdancy.jenkins.rest.filters; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.cdancy.jenkins.rest.JenkinsAuthentication; import com.cdancy.jenkins.rest.auth.AuthenticationType; - +import com.google.common.net.HttpHeaders; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; -import com.google.common.net.HttpHeaders; @Singleton public class JenkinsNoCrumbAuthenticationFilter implements HttpRequestFilter { diff --git a/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsUserInjectionFilter.java b/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsUserInjectionFilter.java index 73389062..37e7e5d1 100644 --- a/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsUserInjectionFilter.java +++ b/src/main/java/com/cdancy/jenkins/rest/filters/JenkinsUserInjectionFilter.java @@ -17,16 +17,15 @@ package com.cdancy.jenkins.rest.filters; +import static com.cdancy.jenkins.rest.JenkinsConstants.USER_IN_USER_API; + +import com.cdancy.jenkins.rest.JenkinsAuthentication; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; -import com.cdancy.jenkins.rest.JenkinsAuthentication; -import static com.cdancy.jenkins.rest.JenkinsConstants.USER_IN_USER_API; - -import javax.inject.Inject; -import javax.inject.Singleton; - @Singleton public class JenkinsUserInjectionFilter implements HttpRequestFilter { diff --git a/src/main/java/com/cdancy/jenkins/rest/filters/ScrubNullFolderParam.java b/src/main/java/com/cdancy/jenkins/rest/filters/ScrubNullFolderParam.java index d4c1907a..b7c07097 100644 --- a/src/main/java/com/cdancy/jenkins/rest/filters/ScrubNullFolderParam.java +++ b/src/main/java/com/cdancy/jenkins/rest/filters/ScrubNullFolderParam.java @@ -17,14 +17,13 @@ package com.cdancy.jenkins.rest.filters; +import static com.cdancy.jenkins.rest.JenkinsConstants.OPTIONAL_FOLDER_PATH_PARAM; + +import jakarta.inject.Singleton; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; -import javax.inject.Singleton; - -import static com.cdancy.jenkins.rest.JenkinsConstants.OPTIONAL_FOLDER_PATH_PARAM; - @Singleton public class ScrubNullFolderParam implements HttpRequestFilter { diff --git a/src/main/java/com/cdancy/jenkins/rest/handlers/JenkinsErrorHandler.java b/src/main/java/com/cdancy/jenkins/rest/handlers/JenkinsErrorHandler.java index 1fb9f7eb..2a34269b 100644 --- a/src/main/java/com/cdancy/jenkins/rest/handlers/JenkinsErrorHandler.java +++ b/src/main/java/com/cdancy/jenkins/rest/handlers/JenkinsErrorHandler.java @@ -18,24 +18,22 @@ import static org.jclouds.util.Closeables2.closeQuietly; +import java.io.IOException; + import com.cdancy.jenkins.rest.exception.ForbiddenException; import com.cdancy.jenkins.rest.exception.MethodNotAllowedException; import com.cdancy.jenkins.rest.exception.RedirectTo404Exception; import com.cdancy.jenkins.rest.exception.UnsupportedMediaTypeException; - -import java.io.IOException; - +import com.google.common.base.Throwables; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; +import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ResourceAlreadyExistsException; import org.jclouds.rest.ResourceNotFoundException; -import org.jclouds.rest.AuthorizationException; import org.jclouds.util.Strings2; -import com.google.common.base.Throwables; - /** * Handle errors and propagate exception */ diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/BuildNumberToInteger.java b/src/main/java/com/cdancy/jenkins/rest/parsers/BuildNumberToInteger.java index 056fec5f..767c2d82 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/BuildNumberToInteger.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/BuildNumberToInteger.java @@ -20,14 +20,12 @@ import java.io.InputStream; import java.io.InputStreamReader; -import javax.inject.Singleton; - -import org.jclouds.http.HttpResponse; - import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.io.CharStreams; +import jakarta.inject.Singleton; +import org.jclouds.http.HttpResponse; /** * Created by dancc on 3/11/16. diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/CrumbParser.java b/src/main/java/com/cdancy/jenkins/rest/parsers/CrumbParser.java index c1697993..e3105439 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/CrumbParser.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/CrumbParser.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.Collection; -import javax.inject.Singleton; -import javax.ws.rs.core.HttpHeaders; +import jakarta.inject.Singleton; +import jakarta.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpResponse; import org.jclouds.util.Strings2; diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/FolderPathParser.java b/src/main/java/com/cdancy/jenkins/rest/parsers/FolderPathParser.java index 07c2109c..ef0d554d 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/FolderPathParser.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/FolderPathParser.java @@ -2,7 +2,7 @@ import com.google.common.base.Function; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /* * Turn the optionalFolderPath param to jenkins URL style diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/LocationToQueueId.java b/src/main/java/com/cdancy/jenkins/rest/parsers/LocationToQueueId.java index 78c0d0c0..d1a9e24b 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/LocationToQueueId.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/LocationToQueueId.java @@ -20,7 +20,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/OptionalFolderPathParser.java b/src/main/java/com/cdancy/jenkins/rest/parsers/OptionalFolderPathParser.java index 09f75275..ed64e662 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/OptionalFolderPathParser.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/OptionalFolderPathParser.java @@ -2,7 +2,7 @@ import com.google.common.base.Function; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /* * Turn the optionalFolderPath param to jenkins URL style diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/OutputToProgressiveText.java b/src/main/java/com/cdancy/jenkins/rest/parsers/OutputToProgressiveText.java index 4dcd8a80..42cf9be1 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/OutputToProgressiveText.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/OutputToProgressiveText.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.io.InputStreamReader; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/RequestStatusParser.java b/src/main/java/com/cdancy/jenkins/rest/parsers/RequestStatusParser.java index 38f491b1..da4a06ae 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/RequestStatusParser.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/RequestStatusParser.java @@ -19,7 +19,7 @@ import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.google.common.base.Function; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.jclouds.http.HttpResponse; /** diff --git a/src/main/java/com/cdancy/jenkins/rest/parsers/SystemInfoFromJenkinsHeaders.java b/src/main/java/com/cdancy/jenkins/rest/parsers/SystemInfoFromJenkinsHeaders.java index cb14ee04..315ce552 100644 --- a/src/main/java/com/cdancy/jenkins/rest/parsers/SystemInfoFromJenkinsHeaders.java +++ b/src/main/java/com/cdancy/jenkins/rest/parsers/SystemInfoFromJenkinsHeaders.java @@ -17,13 +17,10 @@ package com.cdancy.jenkins.rest.parsers; -import javax.inject.Singleton; - -import org.jclouds.http.HttpResponse; - import com.cdancy.jenkins.rest.domain.system.SystemInfo; - import com.google.common.base.Function; +import jakarta.inject.Singleton; +import org.jclouds.http.HttpResponse; /** * Created by dancc on 3/11/16. diff --git a/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsApiLiveTest.java index 3dff87a8..e98ddc59 100644 --- a/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsApiLiveTest.java @@ -16,7 +16,6 @@ */ package com.cdancy.jenkins.rest; -import com.cdancy.jenkins.rest.config.JenkinsAuthenticationModule; import static org.jclouds.util.Strings2.toStringAndClose; import java.io.IOException; @@ -24,16 +23,16 @@ import java.util.Properties; import java.util.UUID; +import com.cdancy.jenkins.rest.config.JenkinsAuthenticationModule; import com.cdancy.jenkins.rest.domain.job.BuildInfo; import com.cdancy.jenkins.rest.domain.queue.QueueItem; -import org.jclouds.Constants; -import org.jclouds.apis.BaseApiLiveTest; -import org.testng.annotations.Test; - import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; +import org.jclouds.Constants; +import org.jclouds.apis.BaseApiLiveTest; +import org.testng.annotations.Test; @Test(groups = "live") public class BaseJenkinsApiLiveTest extends BaseApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsMockTest.java b/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsMockTest.java index 68a91785..c01828d7 100644 --- a/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsMockTest.java @@ -17,22 +17,19 @@ package com.cdancy.jenkins.rest; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - import com.google.common.base.Functions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import com.google.gson.JsonParser; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import static org.assertj.core.api.Assertions.assertThat; -import static org.testng.Assert.assertEquals; - /** * Base class for all Jenkins mock tests. */ diff --git a/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsTest.java b/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsTest.java index afced72f..fed53bc2 100644 --- a/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/BaseJenkinsTest.java @@ -17,22 +17,21 @@ package com.cdancy.jenkins.rest; +import static org.jclouds.util.Strings2.toStringAndClose; + import java.io.IOException; import java.net.URL; import java.util.Objects; import java.util.Properties; -import org.jclouds.Constants; -import org.jclouds.ContextBuilder; -import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; -import static org.jclouds.util.Strings2.toStringAndClose; - -import com.cdancy.jenkins.rest.config.JenkinsAuthenticationModule; import com.cdancy.jenkins.rest.auth.AuthenticationType; - +import com.cdancy.jenkins.rest.config.JenkinsAuthenticationModule; import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.google.common.collect.Lists; +import org.jclouds.Constants; +import org.jclouds.ContextBuilder; +import org.jclouds.logging.slf4j.config.SLF4JLoggingModule; /** * Base class for Jenkins mock tests and some Live tests. diff --git a/src/test/java/com/cdancy/jenkins/rest/JenkinsApiMetadataTest.java b/src/test/java/com/cdancy/jenkins/rest/JenkinsApiMetadataTest.java index d33952cf..f15f37e8 100644 --- a/src/test/java/com/cdancy/jenkins/rest/JenkinsApiMetadataTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/JenkinsApiMetadataTest.java @@ -17,15 +17,15 @@ package com.cdancy.jenkins.rest; +import static org.testng.Assert.*; + +import java.util.HashSet; + import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.Apis; import org.jclouds.apis.internal.BaseApiMetadataTest; import org.testng.annotations.Test; -import java.util.HashSet; - -import static org.testng.Assert.*; - /** * Unit tests for the {@link JenkinsApiMetadata} class. */ diff --git a/src/test/java/com/cdancy/jenkins/rest/JenkinsAuthenticationMockTest.java b/src/test/java/com/cdancy/jenkins/rest/JenkinsAuthenticationMockTest.java index 82275e4c..b6fa911e 100644 --- a/src/test/java/com/cdancy/jenkins/rest/JenkinsAuthenticationMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/JenkinsAuthenticationMockTest.java @@ -17,13 +17,13 @@ package com.cdancy.jenkins.rest; +import static com.google.common.io.BaseEncoding.base64; +import static org.testng.Assert.assertEquals; + import com.cdancy.jenkins.rest.auth.AuthenticationType; import com.cdancy.jenkins.rest.exception.UndetectableIdentityException; import org.testng.annotations.Test; -import static com.google.common.io.BaseEncoding.base64; -import static org.testng.Assert.assertEquals; - public class JenkinsAuthenticationMockTest { @Test diff --git a/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiLiveTest.java index f08877f5..9e98805f 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiLiveTest.java @@ -16,14 +16,13 @@ */ package com.cdancy.jenkins.rest.features; -import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; import com.cdancy.jenkins.rest.domain.common.RequestStatus; import org.testng.annotations.Test; -import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; - @Test(groups = "live", testName = "ConfigurationAsCodeApiLiveTest", singleThreaded = true) public class ConfigurationAsCodeApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiMockTest.java index bf80e09d..0463d058 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/ConfigurationAsCodeApiMockTest.java @@ -16,6 +16,8 @@ */ package com.cdancy.jenkins.rest.features; +import static org.testng.Assert.*; + import com.cdancy.jenkins.rest.BaseJenkinsMockTest; import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.domain.common.RequestStatus; @@ -23,8 +25,6 @@ import okhttp3.mockwebserver.MockWebServer; import org.testng.annotations.Test; -import static org.testng.Assert.*; - /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.ConfigurationAsCodeApi} class. */ diff --git a/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiLiveTest.java index ecf1a007..3a42f979 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiLiveTest.java @@ -19,10 +19,9 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import org.testng.annotations.Test; - import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; import com.cdancy.jenkins.rest.domain.crumb.Crumb; +import org.testng.annotations.Test; @Test(groups = "live", testName = "CrumbIssuerApiLiveTest", singleThreaded = true) public class CrumbIssuerApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiMockTest.java index 43bec78c..57ad7a9c 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/CrumbIssuerApiMockTest.java @@ -16,17 +16,16 @@ */ package com.cdancy.jenkins.rest.features; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.testng.annotations.Test; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; -import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.BaseJenkinsMockTest; +import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.domain.crumb.Crumb; - -import javax.ws.rs.core.MediaType; - -import static org.testng.Assert.*; +import jakarta.ws.rs.core.MediaType; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.testng.annotations.Test; /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.CrumbIssuerApi} class. diff --git a/src/test/java/com/cdancy/jenkins/rest/features/JobsApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/JobsApiLiveTest.java index bb8013b5..197df668 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/JobsApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/JobsApiLiveTest.java @@ -16,6 +16,8 @@ */ package com.cdancy.jenkins.rest.features; +import static org.testng.Assert.*; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,8 +32,6 @@ import com.google.common.collect.Lists; import org.testng.annotations.Test; -import static org.testng.Assert.*; - @Test(groups = "live", testName = "JobsApiLiveTest", singleThreaded = true) public class JobsApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/JobsApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/JobsApiMockTest.java index 1a664755..e03d439b 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/JobsApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/JobsApiMockTest.java @@ -16,6 +16,12 @@ */ package com.cdancy.jenkins.rest.features; +import static org.testng.Assert.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.cdancy.jenkins.rest.BaseJenkinsMockTest; import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.domain.common.LongResponse; @@ -23,18 +29,11 @@ import com.cdancy.jenkins.rest.domain.job.*; import com.google.common.collect.Lists; import com.google.gson.JsonObject; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.testng.annotations.Test; -import javax.ws.rs.core.MediaType; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.testng.Assert.*; - /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.JobsApi} class. */ diff --git a/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiLiveTest.java index d217bc11..edd77f90 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiLiveTest.java @@ -16,15 +16,12 @@ */ package com.cdancy.jenkins.rest.features; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - -import org.testng.annotations.Test; +import static org.testng.Assert.*; import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.plugins.Plugins; +import org.testng.annotations.Test; @Test(groups = "live", testName = "PluginManagerApiLiveTest", singleThreaded = true) public class PluginManagerApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiMockTest.java index fe9f5da4..6fd1e38d 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/PluginManagerApiMockTest.java @@ -16,22 +16,18 @@ */ package com.cdancy.jenkins.rest.features; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertFalse; +import static org.testng.Assert.*; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.testng.annotations.Test; +import java.util.Map; -import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.BaseJenkinsMockTest; +import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.plugins.Plugins; import com.google.common.collect.Maps; - -import java.util.Map; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.testng.annotations.Test; /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.PluginManagerApi} class. diff --git a/src/test/java/com/cdancy/jenkins/rest/features/QueueApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/QueueApiLiveTest.java index 9ec9c938..4df46c0e 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/QueueApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/QueueApiLiveTest.java @@ -16,27 +16,21 @@ */ package com.cdancy.jenkins.rest.features; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import static org.testng.Assert.*; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; import com.cdancy.jenkins.rest.domain.common.LongResponse; import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.queue.QueueItem; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; @Test(groups = "live", testName = "QueueApiLiveTest", singleThreaded = true) public class QueueApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/QueueApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/QueueApiMockTest.java index 6a3408f6..ed95ba64 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/QueueApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/QueueApiMockTest.java @@ -16,25 +16,19 @@ */ package com.cdancy.jenkins.rest.features; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; +import static org.testng.Assert.*; import java.util.List; import java.util.Map; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.testng.annotations.Test; - -import com.cdancy.jenkins.rest.JenkinsApi; -import com.cdancy.jenkins.rest.domain.queue.QueueItem; import com.cdancy.jenkins.rest.BaseJenkinsMockTest; +import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.domain.common.RequestStatus; - +import com.cdancy.jenkins.rest.domain.queue.QueueItem; import com.google.common.collect.Maps; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.testng.annotations.Test; /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.QueueApi} class. diff --git a/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiLiveTest.java index b37e7ec3..e821b33a 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiLiveTest.java @@ -18,10 +18,9 @@ import static org.testng.Assert.assertNotNull; -import org.testng.annotations.Test; - import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; import com.cdancy.jenkins.rest.domain.statistics.OverallLoad; +import org.testng.annotations.Test; @Test(groups = "live", testName = "StatisticsApiLiveTest", singleThreaded = true) public class StatisticsApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiMockTest.java index 63d47313..f329d273 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/StatisticsApiMockTest.java @@ -18,14 +18,13 @@ import static org.testng.Assert.assertNotNull; +import com.cdancy.jenkins.rest.BaseJenkinsMockTest; +import com.cdancy.jenkins.rest.JenkinsApi; +import com.cdancy.jenkins.rest.domain.statistics.OverallLoad; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.testng.annotations.Test; -import com.cdancy.jenkins.rest.JenkinsApi; -import com.cdancy.jenkins.rest.domain.statistics.OverallLoad; -import com.cdancy.jenkins.rest.BaseJenkinsMockTest; - /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.StatisticsApi} * class. diff --git a/src/test/java/com/cdancy/jenkins/rest/features/SystemApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/SystemApiLiveTest.java index c753d639..46d6bd46 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/SystemApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/SystemApiLiveTest.java @@ -19,11 +19,10 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import com.cdancy.jenkins.rest.domain.common.RequestStatus; -import org.testng.annotations.Test; - import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; +import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.system.SystemInfo; +import org.testng.annotations.Test; @Test(groups = "live", testName = "SystemApiLiveTest", singleThreaded = true) public class SystemApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/SystemApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/SystemApiMockTest.java index a9bb9037..951cad8e 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/SystemApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/SystemApiMockTest.java @@ -16,22 +16,18 @@ */ package com.cdancy.jenkins.rest.features; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertFalse; +import static org.testng.Assert.*; +import com.cdancy.jenkins.rest.BaseJenkinsMockTest; +import com.cdancy.jenkins.rest.JenkinsApi; +import com.cdancy.jenkins.rest.JenkinsApiMetadata; import com.cdancy.jenkins.rest.domain.common.RequestStatus; +import com.cdancy.jenkins.rest.domain.system.SystemInfo; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.testng.annotations.Test; -import com.cdancy.jenkins.rest.JenkinsApi; -import com.cdancy.jenkins.rest.JenkinsApiMetadata; -import com.cdancy.jenkins.rest.domain.system.SystemInfo; -import com.cdancy.jenkins.rest.BaseJenkinsMockTest; - -import javax.ws.rs.core.MediaType; - /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.SystemApi} class. */ diff --git a/src/test/java/com/cdancy/jenkins/rest/features/UserApiLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/features/UserApiLiveTest.java index 1d0c2391..878bf59a 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/UserApiLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/UserApiLiveTest.java @@ -16,13 +16,14 @@ */ package com.cdancy.jenkins.rest.features; +import static org.testng.Assert.*; + import com.cdancy.jenkins.rest.BaseJenkinsApiLiveTest; import com.cdancy.jenkins.rest.domain.common.RequestStatus; -import com.cdancy.jenkins.rest.domain.user.*; +import com.cdancy.jenkins.rest.domain.user.ApiToken; +import com.cdancy.jenkins.rest.domain.user.User; import org.testng.annotations.Test; -import static org.testng.Assert.*; - @Test(groups = "live", testName = "UserApiLiveTest", singleThreaded = true) public class UserApiLiveTest extends BaseJenkinsApiLiveTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/features/UserApiMockTest.java b/src/test/java/com/cdancy/jenkins/rest/features/UserApiMockTest.java index a9b67004..10824c2c 100644 --- a/src/test/java/com/cdancy/jenkins/rest/features/UserApiMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/features/UserApiMockTest.java @@ -16,6 +16,8 @@ */ package com.cdancy.jenkins.rest.features; +import static org.testng.Assert.*; + import com.cdancy.jenkins.rest.BaseJenkinsMockTest; import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.domain.user.ApiToken; @@ -24,8 +26,6 @@ import okhttp3.mockwebserver.MockWebServer; import org.testng.annotations.Test; -import static org.testng.Assert.*; - /** * Mock tests for the {@link com.cdancy.jenkins.rest.features.JobsApi} class. */ diff --git a/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterLiveTest.java b/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterLiveTest.java index 6b5bb651..f0ce6b63 100644 --- a/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterLiveTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterLiveTest.java @@ -16,18 +16,18 @@ */ package com.cdancy.jenkins.rest.filters; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +import java.net.URL; + import com.cdancy.jenkins.rest.BaseJenkinsTest; import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.auth.AuthenticationType; import com.cdancy.jenkins.rest.domain.common.RequestStatus; import com.cdancy.jenkins.rest.domain.user.ApiToken; import com.cdancy.jenkins.rest.features.UserApi; - -import java.net.URL; - import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertNotNull; @Test(groups = "live", testName = "FilterApiLiveTest", singleThreaded = true) public class JenkinsAuthenticationFilterLiveTest extends BaseJenkinsTest { diff --git a/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterMockTest.java b/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterMockTest.java index 6e6aae81..2857547f 100644 --- a/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterMockTest.java +++ b/src/test/java/com/cdancy/jenkins/rest/filters/JenkinsAuthenticationFilterMockTest.java @@ -17,22 +17,19 @@ package com.cdancy.jenkins.rest.filters; -import javax.ws.rs.core.MediaType; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import com.cdancy.jenkins.rest.BaseJenkinsMockTest; import com.cdancy.jenkins.rest.JenkinsApi; import com.cdancy.jenkins.rest.JenkinsAuthentication; import com.cdancy.jenkins.rest.auth.AuthenticationType; -import com.cdancy.jenkins.rest.BaseJenkinsMockTest; - +import com.google.common.collect.Multimap; +import jakarta.ws.rs.core.MediaType; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.jclouds.http.HttpRequest; - import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import com.google.common.collect.Multimap; public class JenkinsAuthenticationFilterMockTest extends BaseJenkinsMockTest {