From c0233c19fb872e0a0d7bc67e3b31b7dead6b4c83 Mon Sep 17 00:00:00 2001 From: brig Date: Wed, 27 Dec 2023 01:20:44 +0100 Subject: [PATCH] cleanup --- .../concord/agent/cfg/GitConfiguration.java | 2 - .../concord/client/CreateSecretRequestV2.java | 1 - .../concord/client2/impl/HttpEntity.java | 1 - .../concord/it/server/AnsibleRetryIT.java | 1 - .../concord/it/server/ProjectTaskIT.java | 1 - .../it/tasks/suspendtest/Client1TestTask.java | 1 - .../concord/client/AbstractConcordTask.java | 53 ------------------- .../concord/client/ConcordTaskCommon.java | 1 - .../concord/plugins/file/v2/FilesTaskV2.java | 1 - .../concord/plugins/log/LoggingTaskV2.java | 1 - .../concord/policyengine/RuntimePolicy.java | 1 - .../concord/policyengine/RuntimeRule.java | 1 - .../repository/GitClientFetchTest.java | 2 - .../common/cfg/LoggingConfiguration.java | 2 - .../process/loader/model/SourceMap.java | 1 - .../v2/runner/StackTraceCollector.java | 1 - .../v2/runner/vm/CopyVariablesCommand.java | 2 +- .../runner/tasks/TaskCallInterceptorTest.java | 20 +++++++ .../filters/ConcordAuthenticationHandler.java | 1 - .../server/org/secret/SecretResource.java | 1 - .../org/secret/SecretResourceUtils.java | 1 - .../store/concord/ConcordSecretStore.java | 2 - .../checkpoint/ProcessCheckpointResource.java | 2 - .../ProcessCheckpointV2Resource.java | 2 - .../process/event/ProcessEventResource.java | 3 -- .../server/process/form/FormResourceV1.java | 3 -- .../server/process/form/FormResourceV2.java | 2 - .../server/process/locks/LockResult.java | 2 - .../server/process/locks/ProcessLocksDao.java | 1 - .../process/locks/ProcessLocksResource.java | 2 - .../server/process/logs/ProcessLogsDao.java | 1 - .../process/waits/ProcessWaitManager.java | 2 - .../waits/WaitProcessStatusListener.java | 2 - .../server/security/ldap/UserLdapGroup.java | 1 - .../concord/server/user/UserResourceV2.java | 1 - .../plugins/pfedsso/RedirectHelper.java | 1 - .../plugins/pfedsso/SsoConfiguration.java | 3 -- .../concord/server/sdk/ProcessKey.java | 2 - 38 files changed, 21 insertions(+), 107 deletions(-) diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java index 85bdcab673..95b5e21b5b 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java @@ -23,8 +23,6 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.time.Duration; import static com.walmartlabs.concord.agent.cfg.Utils.getStringOrDefault; diff --git a/client/src/main/java/com/walmartlabs/concord/client/CreateSecretRequestV2.java b/client/src/main/java/com/walmartlabs/concord/client/CreateSecretRequestV2.java index e652b47c24..af7056b172 100644 --- a/client/src/main/java/com/walmartlabs/concord/client/CreateSecretRequestV2.java +++ b/client/src/main/java/com/walmartlabs/concord/client/CreateSecretRequestV2.java @@ -24,7 +24,6 @@ import org.immutables.value.Value; import javax.annotation.Nullable; -import java.nio.file.Path; import java.util.List; import java.util.UUID; diff --git a/client2/src/main/java/com/walmartlabs/concord/client2/impl/HttpEntity.java b/client2/src/main/java/com/walmartlabs/concord/client2/impl/HttpEntity.java index 6dc56c8b0a..eb81cbb698 100644 --- a/client2/src/main/java/com/walmartlabs/concord/client2/impl/HttpEntity.java +++ b/client2/src/main/java/com/walmartlabs/concord/client2/impl/HttpEntity.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; public interface HttpEntity { diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleRetryIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleRetryIT.java index f99a23a96e..e158779fbd 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleRetryIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleRetryIT.java @@ -25,7 +25,6 @@ import com.walmartlabs.concord.client2.StartProcessResponse; import org.junit.jupiter.api.Test; -import java.io.File; import java.io.InputStream; import java.net.URI; diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/ProjectTaskIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/ProjectTaskIT.java index 2608f1d548..71d5836409 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/ProjectTaskIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/ProjectTaskIT.java @@ -20,7 +20,6 @@ * ===== */ -import com.walmartlabs.concord.client2.ProcessApi; import com.walmartlabs.concord.client2.ProcessEntry; import com.walmartlabs.concord.client2.StartProcessResponse; import com.walmartlabs.concord.common.IOUtils; diff --git a/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java b/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java index 95fc7d15d1..7ae5f0027f 100644 --- a/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java +++ b/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java @@ -20,7 +20,6 @@ * ===== */ -import com.walmartlabs.concord.ApiClient; import com.walmartlabs.concord.client.ApiClientConfiguration; import com.walmartlabs.concord.client.ApiClientFactory; import com.walmartlabs.concord.client.ProcessApi; diff --git a/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/AbstractConcordTask.java b/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/AbstractConcordTask.java index 4e9f7ec677..4ad054c1a1 100644 --- a/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/AbstractConcordTask.java +++ b/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/AbstractConcordTask.java @@ -20,7 +20,6 @@ * ===== */ -import com.fasterxml.jackson.databind.ObjectMapper; import com.walmartlabs.concord.client2.*; import com.walmartlabs.concord.sdk.ApiConfiguration; import com.walmartlabs.concord.sdk.Context; @@ -36,8 +35,6 @@ public abstract class AbstractConcordTask implements Task { - private final ObjectMapper objectMapper = new ObjectMapper(); - protected static final String API_KEY = "apiKey"; @Inject @@ -64,56 +61,6 @@ protected T withClient(Context ctx, boolean withApiKey, CheckedFunction T request(Context ctx, String uri, String method, Map input, Class entityType) throws Exception { -// return withClient(ctx, client -> { -// RequestBody request = input != null ? ClientUtils.createMultipartBody(input).build() : null; -// -// Request.Builder b = new Request.Builder() -// .url(client.getBasePath() + uri) -// .header("Accept", "*/*") -// .method(method, request); -// -// // we're going to use the "raw" OkHttpClient, so we need to set up the auth manually -// String apiKey = getApiKey(ctx); -// if (apiKey != null) { -// b.header("Authorization", apiKey); -// } else { -// b.header(Constants.Headers.SESSION_TOKEN, apiCfg.getSessionToken(ctx)); -// } -// -// OkHttpClient ok = client.getHttpClient(); -// Response resp = ok.newCall(b.build()).execute(); -// assertResponse(resp); -// -// if (resp.code() == 204) { // HTTP "No Content" -// return null; -// } -// -// try (ResponseBody body = resp.body()) { -// return objectMapper.readValue(body.byteStream(), entityType); -// } -// }); -// } -// -// protected void assertResponse(Response resp) throws IOException { -// int code = resp.code(); -// if (code < 200 || code >= 400) { -// try (ResponseBody body = resp.body()) { -// if (isJson(resp)) { -// Object details = objectMapper.readValue(body.byteStream(), Object.class); -// String msg = extractMessage(details); -// throw new IOException(msg); -// } else { -// if (code == 401) { -// throw new IOException("Request error: " + code + ", please verify the credentials used"); -// } else { -// throw new IOException("Request error: " + code); -// } -// } -// } -// } -// } - private String getApiKey(Context ctx) { return (String) ctx.getVariable(API_KEY); } diff --git a/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/ConcordTaskCommon.java b/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/ConcordTaskCommon.java index 9febe71be2..cab7964d6a 100644 --- a/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/ConcordTaskCommon.java +++ b/plugins/tasks/concord/src/main/java/com/walmartlabs/concord/client/ConcordTaskCommon.java @@ -31,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/plugins/tasks/files/src/main/java/com/walmartlabs/concord/plugins/file/v2/FilesTaskV2.java b/plugins/tasks/files/src/main/java/com/walmartlabs/concord/plugins/file/v2/FilesTaskV2.java index 0b623606dc..9ebc701baf 100644 --- a/plugins/tasks/files/src/main/java/com/walmartlabs/concord/plugins/file/v2/FilesTaskV2.java +++ b/plugins/tasks/files/src/main/java/com/walmartlabs/concord/plugins/file/v2/FilesTaskV2.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.nio.file.StandardCopyOption; @Named("files") diff --git a/plugins/tasks/log/src/main/java/com/walmartlabs/concord/plugins/log/LoggingTaskV2.java b/plugins/tasks/log/src/main/java/com/walmartlabs/concord/plugins/log/LoggingTaskV2.java index f5b6c076bb..87b2e54ca1 100644 --- a/plugins/tasks/log/src/main/java/com/walmartlabs/concord/plugins/log/LoggingTaskV2.java +++ b/plugins/tasks/log/src/main/java/com/walmartlabs/concord/plugins/log/LoggingTaskV2.java @@ -25,7 +25,6 @@ import com.walmartlabs.concord.runtime.v2.sdk.Variables; import javax.inject.Named; -import java.io.Serializable; @Named("log") public class LoggingTaskV2 implements Task { diff --git a/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimePolicy.java b/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimePolicy.java index f6e8c46f2e..8eadae62fc 100644 --- a/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimePolicy.java +++ b/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimePolicy.java @@ -23,7 +23,6 @@ import java.time.LocalTime; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import java.util.Objects; import java.util.function.Supplier; public class RuntimePolicy { diff --git a/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimeRule.java b/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimeRule.java index d5fc979155..090ed78c97 100644 --- a/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimeRule.java +++ b/policy-engine/src/main/java/com/walmartlabs/concord/policyengine/RuntimeRule.java @@ -30,7 +30,6 @@ import javax.annotation.Nullable; import java.io.Serializable; import java.time.LocalDate; -import java.time.OffsetDateTime; import java.util.Set; @Value.Immutable diff --git a/repository/src/test/java/com/walmartlabs/concord/repository/GitClientFetchTest.java b/repository/src/test/java/com/walmartlabs/concord/repository/GitClientFetchTest.java index 3d993a96e7..c31ae7a9fd 100644 --- a/repository/src/test/java/com/walmartlabs/concord/repository/GitClientFetchTest.java +++ b/repository/src/test/java/com/walmartlabs/concord/repository/GitClientFetchTest.java @@ -25,12 +25,10 @@ import com.walmartlabs.concord.sdk.Secret; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; -import org.eclipse.jgit.api.errors.InvalidRefNameException; import org.eclipse.jgit.revwalk.RevCommit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/runtime/common/src/main/java/com/walmartlabs/concord/runtime/common/cfg/LoggingConfiguration.java b/runtime/common/src/main/java/com/walmartlabs/concord/runtime/common/cfg/LoggingConfiguration.java index 45bd25415c..87fc6a6df6 100644 --- a/runtime/common/src/main/java/com/walmartlabs/concord/runtime/common/cfg/LoggingConfiguration.java +++ b/runtime/common/src/main/java/com/walmartlabs/concord/runtime/common/cfg/LoggingConfiguration.java @@ -25,8 +25,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.immutables.value.Value; -import javax.annotation.Nullable; - @Value.Immutable @Value.Style(jdkOnly = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/runtime/loader/src/main/java/com/walmartlabs/concord/process/loader/model/SourceMap.java b/runtime/loader/src/main/java/com/walmartlabs/concord/process/loader/model/SourceMap.java index 2123575cb4..1a10ae29cc 100644 --- a/runtime/loader/src/main/java/com/walmartlabs/concord/process/loader/model/SourceMap.java +++ b/runtime/loader/src/main/java/com/walmartlabs/concord/process/loader/model/SourceMap.java @@ -20,7 +20,6 @@ * ===== */ -import com.fasterxml.jackson.core.JsonLocation; import com.walmartlabs.concord.runtime.v2.model.Location; import org.immutables.serial.Serial; import org.immutables.value.Value; diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/StackTraceCollector.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/StackTraceCollector.java index 74e60e916c..da57f6760c 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/StackTraceCollector.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/StackTraceCollector.java @@ -23,7 +23,6 @@ import com.walmartlabs.concord.runtime.v2.model.FlowCall; import com.walmartlabs.concord.runtime.v2.model.Location; import com.walmartlabs.concord.runtime.v2.runner.vm.FlowCallCommand; -import com.walmartlabs.concord.runtime.v2.runner.vm.VMUtils; import com.walmartlabs.concord.svm.Runtime; import com.walmartlabs.concord.svm.*; diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/CopyVariablesCommand.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/CopyVariablesCommand.java index d68b2952d5..cca35d1f94 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/CopyVariablesCommand.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/CopyVariablesCommand.java @@ -32,7 +32,7 @@ */ public class CopyVariablesCommand implements Command { - public interface FrameProducer extends BiFunction, Serializable {}; + public interface FrameProducer extends BiFunction, Serializable {} private static final long serialVersionUID = 1L; diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java index 4772fac1b5..2192fe2cd8 100644 --- a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java @@ -1,5 +1,25 @@ package com.walmartlabs.concord.runtime.v2.runner.tasks; +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + import org.junit.Test; import java.util.Arrays; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/boot/filters/ConcordAuthenticationHandler.java b/server/impl/src/main/java/com/walmartlabs/concord/server/boot/filters/ConcordAuthenticationHandler.java index a0d6ac71cc..dde523dd36 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/boot/filters/ConcordAuthenticationHandler.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/boot/filters/ConcordAuthenticationHandler.java @@ -27,7 +27,6 @@ import com.walmartlabs.concord.server.security.apikey.ApiKeyDao; import com.walmartlabs.concord.server.security.apikey.ApiKeyEntry; import com.walmartlabs.concord.server.security.sessionkey.SessionKey; -import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.support.DefaultSubjectContext; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java index f37c38afb1..8d09c56f5d 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResource.java @@ -38,7 +38,6 @@ import io.swagger.v3.oas.annotations.headers.Header; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceUtils.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceUtils.java index 012c2c0d02..f4bd6427f2 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceUtils.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretResourceUtils.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import java.util.stream.Collectors; public final class SecretResourceUtils { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java index 7ca1313cc1..8a2430fe0e 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java @@ -26,8 +26,6 @@ import org.jooq.DSLContext; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.util.UUID; public class ConcordSecretStore implements SecretStore { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java index 4f2123351b..9832455b6e 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java @@ -33,9 +33,7 @@ import com.walmartlabs.concord.server.sdk.metrics.WithTimer; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.tags.Tag; import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.slf4j.Logger; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java index ab2005f0a4..45a623adfb 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java @@ -33,8 +33,6 @@ import org.sonatype.siesta.Resource; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import java.util.UUID; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java index a788a455b1..15b52deec4 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java @@ -33,14 +33,11 @@ import com.walmartlabs.concord.server.security.Roles; import com.walmartlabs.concord.server.security.UserPrincipal; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.shiro.authz.UnauthorizedException; import org.sonatype.siesta.Resource; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV1.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV1.java index 4639120c53..a77773a2af 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV1.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV1.java @@ -28,7 +28,6 @@ import com.walmartlabs.concord.server.sdk.ConcordApplicationException; import com.walmartlabs.concord.server.sdk.PartialProcessKey; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.takari.bpm.form.Form; import io.takari.bpm.model.form.FormDefinition; @@ -36,8 +35,6 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response.Status; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV2.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV2.java index a749812294..0f6005623e 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV2.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResourceV2.java @@ -29,8 +29,6 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.core.Response.Status; import java.io.Serializable; import java.util.*; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/LockResult.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/LockResult.java index c155b94038..d1b3c6f29b 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/LockResult.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/LockResult.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import io.swagger.v3.oas.annotations.media.Schema; import org.immutables.value.Value; @Value.Immutable @@ -32,7 +31,6 @@ public interface LockResult { LockEntry info(); -// @Schema(description = "is lock acquired?", required = true) boolean acquired(); static ImmutableLockResult.Builder builder() { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksDao.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksDao.java index f2d5b339a4..0a474390dc 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksDao.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksDao.java @@ -31,7 +31,6 @@ import org.jooq.SelectConditionStep; import javax.inject.Inject; -import javax.inject.Named; import java.util.UUID; import static com.walmartlabs.concord.server.jooq.Tables.PROCESS_LOCKS; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java index f08b22eaaa..2a8718675c 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java @@ -32,8 +32,6 @@ import org.sonatype.siesta.Resource; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/logs/ProcessLogsDao.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/logs/ProcessLogsDao.java index f10e0e84b2..d41ee934c3 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/logs/ProcessLogsDao.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/logs/ProcessLogsDao.java @@ -31,7 +31,6 @@ import org.jooq.*; import javax.inject.Inject; -import javax.inject.Named; import java.io.Serializable; import java.time.OffsetDateTime; import java.util.List; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/ProcessWaitManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/ProcessWaitManager.java index 6ec4a12dd6..abd6fdcc60 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/ProcessWaitManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/ProcessWaitManager.java @@ -30,8 +30,6 @@ import org.jooq.DSLContext; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java index a14d736869..2c21a71956 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java @@ -25,8 +25,6 @@ import com.walmartlabs.concord.server.sdk.ProcessStatus; import org.jooq.DSLContext; -import javax.inject.Named; - import static com.walmartlabs.concord.server.jooq.Tables.PROCESS_WAIT_CONDITIONS; public class WaitProcessStatusListener implements ProcessStatusListener { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/UserLdapGroup.java b/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/UserLdapGroup.java index 46868c0c5b..a68b5fa27f 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/UserLdapGroup.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/UserLdapGroup.java @@ -28,7 +28,6 @@ import com.walmartlabs.concord.server.user.UserManager; import com.walmartlabs.concord.server.user.UserType; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.shiro.authz.UnauthorizedException; import org.sonatype.siesta.Resource; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/user/UserResourceV2.java b/server/impl/src/main/java/com/walmartlabs/concord/server/user/UserResourceV2.java index dcae1bb14f..1778e61ee0 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/user/UserResourceV2.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/user/UserResourceV2.java @@ -22,7 +22,6 @@ import com.walmartlabs.concord.server.sdk.metrics.WithTimer; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.sonatype.siesta.Resource; import org.sonatype.siesta.ValidationErrorsException; diff --git a/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/RedirectHelper.java b/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/RedirectHelper.java index 1d725851a4..fe25ddcf63 100644 --- a/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/RedirectHelper.java +++ b/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/RedirectHelper.java @@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; diff --git a/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoConfiguration.java b/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoConfiguration.java index 880e3fce09..75a30ef06d 100644 --- a/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoConfiguration.java +++ b/server/plugins/pfed-sso/src/main/java/com/walmartlabs/concord/server/plugins/pfedsso/SsoConfiguration.java @@ -26,10 +26,7 @@ import javax.inject.Inject; import java.io.Serializable; import java.time.Duration; -import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; public class SsoConfiguration implements Serializable { diff --git a/server/sdk/src/main/java/com/walmartlabs/concord/server/sdk/ProcessKey.java b/server/sdk/src/main/java/com/walmartlabs/concord/server/sdk/ProcessKey.java index 7d422fb64c..3d3cffc145 100644 --- a/server/sdk/src/main/java/com/walmartlabs/concord/server/sdk/ProcessKey.java +++ b/server/sdk/src/main/java/com/walmartlabs/concord/server/sdk/ProcessKey.java @@ -28,8 +28,6 @@ import java.util.Objects; import java.util.UUID; -import static java.time.temporal.ChronoField.NANO_OF_SECOND; - /** * Composite key of a process. Identifies process resources in partitioned tables. * @apiNote the "createdAt" portion of the key must be truncated to microseconds.