Merge branch 'feature/matching_ernp_client' into 'feature/matching_base'

refactor(ernp): update openAPI specification from BM.I to use...

See merge request egiz/eidas_at_proxy!16

1 files changed, 48 insertions, 4 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml
index 5a24b67f..5f7edef0 100644
--- a/eidas_modules/authmodule-eIDAS-v2/pom.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml
@@ -137,14 +137,21 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.11.2</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>org.openapitools</groupId>
+      <artifactId>jackson-databind-nullable</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>io.swagger.parser.v3</groupId>
+      <artifactId>swagger-parser</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>org.bitbucket.b_c</groupId>
       <artifactId>jose4j</artifactId>
     </dependency>
@@ -229,6 +236,9 @@
       <resource>
         <directory>target/generated-sources/cxf</directory>
       </resource>
+      <resource>
+        <directory>target/generated-sources/swagger</directory>
+      </resource>      
     </resources>
 
     <plugins>
@@ -262,7 +272,7 @@
         </dependencies>
         <executions>
           <execution>
-            <id>generate-sources</id>
+            <id>generate-sources-soap</id>
             <phase>generate-sources</phase>
             <configuration>
               <sourceRoot>${project.build.directory}/generated/cxf</sourceRoot>
@@ -303,6 +313,39 @@
       </plugin>
 
       <plugin>
+        <groupId>org.openapitools</groupId>
+        <artifactId>openapi-generator-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-sources-json</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <skip>false</skip>
+              <skipOverwrite>false</skipOverwrite>
+              <inputSpec>${project.basedir}/src/main/resources/wsdl/ernp_client/openapi.json</inputSpec>
+              <generatorName>java</generatorName>
+              <output>${project.build.directory}/generated/swagger</output>
+              <apiPackage>at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ernp.api</apiPackage>
+              <modelPackage>at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ernp.model</modelPackage>
+              <invokerPackage>at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ernp.invoker</invokerPackage>
+              <configOptions>
+                <configPackage>at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.ernp</configPackage>
+                <delegatePattern>true</delegatePattern>
+                <basePackage>at.asitplus.eidas.specific.modules.auth.eidas.v2</basePackage>
+                <java8>true</java8>
+                <dateLibrary>java8</dateLibrary>
+                <serializationLibrary>jackson</serializationLibrary>
+                <library>resttemplate</library>
+              </configOptions>
+            </configuration>
+            <goals>
+              <goal>generate</goal>
+            </goals>            
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${spotbugs-maven-plugin.version}</version>
@@ -331,6 +374,7 @@
                 <exclude>**/szrservices/*</exclude>
                 <exclude>**/generated/cxf/*</exclude>
                 <exclude>**at/gv/bmi/namespace/*</exclude>
+                <exclude>**at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/ernp/*</exclude>
               </excludes>
             </configuration>
           </execution>