Skip to content

Renaming the generated package. #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bstopp merged 2 commits into from
Mar 25, 2021
Merged

Renaming the generated package. #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f4164
Renaming the generated package.
bstopp Mar 25, 2021
dc41422
Exclude the generated classes from code coverage.
bstopp Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Example:
<dependency>
<groupId>io.adobe.cloudmanager</groupId>
<artifactId>aio-lib-cloudmanager</artifactId>
<version>0.3.1-SNAPSHOT</version>
<version>0.4.1-SNAPSHOT</version>
</dependency>
```

Expand All @@ -27,7 +27,7 @@ The default library is Java11, to use the Java8 library, use the classifier.
<dependency>
<groupId>io.adobe.cloudmanager</groupId>
<artifactId>aio-lib-cloudmanager</artifactId>
<version>0.3.1-SNAPSHOT</version>
<version>0.4.1-SNAPSHOT</version>
<classifier>java8</classifier>
</dependency>
```
Expand All @@ -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...

Expand Down
86 changes: 35 additions & 51 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,25 @@
</distributionManagement>

<properties>
<jjwt.version>0.11.2</jjwt.version>
<junit.jupiter.version>5.7.0</junit.jupiter.version>

<swagger.annotations.version>2.0.10</swagger.annotations.version>
<swagger.codegen.version>3.0.22</swagger.codegen.version>
<jersey.version>2.29.1</jersey.version>

<jackson.version>2.10.0</jackson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jwt.api>${project.basedir}/src/main/resources/swagger/jwt.yaml</jwt.api>
<cm.api>https://raw.githubusercontent.com/AdobeDocs/cloudmanager-api-docs/master/swagger-specs/api.yaml</cm.api>
<cm.events>https://raw.githubusercontent.com/AdobeDocs/cloudmanager-api-docs/master/swagger-specs/events.yaml</cm.events>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jjwt.version>0.11.2</jjwt.version>
<junit.jupiter.version>5.7.0</junit.jupiter.version>

<swagger.codegen.version>3.0.22</swagger.codegen.version>

<!-- START Generated Properties -->
<swagger-core-version>2.0.0</swagger-core-version>
<jersey-version>2.29.1</jersey-version>
<jackson-version>2.10.1</jackson-version>
<!-- END Generated Properties -->

</properties>

<build>
Expand All @@ -94,9 +98,9 @@
</goals>
<configuration>
<inputSpec>${jwt.api}</inputSpec>
<modelPackage>${project.groupId}.jwt.swagger.model</modelPackage>
<apiPackage>${project.groupId}.jwt.swagger.api</apiPackage>
<invokerPackage>${project.groupId}.jwt.swagger.invoker</invokerPackage>
<modelPackage>${project.groupId}.jwt.generated.model</modelPackage>
<apiPackage>${project.groupId}.jwt.generated.api</apiPackage>
<invokerPackage>${project.groupId}.jwt.generated.invoker</invokerPackage>
<generateApiDocumentation>false</generateApiDocumentation>
<generateModelDocumentation>false</generateModelDocumentation>
<generateApiTests>false</generateApiTests>
Expand All @@ -116,9 +120,9 @@
</goals>
<configuration>
<inputSpec>${cm.api}</inputSpec>
<modelPackage>${project.groupId}.swagger.model</modelPackage>
<apiPackage>${project.groupId}.swagger.api</apiPackage>
<invokerPackage>${project.groupId}.swagger.invoker</invokerPackage>
<modelPackage>${project.groupId}.generated.model</modelPackage>
<apiPackage>${project.groupId}.generated.api</apiPackage>
<invokerPackage>${project.groupId}.generated.invoker</invokerPackage>
<generateApiDocumentation>false</generateApiDocumentation>
<generateModelDocumentation>false</generateModelDocumentation>
<generateApiTests>false</generateApiTests>
Expand All @@ -138,7 +142,7 @@
</goals>
<configuration>
<inputSpec>${cm.events}</inputSpec>
<modelPackage>${project.groupId}.swagger.events</modelPackage>
<modelPackage>${project.groupId}.generated.events</modelPackage>
<generateApis>false</generateApis>
<generateModelTests>false</generateModelTests>
<generateSupportingFiles>false</generateSupportingFiles>
Expand Down Expand Up @@ -217,7 +221,7 @@
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<excludes>
io/adobe/cloudmanager/**/swagger/**/*class
io/adobe/cloudmanager/**/generated/**/*.class
</excludes>
</configuration>
<executions>
Expand Down Expand Up @@ -403,77 +407,57 @@
</profiles>

<dependencies>
<!-- Pulled from generated client -->
<!-- START Generated Dependencies -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.annotations.version}</version>
<version>${swagger-core-version}</version>
</dependency>

<!-- HTTP client: jersey-client -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<version>${jersey-version}</version>
</dependency>

<!-- JSON processing: jackson -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- Base64 encoding that works in both JVM and Android -->
<dependency>
<groupId>com.brsanthu</groupId>
<artifactId>migbase64</artifactId>
<version>2.2</version>
<version>${jackson-version}</version>
</dependency>
<!-- END Generated Dependencies -->

<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand Down
9 changes: 5 additions & 4 deletions src/doc/resources/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/adobe/cloudmanager/AdobeClientCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/adobe/cloudmanager/CloudManagerApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/adobe/cloudmanager/CloudManagerApiException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/adobe/cloudmanager/IdentityManagementApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/adobe/cloudmanager/IdentityManagementApiException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/adobe/cloudmanager/PipelineUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading