Merge branch 'develop-acs60' into develop-acs61

pom.xml

@@ -5,10 +5,10 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-api</artifactId>
-	<version>2.1.0-acs7</version>
+	<version>2.1-SNAPSHOT-acs61</version>
 
 	<name>Alfresco Content Services ReST API for Java</name>
-	<description>A library for building ACS v7.x JAX-RS REST API clients</description>
+	<description>A library for building ACS v6.1.x JAX-RS REST API clients</description>
 	<url>https://bitbucket.org/inteligr8/acs-public-rest-api</url>
 
 	<licenses>
@@ -44,7 +44,7 @@
 
 		<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>
 		
-		<alfresco.platform.version>7.3.0</alfresco.platform.version>
+		<alfresco.platform.version>6.1.0</alfresco.platform.version>
 
 		<jersey.version>2.39.1</jersey.version>
 		<cxf.version>3.5.6</cxf.version>
@@ -144,17 +144,6 @@
 					<generateModelDocumentation>false</generateModelDocumentation>
 				</configuration>
 				<executions>
-					<!-- search before core, as ContentInfo is incorrect in search -->
-					<execution>
-						<id>swagger-search-codegen</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-search.yaml</inputSpec>
-						</configuration>
-					</execution>
 					<execution>
 						<id>swagger-core-codegen</id>
 						<phase>generate-sources</phase>
@@ -175,6 +164,16 @@
 							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-workflow.yaml</inputSpec>
 						</configuration>
 					</execution>
+					<execution>
+						<id>swagger-search-codegen</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-search.yaml</inputSpec>
+						</configuration>
+					</execution>
 					<execution>
 						<id>swagger-auth-codegen</id>
 						<phase>generate-sources</phase>
@@ -195,16 +194,6 @@
 							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-discovery.yaml</inputSpec>
 						</configuration>
 					</execution>
-					<execution>
-						<id>swagger-model-codegen</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<inputSpec>${project.build.directory}/dependency/definitions/alfresco-model.yaml</inputSpec>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -255,10 +244,6 @@
 									<pattern>(\*\*Search API\*\*[^@]*)@Path\("/"\)</pattern>
 									<replacement>$1@Path("/api/-default-/public/search/versions/1")</replacement>
 								</regex>
-								<regex>
-									<pattern>(\*\*Model API\*\*[^@]*)@Path\("/"\)</pattern>
-									<replacement>$1@Path("/api/-default-/public/alfresco/versions/1")</replacement>
-								</regex>
 							</regexes>
 						</configuration>
 					</execution>

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

@@ -16,7 +16,6 @@ package com.inteligr8.alfresco.acs;
 
 import com.inteligr8.alfresco.acs.api.ActionsApi;
 import com.inteligr8.alfresco.acs.api.ActivitiesApi;
-import com.inteligr8.alfresco.acs.api.AspectsApi;
 import com.inteligr8.alfresco.acs.api.AuditApi;
 import com.inteligr8.alfresco.acs.api.AuthenticationApi;
 import com.inteligr8.alfresco.acs.api.CommentsApi;
@@ -41,7 +40,6 @@ 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.TypesApi;
 import com.inteligr8.alfresco.acs.api.V0Api;
 import com.inteligr8.alfresco.acs.api.VersionsApi;
 
@@ -62,10 +60,6 @@ public interface AcsPublicRestApi {
 	default ActivitiesApi getActivitiesApi() {
 		return this.getApi(ActivitiesApi.class);
 	}
-	
-	default AspectsApi getAspectsApi() {
-		return this.getApi(AspectsApi.class);
-	}
 
 	default AuditApi getAuditApi() {
 		return this.getApi(AuditApi.class);
@@ -163,10 +157,6 @@ public interface AcsPublicRestApi {
 		return this.getApi(TrashcanApi.class);
 	}
 	
-	default TypesApi getTypesApi() {
-		return this.getApi(TypesApi.class);
-	}
-	
 	default VersionsApi getVersionsApi() {
 		return this.getApi(VersionsApi.class);
 	}

src/main/java/com/inteligr8/alfresco/acs/model/NodeBodyCreateMultipartCxf.java

@@ -17,6 +17,7 @@ package com.inteligr8.alfresco.acs.model;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -90,9 +91,18 @@ public class NodeBodyCreateMultipartCxf extends MultipartBody {
 		if (nodeBody.getAspectNames() != null && !nodeBody.getAspectNames().isEmpty())
 			logger.warn("The ACS Public REST API does not support the explicit inclusion of aspects while creating content");
 		if (nodeBody.getProperties() != null) {
-			Map<String, ?> props = (Map<String, ?>)nodeBody.getProperties();
+			@SuppressWarnings("unchecked")
+            Map<String, ?> props = (Map<String, ?>)nodeBody.getProperties();
 			for (Entry<String, ?> prop : props.entrySet()) {
-				if (prop.getValue() != null) {
+				if (prop.getValue() instanceof Collection<?>) {
+				    for (Object value : (Collection<?>)prop.getValue())
+				        if (value != null)
+				            atts.add(toAttachment(prop.getKey(), value.toString()));
+				} else if (prop.getValue() instanceof Object[]) {
+                    for (Object value : (Object[])prop.getValue())
+                        if (value != null)
+                            atts.add(toAttachment(prop.getKey(), value.toString()));
+				} else if (prop.getValue() != null) {
 					// FIXME convert dates as ACS would expect them to be formatted
 					atts.add(toAttachment(prop.getKey(), prop.getValue().toString()));
 				}

src/main/java/com/inteligr8/alfresco/acs/model/NodeBodyCreateMultipartJersey.java

@@ -17,6 +17,7 @@ package com.inteligr8.alfresco.acs.model;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -86,12 +87,21 @@ public class NodeBodyCreateMultipartJersey extends FormDataMultiPart {
 		if (nodeBody.getAspectNames() != null && !nodeBody.getAspectNames().isEmpty())
 			logger.warn("The ACS Public REST API does not support the explicit inclusion of aspects while creating content");
 		if (nodeBody.getProperties() != null) {
-			Map<String, ?> props = (Map<String, ?>)nodeBody.getProperties();
+			@SuppressWarnings("unchecked")
+            Map<String, ?> props = (Map<String, ?>)nodeBody.getProperties();
 			for (Entry<String, ?> prop : props.entrySet()) {
-				if (prop.getValue() != null) {
-					// FIXME convert dates as ACS would expect them to be formatted
-					fields.add(new FormDataBodyPart(prop.getKey(), prop.getValue().toString()));
-				}
+                if (prop.getValue() instanceof Collection<?>) {
+                    for (Object value : (Collection<?>)prop.getValue())
+                        if (value != null)
+                            fields.add(new FormDataBodyPart(prop.getKey(), value.toString()));
+                } else if (prop.getValue() instanceof Object[]) {
+                    for (Object value : (Object[])prop.getValue())
+                        if (value != null)
+                            fields.add(new FormDataBodyPart(prop.getKey(), value.toString()));
+                } else if (prop.getValue() != null) {
+                    // FIXME convert dates as ACS would expect them to be formatted
+                    fields.add(new FormDataBodyPart(prop.getKey(), prop.getValue().toString()));
+                }
 			}
 		}