Commit a11aced4 authored by Brian Long's avatar Brian Long
Browse files

completed v5.1 support with swagger v3.x

parent 27fb71e6

.gitignore

+4 −7
Original line number Diff line number Diff line 
# 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*

pom.xml

+30 −17
Original line number Diff line number Diff line
@@ -52,11 +52,26 @@ 
	</properties>



	<dependencies>

		<dependency>

			<groupId>io.swagger</groupId>

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

			<artifactId>jakarta.ws.rs-api</artifactId>
@@ -139,12 +154,22 @@ 
							<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>

				</executions>

			</plugin>

			<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>
@@ -166,24 +191,12 @@ 
									<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>

								</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>

								</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>

								</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>(\* Alfresco Core REST API[^@]*)@Path\("/"\)</pattern>

									<replacement>$1@Path("/api/-default-/public/alfresco/versions/1")</replacement>

								</regex>

								<regex>

									<pattern>(\*\*Discovery API\*\*[^@]*)@Path\("/"\)([^@]*)@Api\(value = "/"</pattern>

									<replacement>$1@Path("/api")$2@Api(value = "/api"</replacement>

									<pattern>(\* Alfresco Workflow REST API[^@]*)@Path\("/"\)</pattern>

									<replacement>$1@Path("/api/-default-/public/workflow/versions/1")</replacement>

								</regex>

							</regexes>

						</configuration>

src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java

+20 −0
Original line number Diff line number Diff line
@@ -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);

	}
@@ -49,6 +57,14 @@ public interface AcsPublicRestApi { 
		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);

	}
@@ -61,6 +77,10 @@ public interface AcsPublicRestApi { 
		return this.getApi(TagsApi.class);

	}

    

    default TasksApi getTasksApi() {

        return this.getApi(TasksApi.class);

    }

	

	default V0Api getV0Api() {

		return this.getApi(V0Api.class);

	}