Skip to content
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

Jump to bottom

#1360 replace openapi parser #1691

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

#1360 replace openapi parser #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dcc95c
#1360 applied reformat
jan-vcapgemini Apr 19, 2023
ece1580
#1360 replaced openapi-parser
jan-vcapgemini Apr 19, 2023
9f540ca
#1360 fixed template test
jan-vcapgemini Apr 19, 2023
c9fe0fe
Merge branch 'master' into 1360-replace-openapi-parser
jan-vcapgemini Jun 12, 2023
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
15 changes: 7 additions & 8 deletions ...c/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.devonfw.test</groupId>
<artifactId>Devon4JTemplateTest-TestDifferentFileSystems</artifactId>
Expand Down Expand Up @@ -34,11 +33,6 @@
</templates>
</configuration>
<dependencies>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>templates-devon4j</artifactId>
<version>20.08.002</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
Expand All @@ -49,6 +43,11 @@
<artifactId>openapiplugin</artifactId>
<version>${pluginVersion}</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>templates-devon4j</artifactId>
<version>20.08.002</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
Expand Down Expand Up @@ -83,4 +82,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion ...penapiplugin-model/src/main/java/com/devonfw/cobigen/openapiplugin/model/OpenAPIFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.net.URI;
import java.nio.file.Path;

import com.reprezen.kaizen.oasparser.model3.OpenApi3;
import com.networknt.oas.model.OpenApi3;

/** Swagger file transfer object which contains the {@link Path} and the name of the file */
public class OpenAPIFile {
Expand Down
26 changes: 13 additions & 13 deletions ...lugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
import com.devonfw.cobigen.openapiplugin.model.ResponseDef;
import com.devonfw.cobigen.openapiplugin.model.ServerDef;
import com.devonfw.cobigen.openapiplugin.util.constants.Constants;
import com.reprezen.jsonoverlay.JsonOverlay;
import com.reprezen.jsonoverlay.Overlay;
import com.reprezen.kaizen.oasparser.OpenApiParser;
import com.reprezen.kaizen.oasparser.model3.Info;
import com.reprezen.kaizen.oasparser.model3.MediaType;
import com.reprezen.kaizen.oasparser.model3.OpenApi3;
import com.reprezen.kaizen.oasparser.model3.Operation;
import com.reprezen.kaizen.oasparser.model3.Parameter;
import com.reprezen.kaizen.oasparser.model3.Path;
import com.reprezen.kaizen.oasparser.model3.RequestBody;
import com.reprezen.kaizen.oasparser.model3.Response;
import com.reprezen.kaizen.oasparser.model3.Schema;
import com.reprezen.kaizen.oasparser.model3.Server;
import com.networknt.jsonoverlay.JsonOverlay;
import com.networknt.jsonoverlay.Overlay;
import com.networknt.oas.OpenApiParser;
import com.networknt.oas.model.Info;
import com.networknt.oas.model.MediaType;
import com.networknt.oas.model.OpenApi3;
import com.networknt.oas.model.Operation;
import com.networknt.oas.model.Parameter;
import com.networknt.oas.model.Path;
import com.networknt.oas.model.RequestBody;
import com.networknt.oas.model.Response;
import com.networknt.oas.model.Schema;
import com.networknt.oas.model.Server;

/**
* Extension for the {@link InputReader} Interface of the CobiGen, to be able to read OpenApi3 definition files into
Expand Down
4 changes: 2 additions & 2 deletions cobigen-plugins/cobigen-openapiplugin-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

<dependencies>
<dependency>
<groupId>com.github.maybeec</groupId>
<groupId>com.networknt</groupId>
<artifactId>openapi-parser</artifactId>
<version>4.0.4</version>
<version>2.1.5</version>
</dependency>
</dependencies>
</project>