This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-17792/doc-message-headers in repository https://gitbox.apache.org/repos/asf/camel.git
commit 309179822d6a872bb6f17557a382203d23416fd2 Author: Nicolas Filotto <nfilo...@talend.com> AuthorDate: Thu Mar 17 14:07:33 2022 +0100 CAMEL-17792: Add doc about the message headers of camel-cmis --- .../org/apache/camel/component/cmis/cmis.json | 17 +++++ .../camel-cmis/src/main/docs/cmis-component.adoc | 36 +--------- .../apache/camel/component/cmis/CMISEndpoint.java | 2 +- .../apache/camel/component/cmis/CMISHelper.java | 3 +- .../apache/camel/component/cmis/CMISProducer.java | 48 ++++++------- .../camel/component/cmis/CMISSessionFacade.java | 4 +- .../camel/component/cmis/CamelCMISConstants.java | 33 +++++++++ .../camel/component/cmis/CMISProducerTest.java | 78 +++++++++++----------- .../camel/component/cmis/CMISTestSupport.java | 11 ++- 9 files changed, 125 insertions(+), 107 deletions(-) diff --git a/components/camel-cmis/src/generated/resources/org/apache/camel/component/cmis/cmis.json b/components/camel-cmis/src/generated/resources/org/apache/camel/component/cmis/cmis.json index 4b0dda1..7f92e29 100644 --- a/components/camel-cmis/src/generated/resources/org/apache/camel/component/cmis/cmis.json +++ b/components/camel-cmis/src/generated/resources/org/apache/camel/component/cmis/cmis.json @@ -27,6 +27,23 @@ "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...] "sessionFacadeFactory": { "kind": "property", "displayName": "Session Facade Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cmis.CMISSessionFacadeFactory", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances" } }, + "headers": { + "cmis:action": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "org.apache.camel.component.cmis.CamelCMISActions", "enum": [ "CREATE", "DELETE_DOCUMENT", "DELETE_FOLDER", "MOVE_DOCUMENT", "MOVE_FOLDER", "COPY_DOCUMENT", "COPY_FOLDER", "RENAME", "CHECK_IN", "CHECK_OUT", "CANCEL_CHECK_OUT", "GET_FOLDER", "LIST_FOLDER", "FIND_OBJECT_BY_ID", "FIND_OBJECT_BY_PATH", "CREATE_FOLDER_BY_PATH", "DOWNLOAD_DOCUMENT" ], "deprecated": [...] + "cmis:path": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If `CamelCMISFolderPath` is not set, will try to find out the path of\nthe node from this cmis property and it is name" }, + "cmis:name": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If `CamelCMISFolderPath` is not set, will try to find out the path of\nthe node from this cmis property and it is path" }, + "cmis:objectTypeId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The type of the node" }, + "cmis:checkinComment": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The check-in comment for the document version" }, + "cmis:contentStreamMimeType": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The mimetype to set for a document" }, + "CamelCMISFolderPath": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "\/", "description": "The current folder to use during the execution. If not specified will\nuse the root folder" }, + "CamelCMISObjectId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the object" }, + "CamelCMISDestinationFolderId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the destination folder" }, + "CamelCMISSourceFolderId": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The id of the source folder" }, + "CamelCMISResultCount": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Number of nodes returned from the query" }, + "CamelCMISRetrieveContent": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "In `queryMode` this header will force the producer to retrieve the\ncontent of document nodes." }, + "CamelCMISReadSize": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Max number of nodes to read." }, + "CamelCMISAllVersions": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Apply only to this version (false) or all versions (true)" }, + "cmis:versioningState": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The versioning state" } + }, "properties": { "cmsUrl": { "kind": "path", "displayName": "Cms Url", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "URL to the cmis repository" }, "pageSize": { "kind": "parameter", "displayName": "Page Size", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 100, "configurationClass": "org.apache.camel.component.cmis.CMISSessionFacade", "configurationField": "sessionFacade", "description": "Number of nodes to retrieve per page" }, diff --git a/components/camel-cmis/src/main/docs/cmis-component.adoc b/components/camel-cmis/src/main/docs/cmis-component.adoc index 688cf3b..7b5d689 100644 --- a/components/camel-cmis/src/main/docs/cmis-component.adoc +++ b/components/camel-cmis/src/main/docs/cmis-component.adoc @@ -44,39 +44,9 @@ include::partial$component-endpoint-options.adoc[] == Usage -=== Message headers evaluated by the producer - -[width="100%",cols="10%,10%,80%",options="header",] -|======================================================================= -|Header |Default Value |Description - -|`CamelCMISFolderPath` |`/` |The current folder to use during the execution. If not specified will -use the root folder - -|`CamelCMISRetrieveContent` |`false` |In `queryMode` this header will force the producer to retrieve the -content of document nodes. - -|`CamelCMISReadSize` |`0` |Max number of nodes to read. - -|`cmis:path` |`null` |If `CamelCMISFolderPath` is not set, will try to find out the path of -the node from this cmis property and it is name - -|`cmis:name` |`null` |If `CamelCMISFolderPath` is not set, will try to find out the path of -the node from this cmis property and it is path - -|`cmis:objectTypeId` |`null` |The type of the node - -|`cmis:contentStreamMimeType` |`null` |The mimetype to set for a document -|======================================================================= - -=== Message headers set during querying Producer operation - -[width="100%",cols="10%,10%,80%",options="header",] -|======================================================================= -|Header |Type |Description - -|`CamelCMISResultCount` |`Integer` |Number of nodes returned from the query. -|======================================================================= +// component headers: START +include::partial$component-endpoint-headers.adoc[] +// component headers: END The message body will contain a list of maps, where each entry in the map is cmis property and its value. If `CamelCMISRetrieveContent` header is set to true, one additional diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java index 7b555a6..4cf644d 100644 --- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java +++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISEndpoint.java @@ -32,7 +32,7 @@ import org.apache.camel.support.DefaultEndpoint; * Read and write data from to/from a CMIS compliant content repositories. */ @UriEndpoint(firstVersion = "2.11.0", scheme = "cmis", title = "CMIS", syntax = "cmis:cmsUrl", - category = { Category.CMS, Category.DATABASE }) + category = { Category.CMS, Category.DATABASE }, headersClass = CamelCMISConstants.class) public class CMISEndpoint extends DefaultEndpoint { @UriPath(description = "URL to the cmis repository") diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java index a26d5b9..30738d9 100644 --- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java +++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java @@ -22,7 +22,6 @@ import java.util.Map; import org.apache.chemistry.opencmis.client.api.CmisObject; import org.apache.chemistry.opencmis.client.api.Property; -import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.data.PropertyData; public final class CMISHelper { @@ -61,7 +60,7 @@ public final class CMISHelper { } public static Object getObjectTypeId(CmisObject child) { - return child.getPropertyValue(PropertyIds.OBJECT_TYPE_ID); //BASE_TYPE_ID? + return child.getPropertyValue(CamelCMISConstants.OBJECT_TYPE_ID); //BASE_TYPE_ID? } } diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java index fcf89e8..cf721a6 100644 --- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java +++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java @@ -104,10 +104,10 @@ public class CMISProducer extends DefaultProducer { */ @SuppressWarnings("unused") public CmisObject findObjectByPath(Exchange exchange) throws Exception { - validateRequiredHeader(exchange, PropertyIds.PATH); + validateRequiredHeader(exchange, CamelCMISConstants.PATH); Message message = exchange.getIn(); - String path = message.getHeader(PropertyIds.PATH, String.class); + String path = message.getHeader(CamelCMISConstants.PATH, String.class); try { return getSessionFacade().getObjectByPath(path); @@ -158,8 +158,8 @@ public class CMISProducer extends DefaultProducer { Map<String, Object> result = new HashMap<>(properties.size()); String objectTypeName = CamelCMISConstants.CMIS_DOCUMENT; - if (properties.containsKey(PropertyIds.OBJECT_TYPE_ID)) { - objectTypeName = (String) properties.get(PropertyIds.OBJECT_TYPE_ID); + if (properties.containsKey(CamelCMISConstants.OBJECT_TYPE_ID)) { + objectTypeName = (String) properties.get(CamelCMISConstants.OBJECT_TYPE_ID); } Set<String> types = new HashSet<>(); @@ -187,7 +187,7 @@ public class CMISProducer extends DefaultProducer { */ @SuppressWarnings("unused") public CmisObject createNode(Exchange exchange) throws Exception { - validateRequiredHeader(exchange, PropertyIds.NAME); + validateRequiredHeader(exchange, CamelCMISConstants.NAME); Message message = exchange.getIn(); String parentFolderId = message.getHeader(CamelCMISConstants.CMIS_OBJECT_ID, String.class); @@ -196,7 +196,7 @@ public class CMISProducer extends DefaultProducer { Map<String, Object> cmisProperties = filterTypeProperties(message.getHeaders()); if (isDocument(exchange)) { - String fileName = message.getHeader(PropertyIds.NAME, String.class); + String fileName = message.getHeader(CamelCMISConstants.NAME, String.class); String mimeType = getMimeType(message); byte[] buf = getBodyData(message); ContentStream contentStream = getSessionFacade().createContentStream(fileName, buf, mimeType); @@ -214,12 +214,12 @@ public class CMISProducer extends DefaultProducer { */ @SuppressWarnings("unused") public Folder createFolderByPath(Exchange exchange) throws Exception { - validateRequiredHeader(exchange, PropertyIds.PATH); - validateRequiredHeader(exchange, PropertyIds.NAME); + validateRequiredHeader(exchange, CamelCMISConstants.PATH); + validateRequiredHeader(exchange, CamelCMISConstants.NAME); Message message = exchange.getIn(); Map<String, Object> cmisProperties = filterTypeProperties(message.getHeaders()); - String parentPath = message.getHeader(PropertyIds.PATH, String.class); + String parentPath = message.getHeader(CamelCMISConstants.PATH, String.class); CmisObject result = getSessionFacade().getObjectByPath(parentPath); @@ -340,7 +340,7 @@ public class CMISProducer extends DefaultProducer { VersioningState versioningState = VersioningState.NONE; - if (getSessionFacade().isObjectTypeVersionable(message.getHeader(PropertyIds.OBJECT_TYPE_ID, String.class))) { + if (getSessionFacade().isObjectTypeVersionable(message.getHeader(CamelCMISConstants.OBJECT_TYPE_ID, String.class))) { if (org.apache.camel.util.ObjectHelper.isNotEmpty(message.getHeader(CamelCMISConstants.VERSIONING_STATE))) { versioningState = VersioningState.valueOf(message.getHeader(CamelCMISConstants.VERSIONING_STATE, String.class)); } else { @@ -348,9 +348,9 @@ public class CMISProducer extends DefaultProducer { } } - String newDocumentName = message.getHeader(PropertyIds.NAME, String.class); + String newDocumentName = message.getHeader(CamelCMISConstants.NAME, String.class); if (org.apache.camel.util.ObjectHelper.isNotEmpty(newDocumentName)) { - return document.copy(destinationFolder, Collections.singletonMap(PropertyIds.NAME, newDocumentName), + return document.copy(destinationFolder, Collections.singletonMap(CamelCMISConstants.NAME, newDocumentName), versioningState, null, null, null, getSessionFacade().createOperationContext()); } @@ -398,8 +398,8 @@ public class CMISProducer extends DefaultProducer { private Map<String, CmisObject> copyFolderRecursive( Folder destinationFolder, Folder toCopyFolder, Map<String, CmisObject> result) { Map<String, Object> folderProperties = new HashMap<>(); - folderProperties.put(PropertyIds.NAME, toCopyFolder.getName()); - folderProperties.put(PropertyIds.OBJECT_TYPE_ID, toCopyFolder.getBaseTypeId().value()); + folderProperties.put(CamelCMISConstants.NAME, toCopyFolder.getName()); + folderProperties.put(CamelCMISConstants.OBJECT_TYPE_ID, toCopyFolder.getBaseTypeId().value()); Folder newFolder = destinationFolder.createFolder(folderProperties); result.put(toCopyFolder.getId(), newFolder); copyChildren(newFolder, toCopyFolder, result); @@ -424,12 +424,12 @@ public class CMISProducer extends DefaultProducer { */ @SuppressWarnings("unused") public CmisObject rename(Exchange exchange) throws Exception { - validateRequiredHeader(exchange, PropertyIds.NAME); + validateRequiredHeader(exchange, CamelCMISConstants.NAME); validateRequiredHeader(exchange, CamelCMISConstants.CMIS_OBJECT_ID); Message message = exchange.getIn(); - String newName = message.getHeader(PropertyIds.NAME, String.class); + String newName = message.getHeader(CamelCMISConstants.NAME, String.class); String objectId = message.getHeader(CamelCMISConstants.CMIS_OBJECT_ID, String.class); try { CmisObject object = getSessionFacade().getObjectById(objectId); @@ -452,8 +452,8 @@ public class CMISProducer extends DefaultProducer { Message message = exchange.getIn(); String objectId = message.getHeader(CamelCMISConstants.CMIS_OBJECT_ID, String.class); - String checkInComment = message.getHeader(PropertyIds.CHECKIN_COMMENT, String.class); - String fileName = message.getHeader(PropertyIds.NAME, String.class); + String checkInComment = message.getHeader(CamelCMISConstants.CHECKIN_COMMENT, String.class); + String fileName = message.getHeader(CamelCMISConstants.NAME, String.class); String mimeType = getMimeType(message); InputStream inputStream = (InputStream) message.getBody(); @@ -512,7 +512,7 @@ public class CMISProducer extends DefaultProducer { } private boolean isFolder(Message message) throws Exception { - String baseTypeId = message.getHeader(PropertyIds.OBJECT_TYPE_ID, String.class); + String baseTypeId = message.getHeader(CamelCMISConstants.OBJECT_TYPE_ID, String.class); if (baseTypeId != null) { return CamelCMISConstants.CMIS_FOLDER.equals(getSessionFacade().getCMISTypeFor(baseTypeId)); } @@ -520,7 +520,7 @@ public class CMISProducer extends DefaultProducer { } private Folder storeFolder(Folder parentFolder, Map<String, Object> cmisProperties) { - cmisProperties.putIfAbsent(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + cmisProperties.putIfAbsent(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); LOG.debug("Creating folder with properties: {}", cmisProperties); return parentFolder.createFolder(cmisProperties); @@ -529,11 +529,11 @@ public class CMISProducer extends DefaultProducer { private Document storeDocument( Folder parentFolder, Map<String, Object> cmisProperties, ContentStream contentStream, String versioning) throws Exception { - cmisProperties.putIfAbsent(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + cmisProperties.putIfAbsent(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); VersioningState versioningState = VersioningState.NONE; - if (getSessionFacade().isObjectTypeVersionable((String) cmisProperties.get(PropertyIds.OBJECT_TYPE_ID))) { + if (getSessionFacade().isObjectTypeVersionable((String) cmisProperties.get(CamelCMISConstants.OBJECT_TYPE_ID))) { if (org.apache.camel.util.ObjectHelper.isNotEmpty(versioning)) { versioningState = VersioningState.valueOf(versioning); } else { @@ -550,7 +550,7 @@ public class CMISProducer extends DefaultProducer { } private boolean isDocument(Exchange exchange) throws Exception { - String baseTypeId = exchange.getIn().getHeader(PropertyIds.OBJECT_TYPE_ID, String.class); + String baseTypeId = exchange.getIn().getHeader(CamelCMISConstants.OBJECT_TYPE_ID, String.class); if (baseTypeId != null) { return CamelCMISConstants.CMIS_DOCUMENT.equals(getSessionFacade().getCMISTypeFor(baseTypeId)); } @@ -562,7 +562,7 @@ public class CMISProducer extends DefaultProducer { } private String getMimeType(Message message) { - String mimeType = message.getHeader(PropertyIds.CONTENT_STREAM_MIME_TYPE, String.class); + String mimeType = message.getHeader(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, String.class); if (mimeType == null) { mimeType = MessageHelper.getContentType(message); } diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java index ff40d5e..bffb922 100644 --- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java +++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java @@ -110,7 +110,7 @@ public class CMISSessionFacade { LOG.debug("Processing page {}", pageNumber); for (QueryResult item : currentPage) { Map<String, Object> properties = CMISHelper.propertyDataToMap(item.getProperties()); - Object objectTypeId = item.getPropertyValueById(PropertyIds.OBJECT_TYPE_ID); + Object objectTypeId = item.getPropertyValueById(CamelCMISConstants.OBJECT_TYPE_ID); InputStream inputStream = null; if (readContent && CamelCMISConstants.CMIS_DOCUMENT.equals(objectTypeId)) { inputStream = getContentStreamFor(item); @@ -173,7 +173,7 @@ public class CMISSessionFacade { } public Document getDocument(QueryResult queryResult) { - if (CamelCMISConstants.CMIS_DOCUMENT.equals(queryResult.getPropertyValueById(PropertyIds.OBJECT_TYPE_ID)) + if (CamelCMISConstants.CMIS_DOCUMENT.equals(queryResult.getPropertyValueById(CamelCMISConstants.OBJECT_TYPE_ID)) || CamelCMISConstants.CMIS_DOCUMENT.equals(queryResult.getPropertyValueById(PropertyIds.BASE_TYPE_ID))) { String objectId = (String) queryResult.getPropertyById(PropertyIds.OBJECT_ID).getFirstValue(); return (org.apache.chemistry.opencmis.client.api.Document) session.getObject(objectId); diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CamelCMISConstants.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CamelCMISConstants.java index 90b4515..523de54 100644 --- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CamelCMISConstants.java +++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CamelCMISConstants.java @@ -16,19 +16,52 @@ */ package org.apache.camel.component.cmis; +import org.apache.camel.spi.Metadata; +import org.apache.chemistry.opencmis.commons.PropertyIds; + public interface CamelCMISConstants { String CMIS_DOCUMENT = "cmis:document"; String CMIS_FOLDER = "cmis:folder"; + @Metadata(label = "producer", description = "The action to perform", + javaType = "org.apache.camel.component.cmis.CamelCMISActions") String CMIS_ACTION = "cmis:action"; + @Metadata(label = "producer", description = "If `CamelCMISFolderPath` is not set, will try to find out the path of\n" + + "the node from this cmis property and it is name", + javaType = "String") + String PATH = PropertyIds.PATH; + @Metadata(label = "producer", description = "If `CamelCMISFolderPath` is not set, will try to find out the path of\n" + + "the node from this cmis property and it is path", + javaType = "String") + String NAME = PropertyIds.NAME; + @Metadata(label = "producer", description = "The type of the node", javaType = "String") + String OBJECT_TYPE_ID = PropertyIds.OBJECT_TYPE_ID; + @Metadata(label = "producer", description = "The check-in comment for the document version", javaType = "String") + String CHECKIN_COMMENT = PropertyIds.CHECKIN_COMMENT; + @Metadata(label = "producer", description = "The mimetype to set for a document", javaType = "String") + String CONTENT_STREAM_MIME_TYPE = PropertyIds.CONTENT_STREAM_MIME_TYPE; + @Metadata(label = "producer", description = "The current folder to use during the execution. If not specified will\n" + + "use the root folder", + javaType = "String", defaultValue = "/") String CMIS_FOLDER_PATH = "CamelCMISFolderPath"; + @Metadata(label = "producer", description = "The id of the object", javaType = "String") String CMIS_OBJECT_ID = "CamelCMISObjectId"; + @Metadata(label = "producer", description = "The id of the destination folder", javaType = "String") String CMIS_DESTIONATION_FOLDER_ID = "CamelCMISDestinationFolderId"; + @Metadata(label = "producer", description = "The id of the source folder", javaType = "String") String CMIS_SOURCE_FOLDER_ID = "CamelCMISSourceFolderId"; String CMIS_DOCUMENT_PATH = "CamelCMISDocumentPath"; + @Metadata(label = "producer", description = "Number of nodes returned from the query", javaType = "Integer") String CAMEL_CMIS_RESULT_COUNT = "CamelCMISResultCount"; + @Metadata(label = "producer", description = "In `queryMode` this header will force the producer to retrieve the\n" + + "content of document nodes.", + javaType = "Boolean") String CAMEL_CMIS_RETRIEVE_CONTENT = "CamelCMISRetrieveContent"; + @Metadata(label = "producer", description = "Max number of nodes to read.", javaType = "Integer") String CAMEL_CMIS_READ_SIZE = "CamelCMISReadSize"; String CAMEL_CMIS_CONTENT_STREAM = "CamelCMISContent"; + @Metadata(label = "producer", description = "Apply only to this version (false) or all versions (true)", + javaType = "Boolean") String ALL_VERSIONS = "CamelCMISAllVersions"; + @Metadata(label = "producer", description = "The versioning state", javaType = "String") String VERSIONING_STATE = "cmis:versioningState"; } diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java index bf40892..175f715 100644 --- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java +++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java @@ -55,9 +55,9 @@ public class CMISProducerTest extends CMISTestSupport { void storeMessageBodyAsTextDocument() throws Exception { String content = "Some content to be store"; Exchange exchange = createExchangeWithInBody(content); - exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.file"); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "test.file"); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, createSession().getRootFolder().getId()); @@ -74,22 +74,22 @@ public class CMISProducerTest extends CMISTestSupport { @Test void getDocumentMimeTypeFromMessageContentType() { Exchange exchange = createExchangeWithInBody("Some content to be store"); - exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE, "text/plain"); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.file"); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, "text/plain"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "test.file"); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, createSession().getRootFolder().getId()); template.send(exchange); CmisObject cmisObject = exchange.getMessage().getBody(CmisObject.class); - assertEquals("text/plain", cmisObject.getPropertyValue(PropertyIds.CONTENT_STREAM_MIME_TYPE)); + assertEquals("text/plain", cmisObject.getPropertyValue(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE)); } @Test void namePropertyIsAlwaysRequired() { Exchange exchange = createExchangeWithInBody("Some content that will fail to be stored"); - exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); + exchange.getIn().getHeaders().put(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); template.send(exchange); @@ -103,9 +103,9 @@ public class CMISProducerTest extends CMISTestSupport { @Test void createDocumentWithoutContentByExplicitlySpecifyingObjectTypeHeader() { Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.file"); + exchange.getIn().getHeaders().put(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "test.file"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, createSession().getRootFolder().getId()); @@ -114,13 +114,13 @@ public class CMISProducerTest extends CMISTestSupport { CmisObject cmisObject = exchange.getMessage().getBody(CmisObject.class); assertNotNull(cmisObject); - assertEquals(CamelCMISConstants.CMIS_DOCUMENT, cmisObject.getPropertyValue(PropertyIds.OBJECT_TYPE_ID)); + assertEquals(CamelCMISConstants.CMIS_DOCUMENT, cmisObject.getPropertyValue(CamelCMISConstants.OBJECT_TYPE_ID)); } @Test void emptyBodyAndMissingObjectTypeHeaderCreatesFolderNode() { Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "testFolder"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "testFolder"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, createSession().getRootFolder().getId()); @@ -128,16 +128,16 @@ public class CMISProducerTest extends CMISTestSupport { CmisObject cmisObject = exchange.getMessage().getBody(CmisObject.class); assertNotNull(cmisObject); - assertEquals(CamelCMISConstants.CMIS_FOLDER, cmisObject.getPropertyValue(PropertyIds.OBJECT_TYPE_ID)); + assertEquals(CamelCMISConstants.CMIS_FOLDER, cmisObject.getPropertyValue(CamelCMISConstants.OBJECT_TYPE_ID)); assertTrue(cmisObject instanceof Folder); } @Test void cmisPropertiesAreStored() { Exchange exchange = createExchangeWithInBody("Some content to be store"); - exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.txt"); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "test.txt"); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, createSession().getRootFolder().getId()); exchange.getIn().getHeaders().put(CamelCMISConstants.VERSIONING_STATE, VersioningState.MAJOR); @@ -145,9 +145,9 @@ public class CMISProducerTest extends CMISTestSupport { template.send(exchange); CmisObject cmisObject = exchange.getMessage().getBody(CmisObject.class); - assertEquals("test.txt", cmisObject.getPropertyValue(PropertyIds.NAME)); + assertEquals("test.txt", cmisObject.getPropertyValue(CamelCMISConstants.NAME)); assertEquals("text/plain; charset=UTF-8", - cmisObject.getPropertyValue(PropertyIds.CONTENT_STREAM_MIME_TYPE)); + cmisObject.getPropertyValue(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE)); } @Test @@ -156,11 +156,11 @@ public class CMISProducerTest extends CMISTestSupport { List<String> secondaryTypes = Arrays.asList("MySecondaryType"); Exchange exchange = createExchangeWithInBody("Some content to be store"); - exchange.getIn().getHeaders().put(PropertyIds.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.txt"); + exchange.getIn().getHeaders().put(CamelCMISConstants.CONTENT_STREAM_MIME_TYPE, "text/plain; charset=UTF-8"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "test.txt"); exchange.getIn().getHeaders().put(PropertyIds.SECONDARY_OBJECT_TYPE_IDS, secondaryTypes); exchange.getIn().getHeaders().put("SecondaryStringProp", "secondaryTypePropValue"); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, createSession().getRootFolder().getId()); @@ -178,7 +178,7 @@ public class CMISProducerTest extends CMISTestSupport { Producer producer = endpoint.createProducer(); Exchange exchange = createExchangeWithInBody("Some content to be store"); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "test.txt"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "test.txt"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); assertThrows(RuntimeCamelException.class, () -> { @@ -190,8 +190,8 @@ public class CMISProducerTest extends CMISTestSupport { void failCreatingFolderAtNonExistingParentId() { Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "folder1"); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "folder1"); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.CREATE); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, "Wrong Id"); @@ -215,16 +215,16 @@ public class CMISProducerTest extends CMISTestSupport { Folder folder = createFolderWithName("New Folder"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, folder.getId()); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "Renamed Folder"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "Renamed Folder"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.RENAME); template.send(exchange); CmisObject cmisObject = exchange.getMessage().getBody(CmisObject.class); - assertEquals("Renamed Folder", cmisObject.getPropertyValue(PropertyIds.NAME)); + assertEquals("Renamed Folder", cmisObject.getPropertyValue(CamelCMISConstants.NAME)); assertEquals(folder.getId(), cmisObject.getId()); assertTrue(cmisObject instanceof Folder); } @@ -235,16 +235,16 @@ public class CMISProducerTest extends CMISTestSupport { Document document = createTextDocument(createSession().getRootFolder(), "This is new test document", "document.txt"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, document.getId()); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "Renamed Document.txt"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "Renamed Document.txt"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.RENAME); template.send(exchange); CmisObject cmisObject = exchange.getMessage().getBody(CmisObject.class); - assertEquals("Renamed Document.txt", cmisObject.getPropertyValue(PropertyIds.NAME)); + assertEquals("Renamed Document.txt", cmisObject.getPropertyValue(CamelCMISConstants.NAME)); assertEquals(document.getId(), cmisObject.getId()); assertTrue(cmisObject instanceof Document); } @@ -255,7 +255,7 @@ public class CMISProducerTest extends CMISTestSupport { Folder folder = createFolderWithName("Test"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.DELETE_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, folder.getId()); @@ -279,7 +279,7 @@ public class CMISProducerTest extends CMISTestSupport { Document document = createTextDocument(createSession().getRootFolder(), "This is new test document", "document.txt"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.DELETE_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, document.getId()); @@ -296,7 +296,7 @@ public class CMISProducerTest extends CMISTestSupport { Folder destinationFolder = createFolderWithName("Destination"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.MOVE_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, toBeMoved.getId()); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_DESTIONATION_FOLDER_ID, destinationFolder.getId()); @@ -316,7 +316,7 @@ public class CMISProducerTest extends CMISTestSupport { Folder destinationFolder = createFolderWithName("Destination"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.MOVE_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, toBeMoved.getId()); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_SOURCE_FOLDER_ID, rootFolder.getId()); @@ -333,7 +333,7 @@ public class CMISProducerTest extends CMISTestSupport { Document document = createTextDocument(createSession().getRootFolder(), "This is new test document", "document.txt"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.COPY_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, document.getId()); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_DESTIONATION_FOLDER_ID, destination.getId()); @@ -354,9 +354,9 @@ public class CMISProducerTest extends CMISTestSupport { Document document = createTextDocument(createSession().getRootFolder(), "This is new test document", "document.txt"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.COPY_DOCUMENT); - exchange.getIn().getHeaders().put(PropertyIds.NAME, "renamedDocument.txt"); + exchange.getIn().getHeaders().put(CamelCMISConstants.NAME, "renamedDocument.txt"); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, document.getId()); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_DESTIONATION_FOLDER_ID, destination.getId()); @@ -378,7 +378,7 @@ public class CMISProducerTest extends CMISTestSupport { Folder destination = createFolderWithName("Destination Folder"); Exchange exchange = createExchangeWithInBody(null); - exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + exchange.getIn().getHeaders().put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_ACTION, CamelCMISActions.COPY_FOLDER); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_OBJECT_ID, folder.getId()); exchange.getIn().getHeaders().put(CamelCMISConstants.CMIS_DESTIONATION_FOLDER_ID, destination.getId()); diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java index 82b4728..532f5c3 100644 --- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java +++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java @@ -38,7 +38,6 @@ import org.apache.chemistry.opencmis.client.api.Repository; import org.apache.chemistry.opencmis.client.api.Session; import org.apache.chemistry.opencmis.client.api.SessionFactory; import org.apache.chemistry.opencmis.client.runtime.SessionFactoryImpl; -import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.SessionParameter; import org.apache.chemistry.opencmis.commons.data.ContentStream; import org.apache.chemistry.opencmis.commons.enums.BindingType; @@ -81,7 +80,7 @@ public class CMISTestSupport extends CamelTestSupport { Folder rootFolder = session.getRootFolder(); ItemIterable<CmisObject> children = rootFolder.getChildren(); for (CmisObject cmisObject : children) { - if (CamelCMISConstants.CMIS_FOLDER.equals(cmisObject.getPropertyValue(PropertyIds.OBJECT_TYPE_ID))) { + if (CamelCMISConstants.CMIS_FOLDER.equals(cmisObject.getPropertyValue(CamelCMISConstants.OBJECT_TYPE_ID))) { List<String> notDeltedIdList = ((Folder) cmisObject) .deleteTree(true, UnfileObject.DELETE, true); if (notDeltedIdList != null && notDeltedIdList.size() > 0) { @@ -130,8 +129,8 @@ public class CMISTestSupport extends CamelTestSupport { protected Folder createChildFolderWithName(Folder parent, String childName) { Map<String, String> newFolderProps = new HashMap<>(); - newFolderProps.put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); - newFolderProps.put(PropertyIds.NAME, childName); + newFolderProps.put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER); + newFolderProps.put(CamelCMISConstants.NAME, childName); return parent.createFolder(newFolderProps); } @@ -143,8 +142,8 @@ public class CMISTestSupport extends CamelTestSupport { .createContentStream(fileName, buf.length, "text/plain; charset=UTF-8", input); Map<String, Object> properties = new HashMap<>(); - properties.put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); - properties.put(PropertyIds.NAME, fileName); + properties.put(CamelCMISConstants.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT); + properties.put(CamelCMISConstants.NAME, fileName); return newFolder.createDocument(properties, contentStream, VersioningState.NONE); }