diff --git a/docs/index.md b/docs/index.md index fcf623c..2302563 100644 --- a/docs/index.md +++ b/docs/index.md @@ -16,7 +16,7 @@ Example: io.adobe.cloudmanager aio-lib-cloudmanager - 0.3.1-SNAPSHOT + 0.4.1-SNAPSHOT ``` @@ -27,7 +27,7 @@ The default library is Java11, to use the Java8 library, use the classifier. io.adobe.cloudmanager aio-lib-cloudmanager - 0.3.1-SNAPSHOT + 0.4.1-SNAPSHOT java8 ``` @@ -38,7 +38,7 @@ To make API calls into Cloud Manager, a JWT Token is required. This is created u ```java -PrivateKey privateKey; +PrivateKey privateKey; // Load the private key... diff --git a/pom.xml b/pom.xml index 0048f12..ca42668 100644 --- a/pom.xml +++ b/pom.xml @@ -62,21 +62,25 @@ - 0.11.2 - 5.7.0 - - 2.0.10 - 3.0.22 - 2.29.1 - 2.10.0 + UTF-8 + UTF-8 ${project.basedir}/src/main/resources/swagger/jwt.yaml https://raw.githubusercontent.com/AdobeDocs/cloudmanager-api-docs/master/swagger-specs/api.yaml https://raw.githubusercontent.com/AdobeDocs/cloudmanager-api-docs/master/swagger-specs/events.yaml - UTF-8 - UTF-8 + 0.11.2 + 5.7.0 + + 3.0.22 + + + 2.0.0 + 2.29.1 + 2.10.1 + + @@ -94,9 +98,9 @@ ${jwt.api} - ${project.groupId}.jwt.swagger.model - ${project.groupId}.jwt.swagger.api - ${project.groupId}.jwt.swagger.invoker + ${project.groupId}.jwt.generated.model + ${project.groupId}.jwt.generated.api + ${project.groupId}.jwt.generated.invoker false false false @@ -116,9 +120,9 @@ ${cm.api} - ${project.groupId}.swagger.model - ${project.groupId}.swagger.api - ${project.groupId}.swagger.invoker + ${project.groupId}.generated.model + ${project.groupId}.generated.api + ${project.groupId}.generated.invoker false false false @@ -138,7 +142,7 @@ ${cm.events} - ${project.groupId}.swagger.events + ${project.groupId}.generated.events false false false @@ -217,7 +221,7 @@ jacoco-maven-plugin - io/adobe/cloudmanager/**/swagger/**/*class + io/adobe/cloudmanager/**/generated/**/*.class @@ -403,77 +407,57 @@ - + io.swagger.core.v3 swagger-annotations - ${swagger.annotations.version} + ${swagger-core-version} org.glassfish.jersey.core jersey-client - ${jersey.version} + ${jersey-version} org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} + jersey-media-multipart + ${jersey-version} org.glassfish.jersey.media - jersey-media-multipart - ${jersey.version} + jersey-media-json-jackson + ${jersey-version} org.glassfish.jersey.inject jersey-hk2 - ${jersey.version} + ${jersey-version} + - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson.version} - com.fasterxml.jackson.core jackson-core - ${jackson.version} + ${jackson-version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + ${jackson-version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} + ${jackson-version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} - - - - - com.brsanthu - migbase64 - 2.2 + ${jackson-version} + io.jsonwebtoken diff --git a/src/doc/resources/index.md b/src/doc/resources/index.md index e3e5ce9..0cb1893 100644 --- a/src/doc/resources/index.md +++ b/src/doc/resources/index.md @@ -38,17 +38,18 @@ To make API calls into Cloud Manager, a JWT Token is required. This is created u ```java -PrivateKey privateKey; +PrivateKey privateKey; -// Load the private key +// Load the private key... // Values are from the API Integration configuration. AdobeClientCredentials org = new AdobeClientCredentials("Org Id", "Technical Account Id", "API Key", "Client Secret", privateKey); -String token = org.authenticate(org); +IdentityManagementApi imApi = new IdentityManagementApiImpl(); +String token = imApi.authenticate(org); ``` -Use the token returned from the authentication API to instantiate the Cloud Manager API. Then make the desired requests: +Use the token returned from the IdentityManagementApi to instantiate the Cloud Manager API. Then make the desired requests: ```java diff --git a/src/main/java/io/adobe/cloudmanager/AdobeClientCredentials.java b/src/main/java/io/adobe/cloudmanager/AdobeClientCredentials.java index 66d1ab3..8660356 100644 --- a/src/main/java/io/adobe/cloudmanager/AdobeClientCredentials.java +++ b/src/main/java/io/adobe/cloudmanager/AdobeClientCredentials.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/io/adobe/cloudmanager/CloudManagerApi.java b/src/main/java/io/adobe/cloudmanager/CloudManagerApi.java index bf9c437..a5fcdf9 100644 --- a/src/main/java/io/adobe/cloudmanager/CloudManagerApi.java +++ b/src/main/java/io/adobe/cloudmanager/CloudManagerApi.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import io.adobe.cloudmanager.model.PipelineExecution; import io.adobe.cloudmanager.model.PipelineExecutionStepState; import io.adobe.cloudmanager.model.Variable; -import io.adobe.cloudmanager.swagger.model.PipelineStepMetrics; +import io.adobe.cloudmanager.generated.model.PipelineStepMetrics; /** * API for interacting with Cloud Manager AdobeIO endpoints. diff --git a/src/main/java/io/adobe/cloudmanager/CloudManagerApiException.java b/src/main/java/io/adobe/cloudmanager/CloudManagerApiException.java index 26b0a2b..44c3047 100644 --- a/src/main/java/io/adobe/cloudmanager/CloudManagerApiException.java +++ b/src/main/java/io/adobe/cloudmanager/CloudManagerApiException.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.adobe.cloudmanager.impl.ConfiguredApiClient; -import io.adobe.cloudmanager.swagger.invoker.ApiException; +import io.adobe.cloudmanager.generated.invoker.ApiException; /** * Represents exception states that may occur during interactions with the AdobeIO API. diff --git a/src/main/java/io/adobe/cloudmanager/IdentityManagementApi.java b/src/main/java/io/adobe/cloudmanager/IdentityManagementApi.java index 97e4100..2f3ae65 100644 --- a/src/main/java/io/adobe/cloudmanager/IdentityManagementApi.java +++ b/src/main/java/io/adobe/cloudmanager/IdentityManagementApi.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/io/adobe/cloudmanager/IdentityManagementApiException.java b/src/main/java/io/adobe/cloudmanager/IdentityManagementApiException.java index 9ade66d..dc4238c 100644 --- a/src/main/java/io/adobe/cloudmanager/IdentityManagementApiException.java +++ b/src/main/java/io/adobe/cloudmanager/IdentityManagementApiException.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/io/adobe/cloudmanager/PipelineUpdate.java b/src/main/java/io/adobe/cloudmanager/PipelineUpdate.java index 317adf4..8f57876 100644 --- a/src/main/java/io/adobe/cloudmanager/PipelineUpdate.java +++ b/src/main/java/io/adobe/cloudmanager/PipelineUpdate.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/io/adobe/cloudmanager/impl/CloudManagerApiImpl.java b/src/main/java/io/adobe/cloudmanager/impl/CloudManagerApiImpl.java index bb64784..c37253f 100644 --- a/src/main/java/io/adobe/cloudmanager/impl/CloudManagerApiImpl.java +++ b/src/main/java/io/adobe/cloudmanager/impl/CloudManagerApiImpl.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,20 +50,20 @@ import io.adobe.cloudmanager.model.PipelineExecution; import io.adobe.cloudmanager.model.PipelineExecutionStepState; import io.adobe.cloudmanager.model.Variable; -import io.adobe.cloudmanager.swagger.invoker.ApiClient; -import io.adobe.cloudmanager.swagger.invoker.ApiException; -import io.adobe.cloudmanager.swagger.invoker.Pair; -import io.adobe.cloudmanager.swagger.model.EnvironmentList; -import io.adobe.cloudmanager.swagger.model.EnvironmentLogs; -import io.adobe.cloudmanager.swagger.model.HalLink; -import io.adobe.cloudmanager.swagger.model.PipelineExecutionEmbedded; -import io.adobe.cloudmanager.swagger.model.PipelineList; -import io.adobe.cloudmanager.swagger.model.PipelinePhase; -import io.adobe.cloudmanager.swagger.model.PipelineStepMetrics; -import io.adobe.cloudmanager.swagger.model.Program; -import io.adobe.cloudmanager.swagger.model.ProgramList; -import io.adobe.cloudmanager.swagger.model.Redirect; -import io.adobe.cloudmanager.swagger.model.VariableList; +import io.adobe.cloudmanager.generated.invoker.ApiClient; +import io.adobe.cloudmanager.generated.invoker.ApiException; +import io.adobe.cloudmanager.generated.invoker.Pair; +import io.adobe.cloudmanager.generated.model.EnvironmentList; +import io.adobe.cloudmanager.generated.model.EnvironmentLogs; +import io.adobe.cloudmanager.generated.model.HalLink; +import io.adobe.cloudmanager.generated.model.PipelineExecutionEmbedded; +import io.adobe.cloudmanager.generated.model.PipelineList; +import io.adobe.cloudmanager.generated.model.PipelinePhase; +import io.adobe.cloudmanager.generated.model.PipelineStepMetrics; +import io.adobe.cloudmanager.generated.model.Program; +import io.adobe.cloudmanager.generated.model.ProgramList; +import io.adobe.cloudmanager.generated.model.Redirect; +import io.adobe.cloudmanager.generated.model.VariableList; import io.adobe.cloudmanager.util.Predicates; import static io.adobe.cloudmanager.CloudManagerApiException.*; @@ -144,9 +144,9 @@ public PipelineExecution startExecution(String programId, String pipelineId) thr @Override public PipelineExecution startExecution(Pipeline pipeline) throws CloudManagerApiException { String executionHref = pipeline.getLinks().getHttpnsAdobeComadobecloudrelexecution().getHref(); - io.adobe.cloudmanager.swagger.model.PipelineExecution execution = null; + io.adobe.cloudmanager.generated.model.PipelineExecution execution = null; try { - execution = put(executionHref, new GenericType() {}); + execution = put(executionHref, new GenericType() {}); } catch (ApiException e) { if (412 == e.getCode()) { throw new CloudManagerApiException(ErrorType.PIPELINE_START_RUNNING); @@ -164,7 +164,7 @@ public Pipeline updatePipeline(String programId, String pipelineId, PipelineUpda @Override public Pipeline updatePipeline(Pipeline original, PipelineUpdate updates) throws CloudManagerApiException { - io.adobe.cloudmanager.swagger.model.Pipeline toUpdate = new io.adobe.cloudmanager.swagger.model.Pipeline(); + io.adobe.cloudmanager.generated.model.Pipeline toUpdate = new io.adobe.cloudmanager.generated.model.Pipeline(); PipelinePhase buildPhase = original.getPhases().stream().filter(p -> PipelinePhase.TypeEnum.BUILD == p.getType()) .findFirst().orElseThrow(() -> new CloudManagerApiException(ErrorType.NO_BUILD_PHASE, original.getId())); if (updates.getBranch() != null) { @@ -178,7 +178,7 @@ public Pipeline updatePipeline(Pipeline original, PipelineUpdate updates) throws String pipelinePath = original.getLinks().getSelf().getHref(); try { - io.adobe.cloudmanager.swagger.model.Pipeline result = patch(pipelinePath, toUpdate, new GenericType() {}); + io.adobe.cloudmanager.generated.model.Pipeline result = patch(pipelinePath, toUpdate, new GenericType() {}); return new Pipeline(result, this); } catch (ApiException e) { throw new CloudManagerApiException(ErrorType.UPDATE_PIPELINE, baseUrl, pipelinePath, e); @@ -246,7 +246,7 @@ public PipelineExecution getCurrentExecution(String programId, String pipelineId Pipeline pipeline = getPipeline(programId, pipelineId); String executionHref = pipeline.getLinks().getHttpnsAdobeComadobecloudrelexecution().getHref(); try { - io.adobe.cloudmanager.swagger.model.PipelineExecution execution = get(executionHref, new GenericType() {}); + io.adobe.cloudmanager.generated.model.PipelineExecution execution = get(executionHref, new GenericType() {}); return new PipelineExecution(execution, this); } catch (ApiException e) { throw new CloudManagerApiException(ErrorType.GET_EXECUTION, baseUrl, executionHref, e); @@ -275,7 +275,7 @@ public PipelineExecution getExecution(Pipeline pipeline, String executionId) thr values.put("executionId", executionId); String executionHref = processTemplate(pipeline.getLinks().getHttpnsAdobeComadobecloudrelexecutionid().getHref(), values); try { - io.adobe.cloudmanager.swagger.model.PipelineExecution execution = get(executionHref, new GenericType() {}); + io.adobe.cloudmanager.generated.model.PipelineExecution execution = get(executionHref, new GenericType() {}); return new PipelineExecution(execution, this); } catch (ApiException e) { throw new CloudManagerApiException(ErrorType.GET_EXECUTION, baseUrl, executionHref, e); @@ -314,7 +314,7 @@ public void advanceExecution(PipelineExecution execution) throws CloudManagerApi @Override public PipelineExecutionStepState getExecutionStepState(PipelineExecution execution, String action) throws CloudManagerApiException { - io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState stepState = execution.getEmbedded().getStepStates() + io.adobe.cloudmanager.generated.model.PipelineExecutionStepState stepState = execution.getEmbedded().getStepStates() .stream() .filter(s -> s.getAction().equals(action)) .findFirst() @@ -397,7 +397,7 @@ public PipelineExecutionStepState getCurrentStep(PipelineExecution execution) th if (embeddeds == null || embeddeds.getStepStates().isEmpty()) { throw new CloudManagerApiException(ErrorType.FIND_CURRENT_STEP, execution.getPipelineId()); } - io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState step = embeddeds.getStepStates().stream().filter(Predicates.IS_CURRENT) + io.adobe.cloudmanager.generated.model.PipelineExecutionStepState step = embeddeds.getStepStates().stream().filter(Predicates.IS_CURRENT) .findFirst().orElseThrow(() -> new CloudManagerApiException(ErrorType.FIND_CURRENT_STEP, execution.getPipelineId())); return new PipelineExecutionStepState(step, this); } @@ -408,7 +408,7 @@ public PipelineExecutionStepState getWaitingStep(PipelineExecution execution) th if (embeddeds == null || embeddeds.getStepStates().isEmpty()) { throw new CloudManagerApiException(ErrorType.FIND_WAITING_STEP, execution.getPipelineId()); } - io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState step = embeddeds.getStepStates().stream().filter(Predicates.IS_WAITING) + io.adobe.cloudmanager.generated.model.PipelineExecutionStepState step = embeddeds.getStepStates().stream().filter(Predicates.IS_WAITING) .findFirst().orElseThrow(() -> new CloudManagerApiException(ErrorType.FIND_WAITING_STEP, execution.getPipelineId())); return new PipelineExecutionStepState(step, this); } @@ -442,13 +442,13 @@ public List downloadLogs(Environment environment, String service String logHref = processTemplate(logLink.getHref(), values); EnvironmentLogs logs = getLogs(logHref); - List downloads = logs.getEmbedded().getDownloads(); + List downloads = logs.getEmbedded().getDownloads(); List downloaded = new ArrayList<>(); if (downloads == null || downloads.isEmpty()) { return Collections.emptyList(); } else { - for (io.adobe.cloudmanager.swagger.model.EnvironmentLog d : downloads) { + for (io.adobe.cloudmanager.generated.model.EnvironmentLog d : downloads) { EnvironmentLog log = new EnvironmentLog(d); String logfileName = String.format("%d-%s-%s-%s.log.gz", log.getEnvironmentId(), log.getService(), log.getName(), log.getDate()); log.setPath(dir.getPath() + "/" + logfileName); diff --git a/src/main/java/io/adobe/cloudmanager/impl/ConfiguredApiClient.java b/src/main/java/io/adobe/cloudmanager/impl/ConfiguredApiClient.java index 19c9b0f..5c1ed03 100644 --- a/src/main/java/io/adobe/cloudmanager/impl/ConfiguredApiClient.java +++ b/src/main/java/io/adobe/cloudmanager/impl/ConfiguredApiClient.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ * #L% */ -import io.adobe.cloudmanager.swagger.invoker.ApiClient; +import io.adobe.cloudmanager.generated.invoker.ApiClient; import javax.ws.rs.core.Response; import java.util.Collections; diff --git a/src/main/java/io/adobe/cloudmanager/impl/IdentityManagementApiImpl.java b/src/main/java/io/adobe/cloudmanager/impl/IdentityManagementApiImpl.java index e84e61d..42553a0 100644 --- a/src/main/java/io/adobe/cloudmanager/impl/IdentityManagementApiImpl.java +++ b/src/main/java/io/adobe/cloudmanager/impl/IdentityManagementApiImpl.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,10 +29,10 @@ import io.adobe.cloudmanager.AdobeClientCredentials; import io.adobe.cloudmanager.IdentityManagementApi; import io.adobe.cloudmanager.IdentityManagementApiException; -import io.adobe.cloudmanager.jwt.swagger.api.JwtApi; -import io.adobe.cloudmanager.jwt.swagger.invoker.ApiClient; -import io.adobe.cloudmanager.jwt.swagger.invoker.ApiException; -import io.adobe.cloudmanager.jwt.swagger.model.Token; +import io.adobe.cloudmanager.jwt.generated.api.JwtApi; +import io.adobe.cloudmanager.jwt.generated.invoker.ApiClient; +import io.adobe.cloudmanager.jwt.generated.invoker.ApiException; +import io.adobe.cloudmanager.jwt.generated.model.Token; import io.jsonwebtoken.Jwts; public class IdentityManagementApiImpl implements IdentityManagementApi { diff --git a/src/main/java/io/adobe/cloudmanager/model/EmbeddedProgram.java b/src/main/java/io/adobe/cloudmanager/model/EmbeddedProgram.java index 3cf675f..1eb79e7 100644 --- a/src/main/java/io/adobe/cloudmanager/model/EmbeddedProgram.java +++ b/src/main/java/io/adobe/cloudmanager/model/EmbeddedProgram.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,10 +31,10 @@ */ @ToString @EqualsAndHashCode -public class EmbeddedProgram extends io.adobe.cloudmanager.swagger.model.EmbeddedProgram { +public class EmbeddedProgram extends io.adobe.cloudmanager.generated.model.EmbeddedProgram { private static final long serialVersionUID = 1L; - public EmbeddedProgram(io.adobe.cloudmanager.swagger.model.EmbeddedProgram delegate, CloudManagerApi client) { + public EmbeddedProgram(io.adobe.cloudmanager.generated.model.EmbeddedProgram delegate, CloudManagerApi client) { this.delegate = delegate; this.client = client; } @@ -49,7 +49,7 @@ public String getSelfLink() { } @Delegate - private final io.adobe.cloudmanager.swagger.model.EmbeddedProgram delegate; + private final io.adobe.cloudmanager.generated.model.EmbeddedProgram delegate; @ToString.Exclude @EqualsAndHashCode.Exclude diff --git a/src/main/java/io/adobe/cloudmanager/model/Environment.java b/src/main/java/io/adobe/cloudmanager/model/Environment.java index 10a217c..277556c 100644 --- a/src/main/java/io/adobe/cloudmanager/model/Environment.java +++ b/src/main/java/io/adobe/cloudmanager/model/Environment.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,23 +25,23 @@ import io.adobe.cloudmanager.CloudManagerApi; import io.adobe.cloudmanager.CloudManagerApiException; -import io.adobe.cloudmanager.swagger.model.HalLink; +import io.adobe.cloudmanager.generated.model.HalLink; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.experimental.Delegate; @ToString @EqualsAndHashCode -public class Environment extends io.adobe.cloudmanager.swagger.model.Environment { +public class Environment extends io.adobe.cloudmanager.generated.model.Environment { private static final long serialVersionUID = 1L; @Delegate - private final io.adobe.cloudmanager.swagger.model.Environment delegate; + private final io.adobe.cloudmanager.generated.model.Environment delegate; @ToString.Exclude @EqualsAndHashCode.Exclude private final CloudManagerApi client; - public Environment(io.adobe.cloudmanager.swagger.model.Environment delegate, CloudManagerApi client) { + public Environment(io.adobe.cloudmanager.generated.model.Environment delegate, CloudManagerApi client) { this.delegate = delegate; this.client = client; } diff --git a/src/main/java/io/adobe/cloudmanager/model/EnvironmentLog.java b/src/main/java/io/adobe/cloudmanager/model/EnvironmentLog.java index 0cdb709..432a5fe 100644 --- a/src/main/java/io/adobe/cloudmanager/model/EnvironmentLog.java +++ b/src/main/java/io/adobe/cloudmanager/model/EnvironmentLog.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,16 +28,16 @@ @ToString @EqualsAndHashCode -public class EnvironmentLog extends io.adobe.cloudmanager.swagger.model.EnvironmentLog { +public class EnvironmentLog extends io.adobe.cloudmanager.generated.model.EnvironmentLog { private static final long serialVersionUID = 1L; - public EnvironmentLog(io.adobe.cloudmanager.swagger.model.EnvironmentLog log) { + public EnvironmentLog(io.adobe.cloudmanager.generated.model.EnvironmentLog log) { this.delegate = log; } @Delegate - io.adobe.cloudmanager.swagger.model.EnvironmentLog delegate; + io.adobe.cloudmanager.generated.model.EnvironmentLog delegate; @Getter @Setter int index; @Getter @Setter String path; @Getter @Setter String url; diff --git a/src/main/java/io/adobe/cloudmanager/model/Pipeline.java b/src/main/java/io/adobe/cloudmanager/model/Pipeline.java index 15e120d..a0efd70 100644 --- a/src/main/java/io/adobe/cloudmanager/model/Pipeline.java +++ b/src/main/java/io/adobe/cloudmanager/model/Pipeline.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,17 +34,17 @@ */ @ToString @EqualsAndHashCode -public class Pipeline extends io.adobe.cloudmanager.swagger.model.Pipeline { +public class Pipeline extends io.adobe.cloudmanager.generated.model.Pipeline { private static final long serialVersionUID = 1L; @Delegate - private final io.adobe.cloudmanager.swagger.model.Pipeline delegate; + private final io.adobe.cloudmanager.generated.model.Pipeline delegate; @ToString.Exclude @EqualsAndHashCode.Exclude private final CloudManagerApi client; - public Pipeline(io.adobe.cloudmanager.swagger.model.Pipeline delegate, CloudManagerApi client) { + public Pipeline(io.adobe.cloudmanager.generated.model.Pipeline delegate, CloudManagerApi client) { this.delegate = delegate; this.client = client; } diff --git a/src/main/java/io/adobe/cloudmanager/model/PipelineExecution.java b/src/main/java/io/adobe/cloudmanager/model/PipelineExecution.java index a2b1cd1..d213abd 100644 --- a/src/main/java/io/adobe/cloudmanager/model/PipelineExecution.java +++ b/src/main/java/io/adobe/cloudmanager/model/PipelineExecution.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,9 +30,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.adobe.cloudmanager.CloudManagerApi; import io.adobe.cloudmanager.CloudManagerApiException; -import io.adobe.cloudmanager.swagger.model.HalLink; -import io.adobe.cloudmanager.swagger.model.Metric; -import io.adobe.cloudmanager.swagger.model.PipelineStepMetrics; +import io.adobe.cloudmanager.generated.model.HalLink; +import io.adobe.cloudmanager.generated.model.Metric; +import io.adobe.cloudmanager.generated.model.PipelineStepMetrics; import io.adobe.cloudmanager.util.Predicates; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -44,7 +44,7 @@ */ @ToString @EqualsAndHashCode -public class PipelineExecution extends io.adobe.cloudmanager.swagger.model.PipelineExecution { +public class PipelineExecution extends io.adobe.cloudmanager.generated.model.PipelineExecution { private static final long serialVersionUID = 1L; @@ -52,12 +52,12 @@ public class PipelineExecution extends io.adobe.cloudmanager.swagger.model.Pipel public static final String ACTION_SCHEDULE = "schedule"; public static final String ACTION_DEPLOY = "deploy"; @Delegate - private final io.adobe.cloudmanager.swagger.model.PipelineExecution delegate; + private final io.adobe.cloudmanager.generated.model.PipelineExecution delegate; @ToString.Exclude @EqualsAndHashCode.Exclude private final CloudManagerApi client; - public PipelineExecution(io.adobe.cloudmanager.swagger.model.PipelineExecution delegate, CloudManagerApi client) { + public PipelineExecution(io.adobe.cloudmanager.generated.model.PipelineExecution delegate, CloudManagerApi client) { this.delegate = delegate; this.client = client; } @@ -136,7 +136,7 @@ public String getCancelLink() throws CloudManagerApiException { PipelineExecutionStepState step = client.getCurrentStep(this); HalLink link; - if (io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState.StatusEnum.WAITING.equals(step.getStatus()) && + if (io.adobe.cloudmanager.generated.model.PipelineExecutionStepState.StatusEnum.WAITING.equals(step.getStatus()) && ACTION_DEPLOY.equals(step.getAction())) { link = step.getLinks().getHttpnsAdobeComadobecloudrelpipelineadvance(); } else { @@ -164,10 +164,10 @@ public String getCancelBody() throws CloudManagerApiException { gen.writeStartObject(); if (ACTION_APPROVAL.equals(step.getAction())) { gen.writeBooleanField("approved", false); - } else if (io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState.StatusEnum.WAITING.equals(step.getStatus()) && + } else if (io.adobe.cloudmanager.generated.model.PipelineExecutionStepState.StatusEnum.WAITING.equals(step.getStatus()) && !ACTION_SCHEDULE.equals(step.getAction()) && !ACTION_DEPLOY.equals(step.getAction())) { gen.writeBooleanField("override", false); - } else if (io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState.StatusEnum.WAITING.equals(step.getStatus()) && + } else if (io.adobe.cloudmanager.generated.model.PipelineExecutionStepState.StatusEnum.WAITING.equals(step.getStatus()) && ACTION_DEPLOY.equals(step.getAction())) { gen.writeBooleanField("resume", false); } else { diff --git a/src/main/java/io/adobe/cloudmanager/model/PipelineExecutionStepState.java b/src/main/java/io/adobe/cloudmanager/model/PipelineExecutionStepState.java index e2a6d3e..6fb6144 100644 --- a/src/main/java/io/adobe/cloudmanager/model/PipelineExecutionStepState.java +++ b/src/main/java/io/adobe/cloudmanager/model/PipelineExecutionStepState.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,17 +33,17 @@ */ @ToString @EqualsAndHashCode -public class PipelineExecutionStepState extends io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState { +public class PipelineExecutionStepState extends io.adobe.cloudmanager.generated.model.PipelineExecutionStepState { private static final long serialVersionUID = 1L; @Delegate - private final io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState delegate; + private final io.adobe.cloudmanager.generated.model.PipelineExecutionStepState delegate; @ToString.Exclude @EqualsAndHashCode.Exclude private final CloudManagerApi client; - public PipelineExecutionStepState(io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState delegate, CloudManagerApi client) { + public PipelineExecutionStepState(io.adobe.cloudmanager.generated.model.PipelineExecutionStepState delegate, CloudManagerApi client) { this.delegate = delegate; this.client = client; } diff --git a/src/main/java/io/adobe/cloudmanager/model/Variable.java b/src/main/java/io/adobe/cloudmanager/model/Variable.java index 4046fc7..a93f76b 100644 --- a/src/main/java/io/adobe/cloudmanager/model/Variable.java +++ b/src/main/java/io/adobe/cloudmanager/model/Variable.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,19 +26,19 @@ @ToString @EqualsAndHashCode -public class Variable extends io.adobe.cloudmanager.swagger.model.Variable { +public class Variable extends io.adobe.cloudmanager.generated.model.Variable { private static final long serialVersionUID = 1L; public Variable() { - this.delegate = new io.adobe.cloudmanager.swagger.model.Variable(); + this.delegate = new io.adobe.cloudmanager.generated.model.Variable(); } - public Variable(io.adobe.cloudmanager.swagger.model.Variable delegate) { + public Variable(io.adobe.cloudmanager.generated.model.Variable delegate) { this.delegate = delegate; } @Delegate - private final io.adobe.cloudmanager.swagger.model.Variable delegate; + private final io.adobe.cloudmanager.generated.model.Variable delegate; } diff --git a/src/main/java/io/adobe/cloudmanager/util/Predicates.java b/src/main/java/io/adobe/cloudmanager/util/Predicates.java index ae72bcc..7a08e54 100644 --- a/src/main/java/io/adobe/cloudmanager/util/Predicates.java +++ b/src/main/java/io/adobe/cloudmanager/util/Predicates.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import java.util.function.Predicate; import io.adobe.cloudmanager.model.Pipeline; -import io.adobe.cloudmanager.swagger.model.Metric; -import io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState; -import static io.adobe.cloudmanager.swagger.model.PipelineExecutionStepState.*; +import io.adobe.cloudmanager.generated.model.Metric; +import io.adobe.cloudmanager.generated.model.PipelineExecutionStepState; +import static io.adobe.cloudmanager.generated.model.PipelineExecutionStepState.*; /** @@ -37,7 +37,7 @@ public class Predicates { * Predicate for pipelines based on BUSY status. */ public static final Predicate IS_BUSY = (pipeline -> - io.adobe.cloudmanager.swagger.model.Pipeline.StatusEnum.BUSY == pipeline.getStatus() + io.adobe.cloudmanager.generated.model.Pipeline.StatusEnum.BUSY == pipeline.getStatus() ); /** diff --git a/src/test/java/io/adobe/cloudmanager/AdobeClientCredentialsTest.java b/src/test/java/io/adobe/cloudmanager/AdobeClientCredentialsTest.java index b057225..e9784a8 100644 --- a/src/test/java/io/adobe/cloudmanager/AdobeClientCredentialsTest.java +++ b/src/test/java/io/adobe/cloudmanager/AdobeClientCredentialsTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/io/adobe/cloudmanager/impl/AbstractApiTest.java b/src/test/java/io/adobe/cloudmanager/impl/AbstractApiTest.java index c19190b..095297f 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/AbstractApiTest.java +++ b/src/test/java/io/adobe/cloudmanager/impl/AbstractApiTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/io/adobe/cloudmanager/impl/CloudManagerExpectationInitializer.java b/src/test/java/io/adobe/cloudmanager/impl/CloudManagerExpectationInitializer.java index 0b5be2e..e229dda 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/CloudManagerExpectationInitializer.java +++ b/src/test/java/io/adobe/cloudmanager/impl/CloudManagerExpectationInitializer.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/io/adobe/cloudmanager/impl/EnvironmentsTest.java b/src/test/java/io/adobe/cloudmanager/impl/EnvironmentsTest.java index efdd6e7..854dc4c 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/EnvironmentsTest.java +++ b/src/test/java/io/adobe/cloudmanager/impl/EnvironmentsTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -204,12 +204,12 @@ void getEnvironmentVariables_success() throws CloudManagerApiException { assertEquals(2, variables.size(), "Empty body returns zero length list"); Variable v = new Variable(); v.setName("KEY"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v.setValue("value"); assertTrue(variables.contains(v)); v = new Variable(); v.setName("I_AM_A_SECRET"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); assertTrue(variables.contains(v)); } @@ -220,12 +220,12 @@ void getEnvironmentVariables_successEnvironment() throws Exception { assertEquals(2, variables.size(), "Empty body returns zero length list"); Variable v = new Variable(); v.setName("KEY"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v.setValue("value"); assertTrue(variables.contains(v)); v = new Variable(); v.setName("I_AM_A_SECRET"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); assertTrue(variables.contains(v)); } @@ -236,12 +236,12 @@ void getEnvironmentVariables_via_environment() throws Exception { assertEquals(2, variables.size(), "Empty body returns zero length list"); Variable v = new Variable(); v.setName("KEY"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v.setValue("value"); assertTrue(variables.contains(v)); v = new Variable(); v.setName("I_AM_A_SECRET"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); assertTrue(variables.contains(v)); } @@ -290,8 +290,8 @@ void setEnvironmentVariables_variablesOnly() throws CloudManagerApiException { v2.setValue("bar2"); List results = underTest.setEnvironmentVariables("2", "1", v, v2); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); assertEquals(2, results.size(), "Response list correct size."); assertTrue(results.contains(v), "Results contains foo"); assertTrue(results.contains(v2), "Results contains foo2"); @@ -303,12 +303,12 @@ void setEnvironmentVariables_secretsOnly() throws CloudManagerApiException { Variable v = new Variable(); v.setName("secretFoo"); v.setValue("secretBar"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); Variable v2 = new Variable(); v2.setName("secretFoo2"); v2.setValue("secretBar2"); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); List results = underTest.setEnvironmentVariables("2", "1", v, v2); v.setValue(null); @@ -328,10 +328,10 @@ void setEnvironmentVariables_mixed() throws CloudManagerApiException { Variable v2 = new Variable(); v2.setName("secretFoo"); v2.setValue("secretBar"); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); List results = underTest.setEnvironmentVariables("2", "1", v, v2); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v2.setValue(null); assertEquals(2, results.size(), "Response list correct size."); assertTrue(results.contains(v), "Results contains foo"); @@ -348,12 +348,12 @@ void setEnvironmentVariables_via_environment() throws Exception { Variable v2 = new Variable(); v2.setName("secretFoo"); v2.setValue("secretBar"); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); Environment env = underTest.listEnvironments("2").stream().filter(e -> e.getId().equals("1")).findFirst().orElseThrow(Exception::new); List results = env.setVariables(v, v2); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v2.setValue(null); assertEquals(2, results.size(), "Response list correct size."); assertTrue(results.contains(v), "Results contains foo"); diff --git a/src/test/java/io/adobe/cloudmanager/impl/ExecutionsTest.java b/src/test/java/io/adobe/cloudmanager/impl/ExecutionsTest.java index fef92c8..e2bf920 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/ExecutionsTest.java +++ b/src/test/java/io/adobe/cloudmanager/impl/ExecutionsTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/io/adobe/cloudmanager/impl/IdentityManagementApiImplTest.java b/src/test/java/io/adobe/cloudmanager/impl/IdentityManagementApiImplTest.java index d752b0a..0cec4bb 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/IdentityManagementApiImplTest.java +++ b/src/test/java/io/adobe/cloudmanager/impl/IdentityManagementApiImplTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import io.adobe.cloudmanager.AdobeClientCredentials; import io.adobe.cloudmanager.IdentityManagementApi; import io.adobe.cloudmanager.IdentityManagementApiException; -import io.adobe.cloudmanager.jwt.swagger.model.Token; +import io.adobe.cloudmanager.jwt.generated.model.Token; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwt; import io.jsonwebtoken.Jwts; diff --git a/src/test/java/io/adobe/cloudmanager/impl/PipelinesTest.java b/src/test/java/io/adobe/cloudmanager/impl/PipelinesTest.java index 487abab..6aab3fd 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/PipelinesTest.java +++ b/src/test/java/io/adobe/cloudmanager/impl/PipelinesTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import io.adobe.cloudmanager.model.Pipeline; import io.adobe.cloudmanager.model.PipelineExecution; import io.adobe.cloudmanager.model.Variable; -import io.adobe.cloudmanager.swagger.model.PipelinePhase; +import io.adobe.cloudmanager.generated.model.PipelinePhase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockserver.model.HttpRequest; @@ -80,7 +80,7 @@ public void setupPipelinesForProgram3() { private HttpResponse handleGoodPatch(HttpRequest request) throws IOException { ObjectMapper objectMapper = new ObjectMapper(); - io.adobe.cloudmanager.swagger.model.Pipeline pipeline = objectMapper.readValue(request.getBodyAsJsonOrXmlString(), io.adobe.cloudmanager.swagger.model.Pipeline.class); + io.adobe.cloudmanager.generated.model.Pipeline pipeline = objectMapper.readValue(request.getBodyAsJsonOrXmlString(), io.adobe.cloudmanager.generated.model.Pipeline.class); Optional buildPhase = pipeline.getPhases().stream().filter(p -> PipelinePhase.TypeEnum.BUILD == p.getType()).findFirst(); if (buildPhase.isPresent()) { @@ -278,12 +278,12 @@ void getPipelineVariables_success() throws CloudManagerApiException { List variables = underTest.getPipelineVariables("3", "1"); Variable v = new Variable(); v.setName("KEY"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v.setValue("value"); assertTrue(variables.contains(v)); v = new Variable(); v.setName("I_AM_A_SECRET"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); assertTrue(variables.contains(v)); } @@ -293,12 +293,12 @@ void getPipelineVariables_successPipeline() throws CloudManagerApiException { List variables = underTest.getPipelineVariables(pipeline); Variable v = new Variable(); v.setName("KEY"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v.setValue("value"); assertTrue(variables.contains(v)); v = new Variable(); v.setName("I_AM_A_SECRET"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); assertTrue(variables.contains(v)); } @@ -308,12 +308,12 @@ void getPipelineVariables_via_pipeline() throws CloudManagerApiException { List variables = pipeline.getVariables(); Variable v = new Variable(); v.setName("KEY"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v.setValue("value"); assertTrue(variables.contains(v)); v = new Variable(); v.setName("I_AM_A_SECRET"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); assertTrue(variables.contains(v)); } @@ -362,8 +362,8 @@ void setPipelineVariables_variablesOnly() throws CloudManagerApiException { v2.setValue("bar2"); List results = underTest.setPipelineVariables("3", "1", v, v2); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); assertEquals(2, results.size(), "Response list correct size."); assertTrue(results.contains(v), "Results contains foo"); assertTrue(results.contains(v2), "Results contains foo2"); @@ -375,12 +375,12 @@ void setPipelineVariables_secretsOnly() throws CloudManagerApiException { Variable v = new Variable(); v.setName("secretFoo"); v.setValue("secretBar"); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); Variable v2 = new Variable(); v2.setName("secretFoo2"); v2.setValue("secretBar2"); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); List results = underTest.setPipelineVariables("3", "1", v, v2); v.setValue(null); @@ -400,10 +400,10 @@ void setPipelineVariables_mixed() throws CloudManagerApiException { Variable v2 = new Variable(); v2.setName("secretFoo"); v2.setValue("secretBar"); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); List results = underTest.setPipelineVariables("3", "1", v, v2); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v2.setValue(null); assertEquals(2, results.size(), "Response list correct size."); assertTrue(results.contains(v), "Results contains foo"); @@ -420,12 +420,12 @@ void setPipelineVariables_via_environment() throws Exception { Variable v2 = new Variable(); v2.setName("secretFoo"); v2.setValue("secretBar"); - v2.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.SECRETSTRING); + v2.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.SECRETSTRING); Pipeline pipeline = underTest.listPipelines("3", p -> p.getId().equals("1")).get(0); List results = pipeline.setVariables(v, v2); - v.setType(io.adobe.cloudmanager.swagger.model.Variable.TypeEnum.STRING); + v.setType(io.adobe.cloudmanager.generated.model.Variable.TypeEnum.STRING); v2.setValue(null); assertEquals(2, results.size(), "Response list correct size."); assertTrue(results.contains(v), "Results contains foo"); diff --git a/src/test/java/io/adobe/cloudmanager/impl/ProgramsTest.java b/src/test/java/io/adobe/cloudmanager/impl/ProgramsTest.java index e3da3ed..6d4a2ef 100644 --- a/src/test/java/io/adobe/cloudmanager/impl/ProgramsTest.java +++ b/src/test/java/io/adobe/cloudmanager/impl/ProgramsTest.java @@ -4,7 +4,7 @@ * #%L * Adobe Cloud Manager Client Library * %% - * Copyright (C) 2020 Adobe Inc. + * Copyright (C) 2020 - 2021 Adobe Inc. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/resources/mockserver.properties b/src/test/resources/mockserver.properties index 38e60c5..2d35db8 100644 --- a/src/test/resources/mockserver.properties +++ b/src/test/resources/mockserver.properties @@ -2,7 +2,7 @@ # #%L # Adobe Cloud Manager Client Library # %% -# Copyright (C) 2020 Adobe Inc. +# Copyright (C) 2020 - 2021 Adobe Inc. # %% # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.