Merge branch 'develop-acs61' into develop-acs62

This commit is contained in:
Brian Long 2023-06-16 09:51:20 -04:00
commit 573804252b
3 changed files with 72 additions and 32 deletions

11
.gitignore vendored
View File

@ -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*

65
pom.xml
View File

@ -54,14 +54,23 @@
<dependencies>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>1.6.2</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
</exclusions>
<artifactId>swagger-annotations</artifactId>
<version>1.6.11</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.11</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
@ -120,9 +129,9 @@
</executions>
</plugin>
<plugin>
<groupId>io.swagger</groupId>
<groupId>io.swagger.codegen.v3</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
<version>2.4.21</version>
<version>3.0.45</version>
<configuration>
<language>jaxrs-cxf-client</language>
<output>${basedir}</output>
@ -145,6 +154,16 @@
<inputSpec>${project.build.directory}/dependency/definitions/alfresco-core.yaml</inputSpec>
</configuration>
</execution>
<execution>
<id>swagger-workflow-codegen</id>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${project.build.directory}/dependency/definitions/alfresco-workflow.yaml</inputSpec>
</configuration>
</execution>
<execution>
<id>swagger-search-codegen</id>
<phase>generate-sources</phase>
@ -180,7 +199,7 @@
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<executions>
<execution>
<id>fix-baseUrl</id>
@ -202,24 +221,28 @@
<replacement></replacement>
</regex>
<regex>
<pattern>(\*\*Core API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/"</pattern>
<replacement>$1@Path("/api/-default-/public/alfresco/versions/1")$2@Api(value = "/api/-default-/public/alfresco/versions/1"</replacement>
<pattern>public NodeEntry createNode\(@Multipart.*</pattern>
<previousPattern>/\*\*</previousPattern>
</regex>
<regex>
<pattern>(\*\*Search API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/"</pattern>
<replacement>$1@Path("/api/-default-/public/search/versions/1")$2@Api(value = "/api/-default-/public/search/versions/1"</replacement>
<pattern>(\*\*Core API\*\*[^@]*)@Path\("/"\)</pattern>
<replacement>$1@Path("/api/-default-/public/alfresco/versions/1")</replacement>
</regex>
<regex>
<pattern>(\*\*Model API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/"</pattern>
<replacement>$1@Path("/api/-default-/public/alfresco/versions/1")$2@Api(value = "/api/-default-/public/alfresco/versions/1"</replacement>
<pattern>(\*\*Workflow API\*\*[^@]*)@Path\("/"\)</pattern>
<replacement>$1@Path("/api/-default-/public/workflow/versions/1")</replacement>
</regex>
<regex>
<pattern>(\*\*Authentication API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/"</pattern>
<replacement>$1@Path("/api/-default-/public/authentication/versions/1")$2@Api(value = "/api/-default-/public/authentication/versions/1"</replacement>
<pattern>(\*\*Authentication API\*\*[^@]*)@Path\("/"\)</pattern>
<replacement>$1@Path("/api/-default-/public/authentication/versions/1")</replacement>
</regex>
<regex>
<pattern>(\*\*Discovery API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/"</pattern>
<replacement>$1@Path("/api")$2@Api(value = "/api"</replacement>
<pattern>(\*\*Discovery API\*\*[^@]*)@Path\("/"\)</pattern>
<replacement>$1@Path("/api")</replacement>
</regex>
<regex>
<pattern>(\*\*Search API\*\*[^@]*)@Path\("/"\)</pattern>
<replacement>$1@Path("/api/-default-/public/search/versions/1")</replacement>
</regex>
</regexes>
</configuration>

View File

@ -19,6 +19,7 @@ import com.inteligr8.alfresco.acs.api.ActivitiesApi;
import com.inteligr8.alfresco.acs.api.AuditApi;
import com.inteligr8.alfresco.acs.api.AuthenticationApi;
import com.inteligr8.alfresco.acs.api.CommentsApi;
import com.inteligr8.alfresco.acs.api.DeploymentsApi;
import com.inteligr8.alfresco.acs.api.DiscoveryApi;
import com.inteligr8.alfresco.acs.api.DownloadsApi;
import com.inteligr8.alfresco.acs.api.FavoritesApi;
@ -28,6 +29,8 @@ import com.inteligr8.alfresco.acs.api.NodesApi;
import com.inteligr8.alfresco.acs.api.PeopleApi;
import com.inteligr8.alfresco.acs.api.PreferencesApi;
import com.inteligr8.alfresco.acs.api.ProbesApi;
import com.inteligr8.alfresco.acs.api.ProcessDefinitionsApi;
import com.inteligr8.alfresco.acs.api.ProcessesApi;
import com.inteligr8.alfresco.acs.api.QueriesApi;
import com.inteligr8.alfresco.acs.api.RatingsApi;
import com.inteligr8.alfresco.acs.api.RenditionsApi;
@ -35,6 +38,7 @@ import com.inteligr8.alfresco.acs.api.SearchApi;
import com.inteligr8.alfresco.acs.api.SharedLinksApi;
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.TrashcanApi;
import com.inteligr8.alfresco.acs.api.V0Api;
import com.inteligr8.alfresco.acs.api.VersionsApi;
@ -68,6 +72,10 @@ public interface AcsPublicRestApi {
default CommentsApi getCommentsApi() {
return this.getApi(CommentsApi.class);
}
default DeploymentsApi getDeploymentsApi() {
return this.getApi(DeploymentsApi.class);
}
default DiscoveryApi getDiscoveryApi() {
return this.getApi(DiscoveryApi.class);
@ -96,10 +104,18 @@ public interface AcsPublicRestApi {
default PeopleApi getPeopleApi() {
return this.getApi(PeopleApi.class);
}
default PreferencesApi getPreferencesApi() {
return this.getApi(PreferencesApi.class);
}
default PreferencesApi getPreferencesApi() {
return this.getApi(PreferencesApi.class);
}
default ProcessDefinitionsApi getProcessDefinitionApi() {
return this.getApi(ProcessDefinitionsApi.class);
}
default ProcessesApi getProcessesApi() {
return this.getApi(ProcessesApi.class);
}
default ProbesApi getProbesApi() {
return this.getApi(ProbesApi.class);
@ -132,6 +148,10 @@ public interface AcsPublicRestApi {
default TagsApi getTagsApi() {
return this.getApi(TagsApi.class);
}
default TasksApi getTasksApi() {
return this.getApi(TasksApi.class);
}
default TrashcanApi getTrashcanApi() {
return this.getApi(TrashcanApi.class);