reinstate swagger-gradle-plugin

build.gradle

@@ -7,6 +7,7 @@ plugins {
   id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
   id "org.javamodularity.moduleplugin" version "1.8.8"
   id 'org.ec4j.editorconfig' version '0.0.3'
+  id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.0" apply false
 }
 
 ext {

tessera-jaxrs/common-jaxrs/build.gradle

@@ -14,27 +14,27 @@ dependencies {
   implementation project(":shared")
   implementation project(":encryption:encryption-api")
 
-  constraints {
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion") {
-      because 'databind less than 2.13.2.2 has a bug'
-    }
-  }
-
   implementation "jakarta.ws.rs:jakarta.ws.rs-api"
-
   implementation "jakarta.validation:jakarta.validation-api"
-
   implementation "jakarta.xml.bind:jakarta.xml.bind-api"
-  implementation "org.apache.commons:commons-lang3"
   implementation "jakarta.persistence:jakarta.persistence-api"
-  testImplementation project(":server:jersey-server")
   api "jakarta.inject:jakarta.inject-api"
+
+  implementation "org.apache.commons:commons-lang3"
+
+  testImplementation project(":server:jersey-server")
   api "org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api"
 
   implementation "io.swagger.core.v3:swagger-annotations-jakarta"
   implementation "io.swagger.core.v3:swagger-core-jakarta"
   implementation "io.swagger.parser.v3:swagger-parser-v3"
   implementation "io.swagger.core.v3:swagger-jaxrs2-jakarta"
+
+  constraints {
+    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion") {
+      because 'databind less than 2.13.2.2 has a bug'
+    }
+  }
 }
 
 test {

tessera-jaxrs/openapi/generate/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+  id "io.swagger.core.v3.swagger-gradle-plugin"
+}
+
 dependencies {
   compileOnly project(":tessera-jaxrs:common-jaxrs")
   compileOnly project(":tessera-jaxrs:sync-jaxrs")
@@ -16,3 +20,19 @@ dependencies {
   compileOnly "io.swagger.core.v3:swagger-core-jakarta"
   compileOnly "org.glassfish:jakarta.json"
 }
+
+resolve {
+  classpath = sourceSets.main.compileClasspath
+  outputDir = file("${project.buildDir}/generated-resources/openapi")
+  outputFormat = 'JSONANDYAML'
+  prettyPrint = true
+  openApiFile = file("${project.projectDir}/src/main/resources/openapi-base.yaml")
+  modelConverterClasses = [
+    'com.quorum.tessera.openapi.FullyQualifiedNameResolver'
+  ]
+}
+
+// exists to have a self-documenting task name when called from CI/CD
+task generateOpenApiDoc {
+  dependsOn resolve
+}

tessera-jaxrs/sync-jaxrs/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+  id "io.swagger.core.v3.swagger-gradle-plugin"
   id "java-library"
 }
 
