[exo-jcr-commits] exo-jcr SVN: r2286 - in jcr/trunk/exo.jcr.component.webdav/src: main/java/org/exoplatform/services/jcr/webdav/util and 1 other directories.

Author: dkatayev Date: 2010-04-16 09:55:00 -0400 (Fri, 16 Apr 2010) New Revision: 2286 Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java Log: EXOJCR-638 problem with setting mixins fixed Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java 2010-04-15 15:24:38 UTC (rev 2285) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java 2010-04-16 13:55:00 UTC (rev 2286) @@ -84,7 +84,7 @@ * @return the instance of javax.ws.rs.core.Response */ Response put(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String fileNodeTypeHeader, - String contentNodeTypeHeader, List<String> mixinTypes, MediaType mediatype, InputStream inputStream); + String contentNodeTypeHeader, String mixinTypes, MediaType mediatype, InputStream inputStream); /** * @param repoName repository name @@ -120,7 +120,7 @@ * @return the instance of javax.ws.rs.core.Response */ Response mkcol(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String nodeTypeHeader, - List<String> mixinTypesHeader); + String mixinTypesHeader); /** * @param repoName repository name Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-04-15 15:24:38 UTC (rev 2285) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-04-16 13:55:00 UTC (rev 2286) @@ -682,7 +682,7 @@ public Response mkcol(@PathParam("repoName") String repoName, @PathParam("repoPath") String repoPath, @HeaderParam(ExtHttpHeaders.LOCKTOKEN) String lockTokenHeader, @HeaderParam(ExtHttpHeaders.IF) String ifHeader, @HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String nodeTypeHeader, - @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) List<String> mixinTypesHeader) + @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypesHeader) { if (log.isDebugEnabled()) { @@ -942,7 +942,7 @@ @HeaderParam(ExtHttpHeaders.LOCKTOKEN) String lockTokenHeader, @HeaderParam(ExtHttpHeaders.IF) String ifHeader, @HeaderParam(ExtHttpHeaders.FILE_NODETYPE) String fileNodeTypeHeader, @HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String contentNodeTypeHeader, - @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) List<String> mixinTypes, + @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypes, @HeaderParam(ExtHttpHeaders.CONTENT_TYPE) MediaType mediatype, InputStream inputStream) { Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java 2010-04-15 15:24:38 UTC (rev 2285) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java 2010-04-16 13:55:00 UTC (rev 2286) @@ -21,7 +21,8 @@ import org.exoplatform.services.jcr.webdav.WebDavConst; import java.util.ArrayList; -import java.util.List; +import java.util.Arrays; +import java.util.Collections; import javax.jcr.nodetype.NoSuchNodeTypeException; import javax.jcr.nodetype.NodeType; @@ -51,6 +52,7 @@ // Default nodetype for the file. return null; } + /** * Returns the NodeType of content node according to the Content-NodeType * header. @@ -87,14 +89,9 @@ * @param mixinTypes list of mixins or null * @return list of mixins */ - public static ArrayList<String> getMixinTypes(List<String> mixinTypes) + public static ArrayList<String> getMixinTypes(String mixinTypes) { - ArrayList<String> mixins = new ArrayList<String>(); - if (mixinTypes == null) - { - return mixins; - } - return mixins; + return mixinTypes == null ? new ArrayList<String>() : new ArrayList<String>(Arrays.asList(mixinTypes.split(","))); } } Modified: jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java 2010-04-15 15:24:38 UTC (rev 2285) +++ jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java 2010-04-16 13:55:00 UTC (rev 2286) @@ -117,6 +117,8 @@ assertEquals(HTTPStatus.CREATED, containerResponse.getStatus()); NodeType[] mixins = TestUtils.getContentMixins(session, fileName); + assertEquals(2, mixins.length); + for (NodeType mixin : mixins) { assertTrue(mixin.getName().equals("mix:wdTestMixin1") || mixin.getName().equals("mix:wdTestMixin2"));