Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java?rev=1758242&r1=1758241&r2=1758242&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java Mon Aug 29 15:12:25 2016 @@ -80,15 +80,16 @@ import org.slf4j.LoggerFactory; * unlock the state of the repository. It is very important that the caller * acquiring the lock enforces an unlock under all circumstances. Typical code * is: - * <p> * * <pre> + * {@code * ObjectStoreImpl os = ... ; * try { * os.lock(); * } finally { * os.unlock(); * } + * } * </pre> * * The locking is very coarse-grained. Productive implementations would probably @@ -465,7 +466,7 @@ public class ObjectStoreImpl implements if (key.equals(PropertyIds.SECONDARY_OBJECT_TYPE_IDS)) { properties.put(key, value); // preserve it even if it is empty! - } else if (null == value || value.getValues() == null || value.getFirstValue() == null) { + } else if (null == value || value.getValues() == null || value.getFirstValue() == null) { // delete property properties.remove(key); } else { @@ -505,12 +506,10 @@ public class ObjectStoreImpl implements if (so instanceof Relationship && so.getTypeId().equals(typeId)) { Relationship ro = (Relationship) so; if (ro.getSourceObjectId().equals(objectId) - && (RelationshipDirection.EITHER == direction - || RelationshipDirection.SOURCE == direction)) { + && (RelationshipDirection.EITHER == direction || RelationshipDirection.SOURCE == direction)) { res.add(so); } else if (ro.getTargetObjectId().equals(objectId) - && (RelationshipDirection.EITHER == direction - || RelationshipDirection.TARGET == direction)) { + && (RelationshipDirection.EITHER == direction || RelationshipDirection.TARGET == direction)) { res.add(so); } } @@ -543,8 +542,7 @@ public class ObjectStoreImpl implements } @Override - public Acl applyAcl(StoredObject so, Acl addAces, Acl removeAces, AclPropagation aclPropagation, - String principalId) { + public Acl applyAcl(StoredObject so, Acl addAces, Acl removeAces, AclPropagation aclPropagation, String principalId) { if (aclPropagation == AclPropagation.OBJECTONLY || !(so instanceof Folder)) { return applyAcl(so, addAces, removeAces); } else { @@ -662,8 +660,7 @@ public class ObjectStoreImpl implements } @Override - public ChildrenResult getChildren(Folder folder, int maxItemsParam, int skipCountParam, String user, - boolean usePwc) { + public ChildrenResult getChildren(Folder folder, int maxItemsParam, int skipCountParam, String user, boolean usePwc) { List<Fileable> children = getChildren(folder, user, usePwc); sortFolderList(children); @@ -761,10 +758,10 @@ public class ObjectStoreImpl implements throw new CmisInvalidArgumentException("Root folder cannot be renamed."); } if (so.getName().equals(newName)) { - return; + return; } if (so instanceof Fileable) { - for (String folderId : ((Fileable)so).getParentIds()) { + for (String folderId : ((Fileable) so).getParentIds()) { Folder folder = (Folder) getObjectById(folderId); if (hasChild(folder, newName)) { throw new CmisNameConstraintViolationException("Cannot rename object to " + newName @@ -1058,7 +1055,7 @@ public class ObjectStoreImpl implements } else if (offset <= 0 && length < 0) { return contentStream; } else { - return ((ContentStreamDataImpl)contentStream).getCloneWithLimits(offset, length); + return ((ContentStreamDataImpl) contentStream).getCloneWithLimits(offset, length); } } else { throw new CmisInvalidArgumentException("Cannot set content, object does not implement interface Content."); @@ -1075,7 +1072,8 @@ public class ObjectStoreImpl implements newContent = null; } else { boolean useFakeContentStore = so.getTypeId().equals(DefaultTypeSystemCreator.BIG_CONTENT_FAKE_TYPE); - newContent = new ContentStreamDataImpl(MAX_CONTENT_SIZE_KB == null ? 0 : MAX_CONTENT_SIZE_KB, useFakeContentStore); + newContent = new ContentStreamDataImpl(MAX_CONTENT_SIZE_KB == null ? 0 : MAX_CONTENT_SIZE_KB, + useFakeContentStore); String fileName = contentStream.getFileName(); if (null == fileName || fileName.length() <= 0) { fileName = so.getName(); // use name of document as fallback @@ -1120,7 +1118,7 @@ public class ObjectStoreImpl implements throw new CmisInvalidArgumentException("Cannot set content, object does not implement interface Content."); } } - + @Override public List<RenditionData> getRenditions(StoredObject so, String renditionFilter, long maxItems, long skipCount) {
Modified: chemistry/opencmis/trunk/pom.xml URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1758242&r1=1758241&r2=1758242&view=diff ============================================================================== --- chemistry/opencmis/trunk/pom.xml (original) +++ chemistry/opencmis/trunk/pom.xml Mon Aug 29 15:12:25 2016 @@ -464,6 +464,22 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <tags> + <tag> + <name>cmis</name> + <placement>a</placement> + <head>CMIS:</head> + </tag> + </tags> + <locale>en</locale> + <encoding>utf-8</encoding> + </configuration> + </plugin> </plugins> <extensions> <extension> @@ -516,7 +532,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> <inherited>false</inherited> <reportSets> <reportSet>
