Updates for Peer OpenAPI generation

Author: mikera

convex-restapi/pom.xml

@@ -33,6 +33,7 @@
 						</annotationProcessorPath>
 					</annotationProcessorPaths>
 				</configuration>
+				<!-- 
 				<executions>
 					<execution>
 						<id>default-compile</id>
@@ -41,6 +42,18 @@
 						</goals>
 					</execution>
 				</executions>
+				-->
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+					<!-- 
+						<exclude>openapi-plugin/**</exclude>>
+						-->
+					</excludes>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

convex-restapi/src/main/java/convex/restapi/RESTServer.java

@@ -148,7 +148,7 @@ protected SslPlugin getSSLPlugin(HashMap<Keyword, Object> config) {
 	}
 
 	protected void addOpenApiPlugins(JavalinConfig config) {
-		String docsPath="openapi-plugin/openapi-default.json";
+		String docsPath="openapi-plugin/openapi-restapi.json";
 
 		config.registerPlugin(new OpenApiPlugin(pluginConfig -> {
             pluginConfig

convex-restapi/src/main/java/convex/restapi/WebApp.java

@@ -39,7 +39,7 @@ private void indexPage(Context ctx) {
 					p("Version: "+Utils.getVersion()),
 					p(a("Explorer").withHref("explorer")),
 
-					p("This is the default web page for a Convex Peer Server running the REST API")
+					p("This is the web page for a Convex Peer Server running the REST API")
 				)
 			);
 		ctx.result(content.render());

convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java

@@ -100,6 +100,7 @@ public void addRoutes(Javalin app) {
 	}
 
 	@OpenApi(path = ROUTE + "data/{hash}", 
+			versions="peer-v1",
 			methods = HttpMethod.POST, 
 			tags = { "Data Lattice"},
 			summary = "Get data from the server with the specified hash", 
@@ -131,10 +132,11 @@ public void getData(Context ctx) {
 	}
 
 	@OpenApi(path = ROUTE + "createAccount", 
+			versions="peer-v1",
 			methods = HttpMethod.POST, 
 			operationId = "createAccount", 
 			tags = { "Account"},
-			summary = "Create a new Convex account. Requires a peer winning to accept faucet requests.", 
+			summary = "Create a new Convex account. Requires a peer willing to accept faucet requests.", 
 			requestBody = @OpenApiRequestBody(
 				description = "Create Account request, must provide an accountKey for the new Account", 
 				content = {@OpenApiContent(
@@ -184,6 +186,7 @@ public void createAccount(Context ctx) throws InterruptedException {
 	}
 
 	@OpenApi(path = ROUTE + "accounts/{address}", 
+			versions="peer-v1",
 			methods = HttpMethod.GET, 
 			operationId = "queryAccount", 
 			tags = { "Account"},
@@ -273,6 +276,7 @@ public void queryPeer(Context ctx) throws InterruptedException {
 	private static Keyword K_FAUCET=Keyword.create("faucet");
 
 	@OpenApi(path = ROUTE + "faucet", 
+			versions="peer-v1",
 			methods = HttpMethod.POST, 
 			operationId = "faucetRequest", 
 			tags = { "Account"},
@@ -363,6 +367,7 @@ private boolean isFaucetEnabled() {
 	}
 
 	@OpenApi(path = ROUTE+"transaction/prepare",
+			versions="peer-v1",
 			methods = HttpMethod.POST,
 			operationId = "transactionPrepare",
 			tags= {"Transactions"},
@@ -433,6 +438,7 @@ public void transactionPrepare(Context ctx) throws InterruptedException, IOExcep
 
 	@SuppressWarnings("unchecked")
 	@OpenApi(path = ROUTE+"transact",
+			versions="peer-v1",
 			methods = HttpMethod.POST,
 			operationId = "transact",
 			tags= {"Transactions"},
@@ -540,6 +546,7 @@ private static ACell readCode(Object srcValue) {
 	}
 
 	@OpenApi(path = ROUTE+"transaction/submit",
+			versions="peer-v1",
 			methods = HttpMethod.POST,
 			operationId = "transactionSubmit",
 			tags= {"Transactions"},
@@ -618,6 +625,7 @@ public void transactionSubmit(Context ctx) throws InterruptedException {
 	}
 
 	@OpenApi(path = ROUTE+"query",
+		versions="peer-v1",
 		methods = HttpMethod.POST,
 		operationId = "query",
 		tags= {"Transactions"},

convex-restapi/src/main/java/convex/restapi/api/PeerAdminAPI.java

@@ -38,6 +38,7 @@ public void addRoutes(Javalin app) {
 	}
 
 	@OpenApi(path = ROUTE + "peer/shutdown", 
+			versions="peer-v1",
 			methods = HttpMethod.POST, 
 			operationId = "shutdownPeer", 
 			tags = { "Admin"},