Skip to content

Commit 44062bd

Browse files
authored
Merge pull request #94 from adyen-examples/package-refactor
Package refactor
2 parents 30f3796 + cf9c810 commit 44062bd

14 files changed

+23
-24
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ and requires a valid API key from Postman's integrations [dashboard](https://web
2828
```docker
2929
# generate only
3030
docker run -v $(pwd):/usr/src/app \
31-
-it --rm --name postmanv2-container gcatanese/openapi-generator-postman-v2 generate \
31+
-it --rm --name postmanv2-container ghcr.io/adyen-examples/openapi-generator-postman-v2:main generate \
3232
-i src/test/resources/SampleProject.yaml \
3333
-o tmp
3434
3535
# generate only (with additional parameters)
3636
docker run -v $(pwd):/usr/src/app \
37-
-it --rm --name postmanv2-container gcatanese/openapi-generator-postman-v2 generate \
37+
-it --rm --name postmanv2-container ghcr.io/adyen-examples/openapi-generator-postman-v2:main generate \
3838
-i src/test/resources/SampleProject.yaml \
3939
-o tmp \
4040
--additional-properties folderStrategy=Tags,postmanVariables=MY_VAR1-ANOTHERVAR
@@ -44,7 +44,7 @@ docker run -v $(pwd):/usr/src/app \
4444
# note: require POSTMAN API KEY
4545
docker run -v $(pwd):/usr/src/app \
4646
-e POSTMAN_API_KEY=YOUR_POSTMAN_API_KEY \
47-
-it --rm --name postmanv2-container gcatanese/openapi-generator-postman-v2 push \
47+
-it --rm --name postmanv2-container ghcr.io/adyen-examples/openapi-generator-postman-v2:main push \
4848
-i src/test/resources/SampleProject.yaml \
4949
-o tmp \
5050
--additional-properties folderStrategy=Tags,postmanVariables=MY_VAR1-ANOTHERVAR
@@ -59,7 +59,7 @@ Build `postman-v2` from source
5959
Run OpenAPI Generator adding `postman-v2` jar file in the class path and specifying the `PostmanV2Generator` generator:
6060
```shell
6161
java -cp target/openapi-generator-postman-v2.jar:/openapi-generator/modules/openapi-generator-cli/target/openapi-generator-cli.jar \
62-
org.openapitools.codegen.OpenAPIGenerator generate -g com.tweesky.cloudtools.codegen.PostmanV2Generator \
62+
org.openapitools.codegen.OpenAPIGenerator generate -g com.adyen.codegen.postman.PostmanV2Generator \
6363
-i src/test/resources/BasicJson.json -o output
6464
```
6565
## METADATA

script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ then
2222
cmdparams="${cmdline#*push}"
2323
fi
2424

25-
statusCode=$(java -jar /openapi-generator-postman-v2.jar generate -g com.tweesky.cloudtools.codegen.PostmanV2Generator $cmdparams)
25+
statusCode=$(java -jar /openapi-generator-postman-v2.jar generate -g com.adyen.codegen.postman.PostmanV2Generator $cmdparams)
2626

2727
if [[ ! $statusCode ]]
2828
then

src/main/java/com/tweesky/cloudtools/codegen/CodegenUtils.java renamed to src/main/java/com/adyen/codegen/postman/CodegenUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

33
import org.apache.http.impl.EnglishReasonPhraseCatalog;
44
import org.openapitools.codegen.CodegenResponse;

src/main/java/com/tweesky/cloudtools/codegen/ExampleJsonHelper.java renamed to src/main/java/com/adyen/codegen/postman/ExampleJsonHelper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.JsonNode;
@@ -15,8 +15,8 @@
1515
import java.util.LinkedHashMap;
1616
import java.util.Map;
1717

18-
import static com.tweesky.cloudtools.codegen.PostmanV2Generator.JSON_ESCAPE_DOUBLE_QUOTE;
19-
import static com.tweesky.cloudtools.codegen.PostmanV2Generator.JSON_ESCAPE_NEW_LINE;
18+
import static com.adyen.codegen.postman.PostmanV2Generator.JSON_ESCAPE_DOUBLE_QUOTE;
19+
import static com.adyen.codegen.postman.PostmanV2Generator.JSON_ESCAPE_NEW_LINE;
2020

2121
/**
2222
* Extract and format JSON examples

src/main/java/com/tweesky/cloudtools/codegen/PostmanV2Generator.java renamed to src/main/java/com/adyen/codegen/postman/PostmanV2Generator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

3-
import com.tweesky.cloudtools.codegen.model.PostmanRequestItem;
4-
import com.tweesky.cloudtools.codegen.model.PostmanResponse;
5-
import com.tweesky.cloudtools.codegen.model.PostmanVariable;
3+
import com.adyen.codegen.postman.model.PostmanRequestItem;
4+
import com.adyen.codegen.postman.model.PostmanResponse;
5+
import com.adyen.codegen.postman.model.PostmanVariable;
66
import io.swagger.v3.oas.models.OpenAPI;
77
import io.swagger.v3.oas.models.examples.Example;
88
import io.swagger.v3.oas.models.media.Schema;

src/main/java/com/tweesky/cloudtools/codegen/model/PostmanRequestItem.java renamed to src/main/java/com/adyen/codegen/postman/model/PostmanRequestItem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen.model;
1+
package com.adyen.codegen.postman.model;
22

33
import java.util.ArrayList;
44
import java.util.List;

src/main/java/com/tweesky/cloudtools/codegen/model/PostmanResponse.java renamed to src/main/java/com/adyen/codegen/postman/model/PostmanResponse.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.tweesky.cloudtools.codegen.model;
1+
package com.adyen.codegen.postman.model;
22

3-
import com.tweesky.cloudtools.codegen.CodegenUtils;
3+
import com.adyen.codegen.postman.CodegenUtils;
44
import org.openapitools.codegen.CodegenResponse;
55

66
public class PostmanResponse {

src/main/java/com/tweesky/cloudtools/codegen/model/PostmanVariable.java renamed to src/main/java/com/adyen/codegen/postman/model/PostmanVariable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen.model;
1+
package com.adyen.codegen.postman.model;
22

33
import java.util.Objects;
44

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.tweesky.cloudtools.codegen.PostmanV2Generator
1+
com.adyen.codegen.postman.PostmanV2Generator

src/test/java/com/tweesky/cloudtools/codegen/CodegenUtilsTest.java renamed to src/test/java/com/adyen/codegen/postman/CodegenUtilsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

33
import io.swagger.v3.oas.models.responses.ApiResponse;
44
import junit.framework.TestCase;

src/test/java/com/tweesky/cloudtools/codegen/ExampleJsonHelperTest.java renamed to src/test/java/com/adyen/codegen/postman/ExampleJsonHelperTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.fasterxml.jackson.databind.node.ObjectNode;

src/test/java/com/tweesky/cloudtools/codegen/PostmanV2GeneratorTest.java renamed to src/test/java/com/adyen/codegen/postman/PostmanV2GeneratorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.tweesky.cloudtools.codegen.model.PostmanRequestItem;
4+
import com.adyen.codegen.postman.model.PostmanRequestItem;
55
import io.swagger.v3.oas.models.tags.Tag;
66
import org.json.simple.JSONArray;
77
import org.json.simple.JSONObject;

src/test/java/com/tweesky/cloudtools/codegen/TestUtils.java renamed to src/test/java/com/adyen/codegen/postman/TestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tweesky.cloudtools.codegen;
1+
package com.adyen.codegen.postman;
22

33
import java.io.IOException;
44
import java.nio.charset.StandardCharsets;

src/test/resources/SampleProject.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ info:
44
version: '1.0'
55
contact:
66
name: Beppe Catanese
7-
87
url: 'https://github.com/gcatanese'
98
description: 'Sample API Check "API Key" '
109
license:

0 commit comments

Comments
 (0)