Skip to content

Commit 2714513

Browse files
rpanackalrpanackal
committed
Update generator templates and sample module
1 parent 60eef20 commit 2714513

File tree

18 files changed

+84
-75
lines changed

18 files changed

+84
-75
lines changed

‎datamodel/openapi/openapi-api-apache-sample/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependencies>
3232
<dependency>
3333
<groupId>com.sap.cloud.sdk.datamodel</groupId>
34-
<artifactId>openapi-core</artifactId>
34+
<artifactId>openapi-core-apache</artifactId>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.sap.cloud.sdk.cloudplatform</groupId>

‎datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/petstore/api/DefaultApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import com.sap.cloud.sdk.cloudplatform.connectivity.Destination;
1818
import com.sap.cloud.sdk.datamodel.openapi.apache.petstore.model.Pet;
1919
import com.sap.cloud.sdk.datamodel.openapi.apache.petstore.model.PetInput;
20-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
21-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
22-
import com.sap.cloud.sdk.services.openapi.apache.OpenApiResponse;
23-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
24-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
20+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
21+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
22+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
23+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
24+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiResponse;
2525

2626
/**
2727
* Swagger Petstore in version 1.0.0.

‎datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/sodastore/api/OrdersApi.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import com.fasterxml.jackson.core.type.TypeReference;
1616
import com.sap.cloud.sdk.cloudplatform.connectivity.Destination;
1717
import com.sap.cloud.sdk.datamodel.openapi.apache.sodastore.model.Order;
18-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
19-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
20-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
21-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
18+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
19+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
20+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
21+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
2222

2323
/**
2424
* SodaStore API in version 1.0.0.

‎datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/sodastore/api/SodasApi.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import com.sap.cloud.sdk.cloudplatform.connectivity.Destination;
1818
import com.sap.cloud.sdk.datamodel.openapi.apache.sodastore.model.Soda;
1919
import com.sap.cloud.sdk.datamodel.openapi.apache.sodastore.model.SodaWithId;
20-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
21-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
22-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
23-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
20+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
21+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
22+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
23+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
2424

2525
/**
2626
* SodaStore API in version 1.0.0.

‎datamodel/openapi/openapi-core-apache/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
<groupId>com.fasterxml.jackson.datatype</groupId>
6464
<artifactId>jackson-datatype-jsr310</artifactId>
6565
</dependency>
66+
<dependency>
67+
<groupId>com.google.guava</groupId>
68+
<artifactId>guava</artifactId>
69+
</dependency>
6670
<!-- scope "provided" -->
6771
<dependency>
6872
<groupId>org.projectlombok</groupId>

‎datamodel/openapi/openapi-core/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@
100100
<artifactId>httpcore5</artifactId>
101101
<scope>test</scope>
102102
</dependency>
103-
</dependencies>
103+
<dependency>
104+
<groupId>org.junit.jupiter</groupId>
105+
<artifactId>junit-jupiter-params</artifactId>
106+
<scope>test</scope>
107+
</dependency>
108+
</dependencies>
104109
<build>
105110
<plugins>
106111
<plugin>

‎datamodel/openapi/openapi-generator/src/main/resources/openapi-generator/mustache-templates/libraries/apache-httpclient/api.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ package {{package}};
88

99
import com.fasterxml.jackson.core.type.TypeReference;
1010

11-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
12-
import com.sap.cloud.sdk.services.openapi.apache.OpenApiResponse;
13-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
14-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
15-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
11+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
12+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiResponse;
13+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
14+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
15+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
1616

1717
{{#models.0}}
1818
import {{modelPackage}}.*;

‎datamodel/openapi/openapi-generator/src/test/resources/DataModelGeneratorApacheIntegrationTest/api-class-for-ai-sdk/output/com/sap/cloud/sdk/services/builder/api/AwesomeSodaApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
import com.fasterxml.jackson.core.type.TypeReference;
88

9-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
10-
import com.sap.cloud.sdk.services.openapi.apache.OpenApiResponse;
11-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
12-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
13-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
9+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
10+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiResponse;
11+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
12+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
13+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
1414

1515

1616
import com.sap.cloud.sdk.services.builder.model.NewSoda;

‎datamodel/openapi/openapi-generator/src/test/resources/DataModelGeneratorApacheIntegrationTest/api-class-for-ai-sdk/output/com/sap/cloud/sdk/services/builder/api/AwesomeSodasApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
import com.fasterxml.jackson.core.type.TypeReference;
88

9-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
10-
import com.sap.cloud.sdk.services.openapi.apache.OpenApiResponse;
11-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
12-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
13-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
9+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
10+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiResponse;
11+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
12+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
13+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
1414

1515

1616
import com.sap.cloud.sdk.services.builder.model.Soda;

‎datamodel/openapi/openapi-generator/src/test/resources/DataModelGeneratorApacheIntegrationTest/api-class-for-ai-sdk/output/com/sap/cloud/sdk/services/builder/api/DefaultApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
import com.fasterxml.jackson.core.type.TypeReference;
88

9-
import com.sap.cloud.sdk.services.openapi.core.OpenApiRequestException;
10-
import com.sap.cloud.sdk.services.openapi.apache.OpenApiResponse;
11-
import com.sap.cloud.sdk.services.openapi.apache.ApiClient;
12-
import com.sap.cloud.sdk.services.openapi.apache.BaseApi;
13-
import com.sap.cloud.sdk.services.openapi.apache.Pair;
9+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiRequestException;
10+
import com.sap.cloud.sdk.services.openapi.apache.core.OpenApiResponse;
11+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.ApiClient;
12+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.BaseApi;
13+
import com.sap.cloud.sdk.services.openapi.apache.apiclient.Pair;
1414

1515

1616
import com.sap.cloud.sdk.services.builder.model.Soda;

0 commit comments

Comments
 (0)