From a11aced4e3c0e44f8d968b303ff3cb7f840243eb Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 16 Jun 2023 09:27:25 -0400 Subject: [PATCH] completed v5.1 support with swagger v3.x --- .gitignore | 11 ++--- pom.xml | 47 ++++++++++++------- .../alfresco/acs/AcsPublicRestApi.java | 20 ++++++++ 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index fb47e97..8785467 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,6 @@ # Maven -pom.xml.versionsBackup target - -# Maven Invoker -build.log -invoker-reports +pom.xml.versionsBackup # Eclipse .project @@ -13,8 +9,9 @@ invoker-reports # Visual Studio Code .factorypath +.vscode # Swagger Codegen src/gen -.swagger-codegen -.swagger-codegen-ignore +.swagger* + diff --git a/pom.xml b/pom.xml index d064181..7a0bf30 100644 --- a/pom.xml +++ b/pom.xml @@ -52,11 +52,26 @@ + + io.swagger + swagger-annotations + 1.6.11 + io.swagger.core.v3 swagger-annotations 2.2.11 + + javax.validation + validation-api + 2.0.1.Final + + + org.slf4j + slf4j-api + 2.0.7 + jakarta.ws.rs jakarta.ws.rs-api @@ -139,12 +154,22 @@ ${project.build.directory}/dependency/definitions/alfresco-core.yaml + + swagger-workflow-codegen + generate-sources + + generate + + + ${project.build.directory}/dependency/definitions/alfresco-workflow.yaml + + com.inteligr8 regex-maven-plugin - 1.0.4 + 1.0.5 fix-baseUrl @@ -166,24 +191,12 @@ - (\*\*Core API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/" - $1@Path("/api/-default-/public/alfresco/versions/1")$2@Api(value = "/api/-default-/public/alfresco/versions/1" + (\* Alfresco Core REST API[^@]*)@Path\("/"\) + $1@Path("/api/-default-/public/alfresco/versions/1") - (\*\*Search API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/" - $1@Path("/api/-default-/public/search/versions/1")$2@Api(value = "/api/-default-/public/search/versions/1" - - - (\*\*Model API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/" - $1@Path("/api/-default-/public/alfresco/versions/1")$2@Api(value = "/api/-default-/public/alfresco/versions/1" - - - (\*\*Authentication API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/" - $1@Path("/api/-default-/public/authentication/versions/1")$2@Api(value = "/api/-default-/public/authentication/versions/1" - - - (\*\*Discovery API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/" - $1@Path("/api")$2@Api(value = "/api" + (\* Alfresco Workflow REST API[^@]*)@Path\("/"\) + $1@Path("/api/-default-/public/workflow/versions/1") diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java index d66989a..4d0f6b7 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java @@ -15,12 +15,16 @@ package com.inteligr8.alfresco.acs; import com.inteligr8.alfresco.acs.api.CommentsApi; +import com.inteligr8.alfresco.acs.api.DeploymentsApi; import com.inteligr8.alfresco.acs.api.FavoritesApi; import com.inteligr8.alfresco.acs.api.NetworksApi; import com.inteligr8.alfresco.acs.api.PeopleApi; +import com.inteligr8.alfresco.acs.api.ProcessDefinitionsApi; +import com.inteligr8.alfresco.acs.api.ProcessesApi; import com.inteligr8.alfresco.acs.api.RatingsApi; import com.inteligr8.alfresco.acs.api.SitesApi; import com.inteligr8.alfresco.acs.api.TagsApi; +import com.inteligr8.alfresco.acs.api.TasksApi; import com.inteligr8.alfresco.acs.api.V0Api; /** @@ -37,6 +41,10 @@ public interface AcsPublicRestApi { return this.getApi(CommentsApi.class); } + default DeploymentsApi getDeploymentsApi() { + return this.getApi(DeploymentsApi.class); + } + default FavoritesApi getFavoritesApi() { return this.getApi(FavoritesApi.class); } @@ -48,6 +56,14 @@ public interface AcsPublicRestApi { default PeopleApi getPeopleApi() { return this.getApi(PeopleApi.class); } + + default ProcessDefinitionsApi getProcessDefinitionApi() { + return this.getApi(ProcessDefinitionsApi.class); + } + + default ProcessesApi getProcessesApi() { + return this.getApi(ProcessesApi.class); + } default RatingsApi getRatingsApi() { return this.getApi(RatingsApi.class); @@ -60,6 +76,10 @@ public interface AcsPublicRestApi { default TagsApi getTagsApi() { return this.getApi(TagsApi.class); } + + default TasksApi getTasksApi() { + return this.getApi(TasksApi.class); + } default V0Api getV0Api() { return this.getApi(V0Api.class);