@@ -12,20 +13,19 @@ dependencies {
   implementation project(":encryption:encryption-api")
   implementation project(":tessera-jaxrs:jaxrs-client")
   implementation project(':tessera-jaxrs:partyinfo-model')
-  api "io.swagger.core.v3:swagger-annotations-jakarta"
   implementation project(":tessera-core")
   implementation project(":tessera-partyinfo")
   implementation project(":tessera-data")
   implementation project(":tessera-context")
   implementation project(":tessera-recover")
 
+  api "io.swagger.core.v3:swagger-annotations-jakarta"
+
   implementation "org.apache.commons:commons-lang3"
 
   implementation "jakarta.validation:jakarta.validation-api"
-
   implementation "jakarta.ws.rs:jakarta.ws.rs-api"
   implementation "jakarta.xml.bind:jakarta.xml.bind-api"
-
   api "jakarta.inject:jakarta.inject-api"
 
   compileOnly project(':tessera-jaxrs:openapi:common')
@@ -49,4 +49,25 @@ jar {
 
 def generatedResources = "${project.buildDir}/generated-resources/openapi"
 
+resolve {
+  classpath = sourceSets.main.compileClasspath.plus(sourceSets.main.runtimeClasspath)
+  outputDir = file(generatedResources)
+  outputFileName = "openapi.p2p"
+  outputFormat = "JSONANDYAML"
+  prettyPrint = "TRUE"
+  openApiFile = file("${project.projectDir}/src/main/resources/openapi-base-p2p.yaml")
+  resourcePackages = [
+    "com.quorum.tessera.api.common",
+    "com.quorum.tessera.p2p",
+    "com.quorum.tessera.thirdparty",
+    "com.quorum.tessera.q2t"
+  ]
+  modelConverterClasses = [
+    "com.quorum.tessera.openapi.FullyQualifiedNameResolver"
+  ]
+  filterClass = "com.quorum.tessera.openapi.P2POperationsFilter"
+}
+
 sourceSets.main.output.dir(generatedResources)
+
+jar.dependsOn(resolve)

tessera-jaxrs/thirdparty-jaxrs/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+  id "io.swagger.core.v3.swagger-gradle-plugin"
   id "java-library"
 }
 
@@ -35,8 +36,31 @@ description = "thirdparty-jaxrs"
 
 def generatedResources = "${project.buildDir}/generated-resources/openapi"
 
+resolve {
+  classpath = sourceSets.main.compileClasspath.plus(sourceSets.main.runtimeClasspath)
+  outputDir = file(generatedResources)
+  outputFileName = 'openapi.thirdparty'
+  outputFormat = 'JSONANDYAML'
+  prettyPrint = 'TRUE'
+  openApiFile = file("${project.projectDir}/src/main/resources/openapi-base-thirdparty.yaml")
+  resourcePackages = [
+    'com.quorum.tessera.api.common',
+    'com.quorum.tessera.p2p',
+    'com.quorum.tessera.thirdparty',
+    'com.quorum.tessera.q2t'
+  ]
+  modelConverterClasses = [
+    'com.quorum.tessera.openapi.FullyQualifiedNameResolver'
+  ]
+  filterClass = 'com.quorum.tessera.openapi.ThirdPartyOperationsFilter'
+}
+
 sourceSets.main.output.dir(generatedResources)
 
+jar.dependsOn(resolve)
+
+
+
 jar {
   manifest {
     attributes(

tessera-jaxrs/transaction-jaxrs/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+  id "io.swagger.core.v3.swagger-gradle-plugin"
   id "java-library"
 }
 
@@ -54,8 +55,31 @@ dependencies {
 
 def generatedResources = "${project.buildDir}/generated-resources/openapi"
 
+resolve {
+  classpath = sourceSets.main.compileClasspath.plus(sourceSets.main.runtimeClasspath)
+  outputDir = file(generatedResources)
+  outputFileName = "openapi.q2t"
+  outputFormat = "JSONANDYAML"
+  prettyPrint = true
+  openApiFile = file("${project.projectDir}/src/main/resources/openapi-base-q2t.yaml")
+  resourcePackages = [
+    'com.quorum.tessera.api.common',
+    'com.quorum.tessera.p2p',
+    'com.quorum.tessera.thirdparty',
+    'com.quorum.tessera.q2t'
+  ]
+  modelConverterClasses = [
+    "com.quorum.tessera.openapi.FullyQualifiedNameResolver"
+  ]
+  filterClass = "com.quorum.tessera.openapi.Q2TOperationsFilter"
+
+
+}
+
 sourceSets.main.output.dir(generatedResources)
 
+jar.dependsOn(resolve)
+
 jar {
 
   manifest {

tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/OpenApiIT.java

@@ -45,7 +45,6 @@ public void after() {
   }
 
   @Test
-  @Ignore
   public void openapiJson() throws IOException {
     final List<URI> allUris = List.of(node.getQ2TUri(), node.getP2PUri());
 
@@ -68,7 +67,6 @@ public void openapiJson() throws IOException {
   }
 
   @Test
-  @Ignore
   public void openapiYaml() {
     final List<URI> allUris = List.of(node.getQ2TUri(), node.getP2PUri());
 
@@ -91,7 +89,6 @@ public void openapiYaml() {
   }
 
   @Test
-  @Ignore
   public void openapiUnsupportedAccepts() {
     final List<URI> allUris = List.of(node.getQ2TUri(), node.getP2PUri());