KOGITO-1 - Remove swagger annotations to allow to use OpenAPI instead
diff --git a/jbpm-quarkus-example/pom.xml b/jbpm-quarkus-example/pom.xml
index d2d7e25..9e2effc 100755
--- a/jbpm-quarkus-example/pom.xml
+++ b/jbpm-quarkus-example/pom.xml
@@ -59,10 +59,6 @@
<artifactId>jbpm-flow</artifactId>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </dependency>
- <dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
@@ -87,30 +83,25 @@
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>com.github.kongchen</groupId>
+ <groupId>io.openapitools.swagger</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<configuration>
- <apiSources>
- <apiSource>
- <springmvc>false</springmvc>
- <locations>
- <location>org.kie.kogito.examples</location>
- </locations>
- <schemes>http,https</schemes>
- <info>
- <title>${project.description}</title>
- <version>${project.version}</version>
- </info>
- <outputPath>${basedir}/target/classes/META-INF/resources/docs/</outputPath>
- <outputFormats>json,yaml</outputFormats>
- <swaggerDirectory>${basedir}/target/classes/META-INF/resources/docs/</swaggerDirectory>
- <swaggerFileName>swagger</swaggerFileName>
- </apiSource>
- </apiSources>
+ <resourcePackages>
+ <resourcePackage>org.kie.kogito.examples</resourcePackage>
+ </resourcePackages>
+ <outputDirectory>${basedir}/target/classes/static/</outputDirectory>
+ <outputFilename>swagger</outputFilename>
+ <outputFormats>JSON,YAML</outputFormats>
+ <prettyPrint>true</prettyPrint>
+ <swaggerConfig>
+ <info>
+ <title>${project.description}</title>
+ <version>${project.version}</version>
+ </info>
+ </swaggerConfig>
</configuration>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
diff --git a/jbpm-springboot-example/pom.xml b/jbpm-springboot-example/pom.xml
index 354bb51..02e3838 100644
--- a/jbpm-springboot-example/pom.xml
+++ b/jbpm-springboot-example/pom.xml
@@ -65,10 +65,6 @@
<artifactId>jbpm-flow</artifactId>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </dependency>
- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
@@ -108,30 +104,25 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.github.kongchen</groupId>
+ <groupId>io.openapitools.swagger</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<configuration>
- <apiSources>
- <apiSource>
- <springmvc>false</springmvc>
- <locations>
- <location>org.kie.kogito.examples</location>
- </locations>
- <schemes>http,https</schemes>
- <info>
- <title>${project.description}</title>
- <version>${project.version}</version>
- </info>
- <outputPath>${basedir}/target/classes/static/</outputPath>
- <outputFormats>json,yaml</outputFormats>
- <swaggerDirectory>${basedir}/target/classes/static/</swaggerDirectory>
- <swaggerFileName>swagger</swaggerFileName>
- </apiSource>
- </apiSources>
+ <resourcePackages>
+ <resourcePackage>org.kie.kogito.examples</resourcePackage>
+ </resourcePackages>
+ <outputDirectory>${basedir}/target/classes/static/</outputDirectory>
+ <outputFilename>swagger</outputFilename>
+ <outputFormats>JSON,YAML</outputFormats>
+ <prettyPrint>true</prettyPrint>
+ <swaggerConfig>
+ <info>
+ <title>${project.description}</title>
+ <version>${project.version}</version>
+ </info>
+ </swaggerConfig>
</configuration>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
diff --git a/onboarding-example/hr/pom.xml b/onboarding-example/hr/pom.xml
index fa23e37..828ec23 100644
--- a/onboarding-example/hr/pom.xml
+++ b/onboarding-example/hr/pom.xml
@@ -53,10 +53,6 @@
<groupId>org.kie.kogito</groupId>
<artifactId>drools-model-compiler</artifactId>
</dependency>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
@@ -97,30 +93,25 @@
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>com.github.kongchen</groupId>
+ <groupId>io.openapitools.swagger</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<configuration>
- <apiSources>
- <apiSource>
- <springmvc>false</springmvc>
- <locations>
- <location>org.kie.kogito.examples</location>
- </locations>
- <schemes>http,https</schemes>
- <info>
- <title>${project.description}</title>
- <version>${project.version}</version>
- </info>
- <outputPath>${basedir}/target/classes/META-INF/resources/docs/</outputPath>
- <outputFormats>json,yaml</outputFormats>
- <swaggerDirectory>${basedir}/target/classes/META-INF/resources/docs/</swaggerDirectory>
- <swaggerFileName>swagger</swaggerFileName>
- </apiSource>
- </apiSources>
+ <resourcePackages>
+ <resourcePackage>org.kie.kogito.examples</resourcePackage>
+ </resourcePackages>
+ <outputDirectory>${basedir}/target/classes/static/</outputDirectory>
+ <outputFilename>swagger</outputFilename>
+ <outputFormats>JSON,YAML</outputFormats>
+ <prettyPrint>true</prettyPrint>
+ <swaggerConfig>
+ <info>
+ <title>${project.description}</title>
+ <version>${project.version}</version>
+ </info>
+ </swaggerConfig>
</configuration>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
diff --git a/onboarding-example/hr/src/main/java/org/kie/kogito/examples/DepartmentEndpoint.java b/onboarding-example/hr/src/main/java/org/kie/kogito/examples/DepartmentEndpoint.java
index 6d323cc..a165189 100644
--- a/onboarding-example/hr/src/main/java/org/kie/kogito/examples/DepartmentEndpoint.java
+++ b/onboarding-example/hr/src/main/java/org/kie/kogito/examples/DepartmentEndpoint.java
@@ -16,9 +16,6 @@
package org.kie.kogito.examples;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
@@ -31,7 +28,6 @@
import org.kie.kogito.rules.KieRuntimeBuilder;
@Path("/department")
-@Api(description = "Department service")
public class DepartmentEndpoint {
@Inject
@@ -43,8 +39,7 @@
@POST()
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
- @ApiOperation("Assign depeartment and manager")
- public DepartmentModel assignDepartment(@ApiParam(value = "department data that should be created") DepartmentModel resource) {
+ public DepartmentModel assignDepartment(DepartmentModel resource) {
KieSession ksession = runtimeBuilder.newKieSession("defaultStatelessKieSession", app.config().rule());
ksession.insert( resource );
diff --git a/onboarding-example/hr/src/main/java/org/kie/kogito/examples/IdEndpoint.java b/onboarding-example/hr/src/main/java/org/kie/kogito/examples/IdEndpoint.java
index 784cd48..0a6e2fa 100644
--- a/onboarding-example/hr/src/main/java/org/kie/kogito/examples/IdEndpoint.java
+++ b/onboarding-example/hr/src/main/java/org/kie/kogito/examples/IdEndpoint.java
@@ -26,14 +26,9 @@
import org.kie.api.runtime.KieSession;
import org.kie.kogito.Application;
import org.kie.kogito.examples.hr.IdModel;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import org.kie.kogito.rules.KieRuntimeBuilder;
@Path("/id")
-@Api(description = "Id and Email service")
public class IdEndpoint {
@Inject
@@ -45,8 +40,7 @@
@POST()
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
- @ApiOperation("Assign employee id and email")
- public IdModel assignId(@ApiParam(value = "data model representing employee") IdModel resource) {
+ public IdModel assignId(IdModel resource) {
KieSession ksession = runtimeBuilder.newKieSession("defaultStatelessKieSession", app.config().rule());
ksession.insert( resource );
diff --git a/onboarding-example/hr/src/main/java/org/kie/kogito/examples/ValidationEndpoint.java b/onboarding-example/hr/src/main/java/org/kie/kogito/examples/ValidationEndpoint.java
index ea629ff..0950bd7 100644
--- a/onboarding-example/hr/src/main/java/org/kie/kogito/examples/ValidationEndpoint.java
+++ b/onboarding-example/hr/src/main/java/org/kie/kogito/examples/ValidationEndpoint.java
@@ -31,14 +31,9 @@
import org.kie.api.runtime.ObjectFilter;
import org.kie.kogito.Application;
import org.kie.kogito.examples.hr.EmployeeValidationModel;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import org.kie.kogito.rules.KieRuntimeBuilder;
@Path("/employeeValidation")
-@Api(description = "Employee validation service")
public class ValidationEndpoint {
@Inject
@@ -62,9 +57,8 @@
@SuppressWarnings("unchecked")
@POST()
@Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- @ApiOperation("Validate given employee")
- public EmployeeValidationModel validateEmployee(@ApiParam(value = "data model representing employee to be validated") EmployeeValidationModel resource) {
+ @Consumes(MediaType.APPLICATION_JSON)
+ public EmployeeValidationModel validateEmployee(EmployeeValidationModel resource) {
ksession.insert(resource.getEmployee());
ksession.fireAllRules();
diff --git a/onboarding-example/onboarding/pom.xml b/onboarding-example/onboarding/pom.xml
index 9c25f7c..e138c7a 100644
--- a/onboarding-example/onboarding/pom.xml
+++ b/onboarding-example/onboarding/pom.xml
@@ -64,11 +64,6 @@
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-cloud-workitems</artifactId>
</dependency>
@@ -107,30 +102,25 @@
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>com.github.kongchen</groupId>
+ <groupId>io.openapitools.swagger</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<configuration>
- <apiSources>
- <apiSource>
- <springmvc>false</springmvc>
- <locations>
- <location>org.kie.kogito.examples</location>
- </locations>
- <schemes>http,https</schemes>
- <info>
- <title>${project.description}</title>
- <version>${project.version}</version>
- </info>
- <outputPath>${basedir}/target/classes/META-INF/resources/docs/</outputPath>
- <outputFormats>json,yaml</outputFormats>
- <swaggerDirectory>${basedir}/target/classes/META-INF/resources/docs/</swaggerDirectory>
- <swaggerFileName>swagger</swaggerFileName>
- </apiSource>
- </apiSources>
+ <resourcePackages>
+ <resourcePackage>org.kie.kogito.examples</resourcePackage>
+ </resourcePackages>
+ <outputDirectory>${basedir}/target/classes/static/</outputDirectory>
+ <outputFilename>swagger</outputFilename>
+ <outputFormats>JSON,YAML</outputFormats>
+ <prettyPrint>true</prettyPrint>
+ <swaggerConfig>
+ <info>
+ <title>${project.description}</title>
+ <version>${project.version}</version>
+ </info>
+ </swaggerConfig>
</configuration>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
diff --git a/onboarding-example/payroll/pom.xml b/onboarding-example/payroll/pom.xml
index fa95ac5..9ae0765 100644
--- a/onboarding-example/payroll/pom.xml
+++ b/onboarding-example/payroll/pom.xml
@@ -65,11 +65,6 @@
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-dmn-rest-utils</artifactId>
</dependency>
@@ -109,30 +104,25 @@
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>com.github.kongchen</groupId>
+ <groupId>io.openapitools.swagger</groupId>
<artifactId>swagger-maven-plugin</artifactId>
<configuration>
- <apiSources>
- <apiSource>
- <springmvc>false</springmvc>
- <locations>
- <location>org.kie.kogito.examples</location>
- </locations>
- <schemes>http,https</schemes>
- <info>
- <title>${project.description}</title>
- <version>${project.version}</version>
- </info>
- <outputPath>${basedir}/target/classes/META-INF/resources/docs/</outputPath>
- <outputFormats>json,yaml</outputFormats>
- <swaggerDirectory>${basedir}/target/classes/META-INF/resources/docs/</swaggerDirectory>
- <swaggerFileName>swagger</swaggerFileName>
- </apiSource>
- </apiSources>
+ <resourcePackages>
+ <resourcePackage>org.kie.kogito.examples</resourcePackage>
+ </resourcePackages>
+ <outputDirectory>${basedir}/target/classes/static/</outputDirectory>
+ <outputFilename>swagger</outputFilename>
+ <outputFormats>JSON,YAML</outputFormats>
+ <prettyPrint>true</prettyPrint>
+ <swaggerConfig>
+ <info>
+ <title>${project.description}</title>
+ <version>${project.version}</version>
+ </info>
+ </swaggerConfig>
</configuration>
<executions>
<execution>
- <phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
diff --git a/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/PaymentDateDMNEndpoint.java b/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/PaymentDateDMNEndpoint.java
index a6e8aea..f2c9c39 100644
--- a/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/PaymentDateDMNEndpoint.java
+++ b/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/PaymentDateDMNEndpoint.java
@@ -29,12 +29,7 @@
import org.kie.dmn.kogito.rest.quarkus.DMNResult;
import org.kie.kogito.examples.payroll.Payroll;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
@Path("/paymentDate")
-@Api(description = "Payments service")
public class PaymentDateDMNEndpoint {
static final DMNRuntime dmnRuntime = DMNKogitoQuarkus.createGenericDMNRuntime();
@@ -42,8 +37,7 @@
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation("Calculates payment date for given employee")
- public Payroll calculatePaymentDate(@ApiParam(value = "data model representing employee to be used") Payroll payrollInput) {
+ public Payroll calculatePaymentDate(Payroll payrollInput) {
DMNResult evaluate = DMNKogitoQuarkus.evaluate(dmnRuntime, "paymentDate", Collections.singletonMap("employee", payrollInput.getEmployee()));
Payroll payroll = new Payroll();
diff --git a/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/TaxRateDMNEndpoint.java b/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/TaxRateDMNEndpoint.java
index 72e8347..c1af0f6 100644
--- a/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/TaxRateDMNEndpoint.java
+++ b/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/TaxRateDMNEndpoint.java
@@ -25,16 +25,12 @@
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import org.kie.dmn.api.core.DMNRuntime;
import org.kie.dmn.kogito.rest.quarkus.DMNKogitoQuarkus;
import org.kie.dmn.kogito.rest.quarkus.DMNResult;
import org.kie.kogito.examples.payroll.Payroll;
@Path("/taxRate")
-@Api(description = "Taxes service")
public class TaxRateDMNEndpoint {
static final DMNRuntime dmnRuntime = DMNKogitoQuarkus.createGenericDMNRuntime();
@@ -42,8 +38,7 @@
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation("Calculates tax rate for given employee")
- public Payroll calculateTaxRate(@ApiParam(value = "data model representing employee to be used") Payroll payrollInput) {
+ public Payroll calculateTaxRate(Payroll payrollInput) {
DMNResult evaluate = DMNKogitoQuarkus.evaluate(dmnRuntime, "taxRate", Collections.singletonMap("employee", payrollInput.getEmployee()));
Payroll payroll = new Payroll();
diff --git a/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/VacationDaysDMNEndpoint.java b/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/VacationDaysDMNEndpoint.java
index a15f9a1..da0d800 100644
--- a/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/VacationDaysDMNEndpoint.java
+++ b/onboarding-example/payroll/src/main/java/org/kie/kogito/examples/VacationDaysDMNEndpoint.java
@@ -25,25 +25,20 @@
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import org.kie.dmn.api.core.DMNRuntime;
import org.kie.dmn.kogito.rest.quarkus.DMNKogitoQuarkus;
import org.kie.dmn.kogito.rest.quarkus.DMNResult;
import org.kie.kogito.examples.payroll.Payroll;
@Path("/vacationDays")
-@Api(description = "Vaction days service")
public class VacationDaysDMNEndpoint {
static final DMNRuntime dmnRuntime = DMNKogitoQuarkus.createGenericDMNRuntime();
@POST
@Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation("Calculates vacation days for given employee")
- public Payroll calculateVactionDays(@ApiParam(value = "data model representing employee to be used") Payroll payrollInput) {
+ @Produces(MediaType.APPLICATION_JSON)
+ public Payroll calculateVactionDays(Payroll payrollInput) {
DMNResult evaluate = DMNKogitoQuarkus.evaluate(dmnRuntime, "vacationDays", Collections.singletonMap("employee", payrollInput.getEmployee()));
Payroll payroll = new Payroll();
