Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/CacheImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/CacheImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/CacheImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/CacheImpl.java Thu Aug 13 12:05:59 2015 @@ -60,6 +60,7 @@ public class CacheImpl implements Cache public CacheImpl() { } + @Override public void initialize(Session session, Map<String, String> parameters) { assert parameters != null; @@ -152,10 +153,12 @@ public class CacheImpl implements Cache } } + @Override public void clear() { initializeInternals(); } + @Override public boolean containsId(String objectId, String cacheKey) { lock.writeLock().lock(); try { @@ -175,6 +178,7 @@ public class CacheImpl implements Cache } } + @Override public boolean containsPath(String path, String cacheKey) { lock.writeLock().lock(); try { @@ -194,6 +198,7 @@ public class CacheImpl implements Cache } } + @Override public CmisObject getById(String objectId, String cacheKey) { lock.writeLock().lock(); try { @@ -202,12 +207,13 @@ public class CacheImpl implements Cache } Map<String, CmisObject> item = objectMap.get(objectId).getItem(); - return (item == null ? null : item.get(cacheKey)); + return item == null ? null : item.get(cacheKey); } finally { lock.writeLock().unlock(); } } + @Override public CmisObject getByPath(String path, String cacheKey) { lock.writeLock().lock(); try { @@ -222,6 +228,7 @@ public class CacheImpl implements Cache } } + @Override public void put(CmisObject object, String cacheKey) { // no object, no cache key - no cache if ((object == null) || (cacheKey == null)) { @@ -258,6 +265,7 @@ public class CacheImpl implements Cache } } + @Override public void putPath(String path, CmisObject object, String cacheKey) { if (path == null) { return; @@ -275,6 +283,7 @@ public class CacheImpl implements Cache } } + @Override public void remove(String objectId) { if (objectId == null) { return; @@ -288,6 +297,7 @@ public class CacheImpl implements Cache } } + @Override public int getCacheSize() { return this.cacheSize; } @@ -313,7 +323,7 @@ public class CacheImpl implements Cache return true; } - return (timestamp + ttl < System.currentTimeMillis()); + return timestamp + ttl < System.currentTimeMillis(); } public synchronized T getItem() {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/NoCacheImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/NoCacheImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/NoCacheImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/NoCacheImpl.java Thu Aug 13 12:05:59 2015 @@ -27,37 +27,47 @@ public class NoCacheImpl implements Cach private static final long serialVersionUID = 1L; + @Override public void initialize(Session session, Map<String, String> parameters) { } + @Override public boolean containsId(String objectId, String cacheKey) { return false; } + @Override public boolean containsPath(String path, String cacheKey) { return false; } + @Override public void put(CmisObject object, String cacheKey) { } + @Override public void putPath(String path, CmisObject object, String cacheKey) { } + @Override public CmisObject getById(String objectId, String cacheKey) { return null; } + @Override public CmisObject getByPath(String path, String cacheKey) { return null; } + @Override public void remove(String objectId) { } + @Override public void clear() { } + @Override public int getCacheSize() { return 0; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/DocumentTypeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/DocumentTypeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/DocumentTypeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/DocumentTypeImpl.java Thu Aug 13 12:05:59 2015 @@ -48,22 +48,27 @@ public class DocumentTypeImpl extends Do helper = new ObjectTypeHelper(session, this); } + @Override public ObjectType getBaseType() { return helper.getBaseType(); } + @Override public ItemIterable<ObjectType> getChildren() { return helper.getChildren(); } + @Override public List<Tree<ObjectType>> getDescendants(int depth) { return helper.getDescendants(depth); } + @Override public ObjectType getParentType() { return helper.getParentType(); } + @Override public boolean isBaseType() { return helper.isBaseType(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/FolderTypeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/FolderTypeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/FolderTypeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/FolderTypeImpl.java Thu Aug 13 12:05:59 2015 @@ -45,22 +45,27 @@ public class FolderTypeImpl extends Fold helper = new ObjectTypeHelper(session, this); } + @Override public ObjectType getBaseType() { return helper.getBaseType(); } + @Override public ItemIterable<ObjectType> getChildren() { return helper.getChildren(); } + @Override public List<Tree<ObjectType>> getDescendants(int depth) { return helper.getDescendants(depth); } + @Override public ObjectType getParentType() { return helper.getParentType(); } + @Override public boolean isBaseType() { return helper.isBaseType(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/ItemTypeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/ItemTypeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/ItemTypeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/ItemTypeImpl.java Thu Aug 13 12:05:59 2015 @@ -42,22 +42,27 @@ public class ItemTypeImpl extends ItemTy helper = new ObjectTypeHelper(session, this); } + @Override public ObjectType getBaseType() { return helper.getBaseType(); } + @Override public ItemIterable<ObjectType> getChildren() { return helper.getChildren(); } + @Override public List<Tree<ObjectType>> getDescendants(int depth) { return helper.getDescendants(depth); } + @Override public ObjectType getParentType() { return helper.getParentType(); } + @Override public boolean isBaseType() { return helper.isBaseType(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/PolicyTypeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/PolicyTypeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/PolicyTypeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/PolicyTypeImpl.java Thu Aug 13 12:05:59 2015 @@ -46,22 +46,27 @@ public class PolicyTypeImpl extends Poli helper = new ObjectTypeHelper(session, this); } + @Override public ObjectType getBaseType() { return helper.getBaseType(); } + @Override public ItemIterable<ObjectType> getChildren() { return helper.getChildren(); } + @Override public List<Tree<ObjectType>> getDescendants(int depth) { return helper.getDescendants(depth); } + @Override public ObjectType getParentType() { return helper.getParentType(); } + @Override public boolean isBaseType() { return helper.isBaseType(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/RelationshipTypeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/RelationshipTypeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/RelationshipTypeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/RelationshipTypeImpl.java Thu Aug 13 12:05:59 2015 @@ -51,26 +51,32 @@ public class RelationshipTypeImpl extend helper = new ObjectTypeHelper(session, this); } + @Override public ObjectType getBaseType() { return helper.getBaseType(); } + @Override public ItemIterable<ObjectType> getChildren() { return helper.getChildren(); } + @Override public List<Tree<ObjectType>> getDescendants(int depth) { return helper.getDescendants(depth); } + @Override public ObjectType getParentType() { return helper.getParentType(); } + @Override public boolean isBaseType() { return helper.isBaseType(); } + @Override public List<ObjectType> getAllowedSourceTypes() { if (allowedSourceTypes == null) { List<String> ids = getAllowedSourceTypeIds(); @@ -85,6 +91,7 @@ public class RelationshipTypeImpl extend return allowedSourceTypes; } + @Override public List<ObjectType> getAllowedTargetTypes() { if (allowedTargetTypes == null) { List<String> ids = getAllowedTargetTypeIds(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/SecondaryTypeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/SecondaryTypeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/SecondaryTypeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/objecttype/SecondaryTypeImpl.java Thu Aug 13 12:05:59 2015 @@ -24,22 +24,27 @@ public class SecondaryTypeImpl extends S helper = new ObjectTypeHelper(session, this); } + @Override public ObjectType getBaseType() { return helper.getBaseType(); } + @Override public ItemIterable<ObjectType> getChildren() { return helper.getChildren(); } + @Override public List<Tree<ObjectType>> getDescendants(int depth) { return helper.getDescendants(depth); } + @Override public ObjectType getParentType() { return helper.getParentType(); } + @Override public boolean isBaseType() { return helper.isBaseType(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/ObjectFactoryImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/ObjectFactoryImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/ObjectFactoryImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/ObjectFactoryImpl.java Thu Aug 13 12:05:59 2015 @@ -115,6 +115,7 @@ public class ObjectFactoryImpl implement public ObjectFactoryImpl() { } + @Override public void initialize(Session session, Map<String, String> parameters) { assert session != null; @@ -130,12 +131,14 @@ public class ObjectFactoryImpl implement // repository info + @Override public RepositoryInfo convertRepositoryInfo(RepositoryInfo repositoryInfo) { return repositoryInfo; } // ACL and ACE + @Override public Acl convertAces(List<Ace> aces) { if (aces == null) { return null; @@ -151,6 +154,7 @@ public class ObjectFactoryImpl implement return bof.createAccessControlList(bindingAces); } + @Override public Ace createAce(String principal, List<String> permissions) { BindingsObjectFactory bof = getBindingsObjectFactory(); @@ -159,6 +163,7 @@ public class ObjectFactoryImpl implement return ace; } + @Override public Acl createAcl(List<Ace> aces) { BindingsObjectFactory bof = getBindingsObjectFactory(); @@ -169,6 +174,7 @@ public class ObjectFactoryImpl implement // policies + @Override public List<String> convertPolicies(List<Policy> policies) { if (policies == null) { return null; @@ -187,6 +193,7 @@ public class ObjectFactoryImpl implement // renditions + @Override public Rendition convertRendition(String objectId, RenditionData rendition) { if (rendition == null) { throw new IllegalArgumentException("Rendition must be set!"); @@ -202,10 +209,12 @@ public class ObjectFactoryImpl implement // content stream + @Override public ContentStream createContentStream(String filename, long length, String mimetype, InputStream stream) { return createContentStream(filename, length, mimetype, stream, false); } + @Override public ContentStream createContentStream(String filename, long length, String mimetype, InputStream stream, boolean partial) { if (partial) { @@ -216,6 +225,7 @@ public class ObjectFactoryImpl implement } } + @Override public ContentStream convertContentStream(ContentStream contentStream) { if (contentStream == null) { return null; @@ -229,6 +239,7 @@ public class ObjectFactoryImpl implement // types + @Override public ObjectType convertTypeDefinition(TypeDefinition typeDefinition) { if (typeDefinition instanceof DocumentTypeDefinition) { return new DocumentTypeImpl(this.session, (DocumentTypeDefinition) typeDefinition); @@ -249,6 +260,7 @@ public class ObjectFactoryImpl implement } } + @Override public ObjectType getTypeFromObjectData(ObjectData objectData) { if ((objectData == null) || (objectData.getProperties() == null) || (objectData.getProperties().getProperties() == null)) { @@ -265,6 +277,7 @@ public class ObjectFactoryImpl implement // properties + @Override public <T> Property<T> createProperty(PropertyDefinition<T> type, List<T> values) { return new PropertyImpl<T>(type, values); } @@ -315,6 +328,7 @@ public class ObjectFactoryImpl implement return createProperty(definition, pd.getValues()); } + @Override public Map<String, Property<?>> convertProperties(ObjectType objectType, Collection<SecondaryType> secondaryTypes, Properties properties) { // check input @@ -341,6 +355,7 @@ public class ObjectFactoryImpl implement return result; } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Properties convertProperties(Map<String, ?> properties, ObjectType type, Collection<SecondaryType> secondaryTypes, Set<Updatability> updatabilityFilter) { @@ -415,7 +430,7 @@ public class ObjectFactoryImpl implement if (definition == null && allSecondaryTypes != null) { for (SecondaryType secondaryType : allSecondaryTypes) { if (secondaryType != null && secondaryType.getPropertyDefinitions() != null) { - definition = (PropertyDefinition<?>) secondaryType.getPropertyDefinitions().get(id); + definition = secondaryType.getPropertyDefinitions().get(id); if (definition != null) { break; } @@ -576,6 +591,7 @@ public class ObjectFactoryImpl implement return bof.createPropertiesData(propertyList); } + @Override public List<PropertyData<?>> convertQueryProperties(Properties properties) { // check input if ((properties == null) || (properties.getProperties() == null)) { @@ -586,6 +602,7 @@ public class ObjectFactoryImpl implement // objects + @Override public CmisObject convertObject(ObjectData objectData, OperationContext context) { if (objectData == null) { throw new IllegalArgumentException("Object data is null!"); @@ -620,6 +637,7 @@ public class ObjectFactoryImpl implement } } + @Override public QueryResult convertQueryResult(ObjectData objectData) { if (objectData == null) { throw new IllegalArgumentException("Object data is null!"); @@ -628,6 +646,7 @@ public class ObjectFactoryImpl implement return new QueryResultImpl(session, objectData); } + @Override public ChangeEvent convertChangeEvent(ObjectData objectData) { ChangeType changeType = null; GregorianCalendar changeTime = null; @@ -667,6 +686,7 @@ public class ObjectFactoryImpl implement return new ChangeEventImpl(changeType, changeTime, objectId, properties, policyIds, acl); } + @Override public ChangeEvents convertChangeEvents(String changeLogToken, ObjectList objectList) { if (objectList == null) { return null; @@ -683,8 +703,8 @@ public class ObjectFactoryImpl implement } } - boolean hasMoreItems = (objectList.hasMoreItems() == null ? false : objectList.hasMoreItems().booleanValue()); - long totalNumItems = (objectList.getNumItems() == null ? -1 : objectList.getNumItems().longValue()); + boolean hasMoreItems = objectList.hasMoreItems() == null ? false : objectList.hasMoreItems().booleanValue(); + long totalNumItems = objectList.getNumItems() == null ? -1 : objectList.getNumItems().longValue(); return new ChangeEventsImpl(changeLogToken, events, hasMoreItems, totalNumItems); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java Thu Aug 13 12:05:59 2015 @@ -63,6 +63,7 @@ public class RepositoryImpl extends Repo this.typeDefCache = typeDefCache; } + @Override @SuppressWarnings("unchecked") public <T extends Session> T createSession() { return (T) sessionFactory.createSession(parameters, objectFactory, authenticationProvider, cache, typeDefCache); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterable.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterable.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterable.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterable.java Thu Aug 13 12:05:59 2015 @@ -65,31 +65,38 @@ public abstract class AbstractIterable<T */ protected abstract AbstractIterator<T> createIterator(); + @Override public AbstractIterator<T> iterator() { return getIterator(); } + @Override public ItemIterable<T> skipTo(long position) { return new CollectionIterable<T>(position, pageFetcher); } + @Override public ItemIterable<T> getPage() { return new CollectionPageIterable<T>(skipCount, pageFetcher); } + @Override public ItemIterable<T> getPage(int maxNumItems) { this.pageFetcher.setMaxNumItems(maxNumItems); return new CollectionPageIterable<T>(skipCount, pageFetcher); } + @Override public long getPageNumItems() { return getIterator().getPageNumItems(); } + @Override public boolean getHasMoreItems() { return getIterator().getHasMoreItems(); } + @Override public long getTotalNumItems() { return getIterator().getTotalNumItems(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java Thu Aug 13 12:05:59 2015 @@ -91,6 +91,7 @@ public abstract class AbstractIterator<T return hasMoreItems.booleanValue(); } + @Override public void remove() { throw new UnsupportedOperationException(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ public class CollectionIterator<T> exten * * @see java.util.Iterator#hasNext() */ + @Override public boolean hasNext() { Page<T> page = getCurrentPage(); if (page == null) { @@ -73,6 +74,7 @@ public class CollectionIterator<T> exten * * @see java.util.Iterator#next() */ + @Override public T next() { Page<T> page = getCurrentPage(); if (page == null) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ public class CollectionPageIterator<T> e * * @see java.util.Iterator#hasNext() */ + @Override public boolean hasNext() { Page<T> page = getCurrentPage(); if (page == null) { @@ -63,6 +64,7 @@ public class CollectionPageIterator<T> e * * @see java.util.Iterator#next() */ + @Override public T next() { Page<T> page = getCurrentPage(); if (page == null) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/EmptyItemIterable.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/EmptyItemIterable.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/EmptyItemIterable.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/EmptyItemIterable.java Thu Aug 13 12:05:59 2015 @@ -35,6 +35,7 @@ public class EmptyItemIterable<T> implem return (EmptyItemIterable<U>) INSTANCE; } + @Override public ItemIterable<T> skipTo(long position) { if (position != 0) { throw new IllegalArgumentException(String.valueOf(position)); @@ -42,27 +43,33 @@ public class EmptyItemIterable<T> implem return this; } + @Override public ItemIterable<T> getPage() { return this; } + @Override public ItemIterable<T> getPage(int maxNumItems) { return this; } + @Override @SuppressWarnings("unchecked") public Iterator<T> iterator() { return (Iterator<T>) EmptyIterator.INSTANCE; } + @Override public long getPageNumItems() { return 0; } + @Override public boolean getHasMoreItems() { return false; } + @Override public long getTotalNumItems() { return 0; } @@ -73,14 +80,17 @@ public class EmptyItemIterable<T> implem public static class EmptyIterator<V> implements Iterator<V> { public static final Iterator<?> INSTANCE = new EmptyIterator<Object>(); + @Override public boolean hasNext() { return false; } + @Override public V next() { throw new NoSuchElementException(); } + @Override public void remove() { throw new UnsupportedOperationException(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/TreeImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/TreeImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/TreeImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/TreeImpl.java Thu Aug 13 12:05:59 2015 @@ -35,10 +35,12 @@ public class TreeImpl<T> implements Tree this.children = children; } + @Override public T getItem() { return item; } + @Override public List<Tree<T>> getChildren() { return this.children; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/util/OperationContextUtils.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/util/OperationContextUtils.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/util/OperationContextUtils.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/util/OperationContextUtils.java Thu Aug 13 12:05:59 2015 @@ -96,110 +96,137 @@ public final class OperationContextUtils private static final long serialVersionUID = 1L; + @Override public Set<String> getFilter() { return Collections.unmodifiableSet(context.getFilter()); } + @Override public void setFilter(Set<String> propertyFilter) { throw new UnsupportedOperationException(); } + @Override public void setFilterString(String propertyFilter) { throw new UnsupportedOperationException(); } + @Override public String getFilterString() { return context.getFilterString(); } + @Override public void setLoadSecondaryTypeProperties(boolean load) { throw new UnsupportedOperationException(); } + @Override public boolean loadSecondaryTypeProperties() { return context.loadSecondaryTypeProperties(); } + @Override public boolean isIncludeAllowableActions() { return context.isIncludeAllowableActions(); } + @Override public void setIncludeAllowableActions(boolean include) { throw new UnsupportedOperationException(); } + @Override public boolean isIncludeAcls() { return context.isIncludeAcls(); } + @Override public void setIncludeAcls(boolean include) { throw new UnsupportedOperationException(); } + @Override public IncludeRelationships getIncludeRelationships() { return context.getIncludeRelationships(); } + @Override public void setIncludeRelationships(IncludeRelationships include) { throw new UnsupportedOperationException(); } + @Override public boolean isIncludePolicies() { return context.isIncludePolicies(); } + @Override public void setIncludePolicies(boolean include) { throw new UnsupportedOperationException(); } + @Override public Set<String> getRenditionFilter() { return Collections.unmodifiableSet(context.getRenditionFilter()); } + @Override public void setRenditionFilter(Set<String> renditionFilter) { throw new UnsupportedOperationException(); } + @Override public void setRenditionFilterString(String renditionFilter) { throw new UnsupportedOperationException(); } + @Override public String getRenditionFilterString() { return context.getRenditionFilterString(); } + @Override public boolean isIncludePathSegments() { return context.isIncludePathSegments(); } + @Override public void setIncludePathSegments(boolean include) { throw new UnsupportedOperationException(); } + @Override public String getOrderBy() { return context.getOrderBy(); } + @Override public void setOrderBy(String orderBy) { throw new UnsupportedOperationException(); } + @Override public boolean isCacheEnabled() { return context.isCacheEnabled(); } + @Override public void setCacheEnabled(boolean cacheEnabled) { throw new UnsupportedOperationException(); } + @Override public String getCacheKey() { return context.getCacheKey(); } + @Override public void setMaxItemsPerPage(int maxItemsPerPage) { throw new UnsupportedOperationException(); } + @Override public int getMaxItemsPerPage() { return context.getMaxItemsPerPage(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/BasicPermissions.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/BasicPermissions.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/BasicPermissions.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/BasicPermissions.java Thu Aug 13 12:05:59 2015 @@ -23,13 +23,13 @@ package org.apache.chemistry.opencmis.co */ public final class BasicPermissions { - private BasicPermissions() { - } - /** CMIS read permission {@code cmis:read}. */ public static final String READ = "cmis:read"; /** CMIS write permission {@code cmis:write}. */ public static final String WRITE = "cmis:write"; /** CMIS all permission {@code cmis:all}. */ public static final String ALL = "cmis:all"; + + private BasicPermissions() { + } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/PropertyIds.java Thu Aug 13 12:05:59 2015 @@ -23,9 +23,6 @@ package org.apache.chemistry.opencmis.co */ public final class PropertyIds { - private PropertyIds() { - } - // ---- base ---- /** * CMIS property {@code cmis:name}: name of the object. @@ -405,4 +402,7 @@ public final class PropertyIds { * @cmis Extension */ public static final String LATEST_ACCESSIBLE_STATE_ID = "cmis:latestAccessibleStateId"; + + private PropertyIds() { + } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SecondaryTypeIds.java Thu Aug 13 12:05:59 2015 @@ -25,9 +25,6 @@ package org.apache.chemistry.opencmis.co */ public final class SecondaryTypeIds { - private SecondaryTypeIds() { - } - /** Repository managed retention type. */ public static final String REPOSITORY_MANAGED_RETENTION = "cmis:rm_repMgtRetention"; /** Client managed retention type. */ @@ -36,4 +33,7 @@ public final class SecondaryTypeIds { public static final String DESTRUCTION_CLIENT_MANAGED_RETENTION = "cmis:rm_destructionRetention"; /** Legal hold type. */ public static final String HOLD = "cmis:rm_hold"; + + private SecondaryTypeIds() { + } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java Thu Aug 13 12:05:59 2015 @@ -575,10 +575,6 @@ package org.apache.chemistry.opencmis.co */ public final class SessionParameter { - // utility class - private SessionParameter() { - } - // ---- general parameter ---- public static final String USER = "org.apache.chemistry.opencmis.user"; public static final String PASSWORD = "org.apache.chemistry.opencmis.password"; @@ -722,4 +718,8 @@ public final class SessionParameter { public static final String INCLUDE_OBJECTID_URL_PARAM_ON_MOVE = "org.apache.chemistry.opencmis.workaround.includeObjectIdOnMove"; public static final String OMIT_CHANGE_TOKENS = "org.apache.chemistry.opencmis.workaround.omitChangeTokens"; public static final String ADD_NAME_ON_CHECK_IN = "org.apache.chemistry.opencmis.workaround.addNameOnCheckIn"; + + // utility class + private SessionParameter() { + } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java Thu Aug 13 12:05:59 2015 @@ -1142,7 +1142,7 @@ public final class Base64 { else { // There's a bad input character in the Base64 stream. throw new java.io.IOException(String.format( - "Bad Base64 input character decimal %d in array position %d", ((int) source[i]) & 0xFF, i)); + "Bad Base64 input character decimal %d in array position %d", (source[i]) & 0xFF, i)); } // end else: } // each input character @@ -1204,7 +1204,7 @@ public final class Base64 { boolean dontGunzip = (options & DONT_GUNZIP) != 0; if ((bytes != null) && (bytes.length >= 4) && (!dontGunzip)) { - int head = ((int) bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00); + int head = (bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00); if (java.util.zip.GZIPInputStream.GZIP_MAGIC == head) { java.io.ByteArrayInputStream bais = null; java.util.zip.GZIPInputStream gzis = null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/DateTimeHelper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/DateTimeHelper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/DateTimeHelper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/DateTimeHelper.java Thu Aug 13 12:05:59 2015 @@ -213,7 +213,7 @@ public final class DateTimeHelper { if (year < 100) { final int thisYear = (new GregorianCalendar(GMT)).get(Calendar.YEAR); final int testYear = year + thisYear - thisYear % 100; - year = (testYear < thisYear + 20 ? testYear : testYear - 100); + year = testYear < thisYear + 20 ? testYear : testYear - 100; } cal.set(Calendar.YEAR, year); cal.set(Calendar.HOUR_OF_DAY, Integer.parseInt(m.group(4))); Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/IOUtils.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/IOUtils.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/IOUtils.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/IOUtils.java Thu Aug 13 12:05:59 2015 @@ -358,6 +358,7 @@ public final class IOUtils { final StringBuilder result = new StringBuilder(128); readLinesFromStream(stream, new LineHandler() { + @Override public boolean handle(String line) { result.append(line); return false; @@ -381,6 +382,7 @@ public final class IOUtils { final StringBuilder result = new StringBuilder(1024); readLinesFromStream(stream, new LineHandler() { + @Override public boolean handle(String line) { result.append(line); result.append('\n'); @@ -405,6 +407,7 @@ public final class IOUtils { final StringBuilder result = new StringBuilder(1024); readLinesFromStream(stream, new SkipHeaderLineHandler() { + @Override public boolean handle(String line) { if (!isHeaderLine(line)) { result.append(line); @@ -432,6 +435,7 @@ public final class IOUtils { final StringBuilder result = new StringBuilder(1024); readLinesFromStream(stream, new IgnoreCommentsLineHandler() { + @Override public boolean handle(String line) { if (!isComment(line)) { result.append(line); @@ -459,6 +463,7 @@ public final class IOUtils { final List<String> result = new ArrayList<String>(); readLinesFromStream(stream, new IgnoreCommentsLineHandler() { + @Override public boolean handle(String line) { if (!isComment(line)) { result.add(line); @@ -485,6 +490,7 @@ public final class IOUtils { final Map<String, String> result = new HashMap<String, String>(); readLinesFromStream(stream, new IgnoreCommentsLineHandler() { + @Override public boolean handle(String line) { if (!isComment(line)) { int x = line.indexOf('='); Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java Thu Aug 13 12:05:59 2015 @@ -2795,7 +2795,7 @@ public final class JSONConverter { } else if (element.getValue() instanceof List) { extensions.addAll(convertExtension(element.getKey(), (List<Object>) element.getValue())); } else { - String value = (element.getValue() == null ? null : element.getValue().toString()); + String value = element.getValue() == null ? null : element.getValue().toString(); extensions.add(new CmisExtensionElementImpl(null, element.getKey(), null, value)); } } @@ -2818,7 +2818,7 @@ public final class JSONConverter { } else if (element.getValue() instanceof List) { extensions.addAll(convertExtension(element.getKey(), (List<Object>) element.getValue())); } else { - String value = (element.getValue() == null ? null : element.getValue().toString()); + String value = element.getValue() == null ? null : element.getValue().toString(); extensions.add(new CmisExtensionElementImpl(null, element.getKey(), null, value)); } } @@ -2841,7 +2841,7 @@ public final class JSONConverter { } else if (element instanceof List) { extensions.addAll(convertExtension(name, (List<Object>) element)); } else { - String value = (element == null ? null : element.toString()); + String value = element == null ? null : element.toString(); extensions.add(new CmisExtensionElementImpl(null, name, null, value)); } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeHelper.java Thu Aug 13 12:05:59 2015 @@ -523,7 +523,7 @@ public final class MimeHelper { // self-defining token type. } else if (c < 32 || c >= 127 || delimiters.indexOf(c) != -1) { pos++; - return new Token((int) c, String.valueOf(c)); + return new Token(c, String.valueOf(c)); } else { // start of an atom, parse it off. return readAtomicToken(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java Thu Aug 13 12:05:59 2015 @@ -257,6 +257,6 @@ public final class MimeTypes { mimeType = mimeType.trim().toLowerCase(Locale.ENGLISH); String extension = MIME2EXT.get(mimeType); - return ((extension == null || extension.length() == 0) ? "" : "." + extension); + return (extension == null || extension.length() == 0) ? "" : "." + extension; } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/WSConverter.java Thu Aug 13 12:05:59 2015 @@ -2690,14 +2690,17 @@ public final class WSConverter { result.setStream(new DataHandler(new DataSource() { + @Override public OutputStream getOutputStream() throws IOException { return null; } + @Override public String getName() { return contentStream.getFileName(); } + @Override public InputStream getInputStream() throws IOException { if (allowClose) { return stream; @@ -2711,6 +2714,7 @@ public final class WSConverter { } } + @Override public String getContentType() { return contentStream.getMimeType(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Thu Aug 13 12:05:59 2015 @@ -2052,6 +2052,7 @@ public final class XMLConverter { target.setValue(addToList(target.getValue(), readText(parser))); } + @Override protected void addChoice(XMLStreamReader parser, ChoiceImpl<String> target) throws XMLStreamException { target.setChoice(addToList(target.getChoice(), CHOICE_STRING_PARSER.walk(parser))); } @@ -2068,6 +2069,7 @@ public final class XMLConverter { target.setValue(addToList(target.getValue(), readBoolean(parser))); } + @Override protected void addChoice(XMLStreamReader parser, ChoiceImpl<Boolean> target) throws XMLStreamException { target.setChoice(addToList(target.getChoice(), CHOICE_BOOLEAN_PARSER.walk(parser))); } @@ -2084,6 +2086,7 @@ public final class XMLConverter { target.setValue(addToList(target.getValue(), readInteger(parser))); } + @Override protected void addChoice(XMLStreamReader parser, ChoiceImpl<BigInteger> target) throws XMLStreamException { target.setChoice(addToList(target.getChoice(), CHOICE_INTEGER_PARSER.walk(parser))); } @@ -2100,6 +2103,7 @@ public final class XMLConverter { target.setValue(addToList(target.getValue(), readDateTime(parser))); } + @Override protected void addChoice(XMLStreamReader parser, ChoiceImpl<GregorianCalendar> target) throws XMLStreamException { target.setChoice(addToList(target.getChoice(), CHOICE_DATETIME_PARSER.walk(parser))); @@ -2117,6 +2121,7 @@ public final class XMLConverter { target.setValue(addToList(target.getValue(), readDecimal(parser))); } + @Override protected void addChoice(XMLStreamReader parser, ChoiceImpl<BigDecimal> target) throws XMLStreamException { target.setChoice(addToList(target.getChoice(), CHOICE_DECIMAL_PARSER.walk(parser))); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLUtils.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLUtils.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLUtils.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLUtils.java Thu Aug 13 12:05:59 2015 @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilder import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; @@ -288,9 +289,9 @@ public final class XMLUtils { int level = 1; while (next(parser)) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { level++; - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { level--; if (level == 0) { break; @@ -313,7 +314,7 @@ public final class XMLUtils { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { return true; } @@ -338,9 +339,9 @@ public final class XMLUtils { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.END_ELEMENT) { + if (event == XMLStreamConstants.END_ELEMENT) { break; - } else if (event == XMLStreamReader.CHARACTERS || event == XMLStreamReader.CDATA) { + } else if (event == XMLStreamConstants.CHARACTERS || event == XMLStreamConstants.CDATA) { int len = parser.getTextLength(); if (len > 0) { if (sb.length() + len > maxLength) { @@ -352,7 +353,7 @@ public final class XMLUtils { sb.append(chars, offset, len); } - } else if (event == XMLStreamReader.START_ELEMENT) { + } else if (event == XMLStreamConstants.START_ELEMENT) { throw new XMLStreamException("Unexpected tag: " + parser.getName()); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java Thu Aug 13 12:05:59 2015 @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -50,7 +51,7 @@ public abstract class XMLWalker<T> { // walk through all tags while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName name = parser.getName(); if (!read(parser, name, result)) { if (result instanceof ExtensionsData) { @@ -59,7 +60,7 @@ public abstract class XMLWalker<T> { skip(parser); } } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!next(parser)) { @@ -131,9 +132,9 @@ public abstract class XMLWalker<T> { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.END_ELEMENT) { + if (event == XMLStreamConstants.END_ELEMENT) { break; - } else if (event == XMLStreamReader.CHARACTERS) { + } else if (event == XMLStreamConstants.CHARACTERS) { String s = parser.getText(); if (s != null) { if (sb.length() + s.length() > XMLConstraints.MAX_STRING_LENGTH) { @@ -141,7 +142,7 @@ public abstract class XMLWalker<T> { } sb.append(s); } - } else if (event == XMLStreamReader.START_ELEMENT) { + } else if (event == XMLStreamConstants.START_ELEMENT) { if (level + 1 > XMLConstraints.MAX_EXTENSIONS_DEPTH) { throw new CmisInvalidArgumentException("Extensions tree too deep!"); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java Thu Aug 13 12:05:59 2015 @@ -33,10 +33,12 @@ public abstract class AbstractExtensionD private List<CmisExtensionElement> extensions; + @Override public List<CmisExtensionElement> getExtensions() { return extensions; } + @Override public void setExtensions(List<CmisExtensionElement> extensions) { this.extensions = extensions; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ public abstract class AbstractPropertyDa private List<T> values = Collections.emptyList(); + @Override public PropertyDefinition<T> getPropertyDefinition() { return propDef; } @@ -61,42 +62,52 @@ public abstract class AbstractPropertyDa } } + @Override public String getId() { return id; } + @Override public void setId(String id) { this.id = id; } + @Override public String getDisplayName() { return displayName; } + @Override public void setDisplayName(String displayName) { this.displayName = displayName; } + @Override public String getLocalName() { return localName; } + @Override public void setLocalName(String localName) { this.localName = localName; } + @Override public String getQueryName() { return queryName; } + @Override public void setQueryName(String queryName) { this.queryName = queryName; } + @Override public List<T> getValues() { return values; } + @Override public void setValues(List<T> values) { if (values == null) { this.values = Collections.emptyList(); @@ -105,6 +116,7 @@ public abstract class AbstractPropertyDa } } + @Override public void setValue(T value) { if (value == null) { values = Collections.emptyList(); @@ -114,6 +126,7 @@ public abstract class AbstractPropertyDa } } + @Override public T getFirstValue() { if (values != null && !values.isEmpty()) { return values.get(0); Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyDefinition.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyDefinition.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyDefinition.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyDefinition.java Thu Aug 13 12:05:59 2015 @@ -52,70 +52,87 @@ public abstract class AbstractPropertyDe private Boolean isRequired; private Boolean isOpenChoice; + @Override public String getId() { return id; } + @Override public void setId(String id) { this.id = id; } + @Override public String getLocalName() { return localName; } + @Override public void setLocalName(String localName) { this.localName = localName; } + @Override public String getLocalNamespace() { return localNamespace; } + @Override public void setLocalNamespace(String localNamespace) { this.localNamespace = localNamespace; } + @Override public String getQueryName() { return queryName; } + @Override public void setQueryName(String queryName) { this.queryName = queryName; } + @Override public String getDisplayName() { return displayName; } + @Override public void setDisplayName(String displayName) { this.displayName = displayName; } + @Override public String getDescription() { return description; } + @Override public void setDescription(String description) { this.description = description; } + @Override public PropertyType getPropertyType() { return propertyType; } + @Override public void setPropertyType(PropertyType propertyType) { this.propertyType = propertyType; } + @Override public Cardinality getCardinality() { return cardinality; } + @Override public void setCardinality(Cardinality cardinality) { this.cardinality = cardinality; } + @Override public List<Choice<T>> getChoices() { if (choiceList == null) { choiceList = new ArrayList<Choice<T>>(); @@ -124,10 +141,12 @@ public abstract class AbstractPropertyDe return choiceList; } + @Override public void setChoices(List<Choice<T>> choiceList) { this.choiceList = choiceList; } + @Override public List<T> getDefaultValue() { if (defaultValue == null) { defaultValue = new ArrayList<T>(); @@ -136,54 +155,67 @@ public abstract class AbstractPropertyDe return defaultValue; } + @Override public void setDefaultValue(List<T> defaultValue) { this.defaultValue = defaultValue; } + @Override public Updatability getUpdatability() { return updatability; } + @Override public void setUpdatability(Updatability updatability) { this.updatability = updatability; } + @Override public Boolean isInherited() { return isInherited; } + @Override public void setIsInherited(Boolean isInherited) { this.isInherited = isInherited; } + @Override public Boolean isQueryable() { return isQueryable; } + @Override public void setIsQueryable(Boolean isQueryable) { this.isQueryable = isQueryable; } + @Override public Boolean isOrderable() { return isOrderable; } + @Override public void setIsOrderable(Boolean isOrderable) { this.isOrderable = isOrderable; } + @Override public Boolean isRequired() { return isRequired; } + @Override public void setIsRequired(Boolean isRequired) { this.isRequired = isRequired; } + @Override public Boolean isOpenChoice() { return isOpenChoice; } + @Override public void setIsOpenChoice(Boolean isOpenChoice) { this.isOpenChoice = isOpenChoice; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractTypeDefinition.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractTypeDefinition.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractTypeDefinition.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractTypeDefinition.java Thu Aug 13 12:05:59 2015 @@ -75,66 +75,82 @@ public abstract class AbstractTypeDefini setExtensions(typeDefinition.getExtensions()); } + @Override public String getId() { return id; } + @Override public void setId(String id) { this.id = id; } + @Override public String getLocalName() { return localName; } + @Override public void setLocalName(String localName) { this.localName = localName; } + @Override public String getLocalNamespace() { return localNamespace; } + @Override public void setLocalNamespace(String localNamespace) { this.localNamespace = localNamespace; } + @Override public String getQueryName() { return queryName; } + @Override public void setQueryName(String queryName) { this.queryName = queryName; } + @Override public String getDisplayName() { return displayName; } + @Override public void setDisplayName(String displayName) { this.displayName = displayName; } + @Override public String getDescription() { return description; } + @Override public void setDescription(String description) { this.description = description; } + @Override public BaseTypeId getBaseTypeId() { return baseId; } + @Override public void setBaseTypeId(BaseTypeId baseId) { this.baseId = baseId; } + @Override public String getParentTypeId() { return parentId; } + @Override public void setParentTypeId(String parentId) { if (parentId == null || parentId.length() == 0) { this.parentId = null; @@ -143,62 +159,77 @@ public abstract class AbstractTypeDefini } } + @Override public Boolean isCreatable() { return isCreatable; } + @Override public void setIsCreatable(Boolean isCreatable) { this.isCreatable = isCreatable; } + @Override public Boolean isFileable() { return isFileable; } + @Override public void setIsFileable(Boolean isFileable) { this.isFileable = isFileable; } + @Override public Boolean isQueryable() { return isQueryable; } + @Override public void setIsQueryable(Boolean isQueryable) { this.isQueryable = isQueryable; } + @Override public Boolean isIncludedInSupertypeQuery() { return isIncludedInSupertypeQuery; } + @Override public void setIsIncludedInSupertypeQuery(Boolean isIncludedInSupertypeQuery) { this.isIncludedInSupertypeQuery = isIncludedInSupertypeQuery; } + @Override public Boolean isFulltextIndexed() { return isFulltextIndexed; } + @Override public void setIsFulltextIndexed(Boolean isFulltextIndexed) { this.isFulltextIndexed = isFulltextIndexed; } + @Override public Boolean isControllableAcl() { return isControllableACL; } + @Override public void setIsControllableAcl(Boolean isControllableACL) { this.isControllableACL = isControllableACL; } + @Override public Boolean isControllablePolicy() { return isControllablePolicy; } + @Override public void setIsControllablePolicy(Boolean isControllablePolicy) { this.isControllablePolicy = isControllablePolicy; } + @Override public Map<String, PropertyDefinition<?>> getPropertyDefinitions() { return propertyDefinitions; } @@ -213,6 +244,7 @@ public abstract class AbstractTypeDefini } } + @Override public void addPropertyDefinition(PropertyDefinition<?> propertyDefinition) { if (propertyDefinition == null) { return; @@ -221,6 +253,7 @@ public abstract class AbstractTypeDefini propertyDefinitions.put(propertyDefinition.getId(), propertyDefinition); } + @Override public void removePropertyDefinition(String propertyId) { if (propertyId == null) { return; @@ -229,14 +262,17 @@ public abstract class AbstractTypeDefini propertyDefinitions.remove(propertyId); } + @Override public void removeAllPropertyDefinitions() { propertyDefinitions = new LinkedHashMap<String, PropertyDefinition<?>>(); } + @Override public TypeMutability getTypeMutability() { return typeMutability; } + @Override public void setTypeMutability(TypeMutability typeMutability) { this.typeMutability = typeMutability; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java Thu Aug 13 12:05:59 2015 @@ -50,18 +50,22 @@ public class AccessControlEntryImpl exte this.permissions = permissions; } + @Override public Principal getPrincipal() { return principal; } + @Override public String getPrincipalId() { return principal == null ? null : principal.getId(); } + @Override public void setPrincipal(Principal principal) { this.principal = principal; } + @Override public List<String> getPermissions() { if (permissions == null) { permissions = new ArrayList<String>(); @@ -70,14 +74,17 @@ public class AccessControlEntryImpl exte return permissions; } + @Override public void setPermissions(List<String> permissions) { this.permissions = permissions; } + @Override public boolean isDirect() { return isDirect; } + @Override public void setDirect(boolean direct) { this.isDirect = direct; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java Thu Aug 13 12:05:59 2015 @@ -48,6 +48,7 @@ public class AccessControlListImpl exten this.aces = aces; } + @Override public List<Ace> getAces() { if (aces == null) { aces = new ArrayList<Ace>(); @@ -56,14 +57,17 @@ public class AccessControlListImpl exten return aces; } + @Override public void setAces(List<Ace> aces) { this.aces = aces; } + @Override public Boolean isExact() { return isExact; } + @Override public void setExact(Boolean isExact) { this.isExact = isExact; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java Thu Aug 13 12:05:59 2015 @@ -45,10 +45,12 @@ public class AccessControlPrincipalDataI this.principalId = principalId; } + @Override public String getId() { return principalId; } + @Override public void setId(String principalId) { this.principalId = principalId; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.java Thu Aug 13 12:05:59 2015 @@ -41,6 +41,7 @@ public class AclCapabilitiesDataImpl ext private Map<String, PermissionMapping> permissionMapping; private List<PermissionDefinition> permissionDefinitionList; + @Override public SupportedPermissions getSupportedPermissions() { return supportedPermissions; } @@ -49,6 +50,7 @@ public class AclCapabilitiesDataImpl ext this.supportedPermissions = supportedPermissions; } + @Override public AclPropagation getAclPropagation() { return aclPropagation; } @@ -57,6 +59,7 @@ public class AclCapabilitiesDataImpl ext this.aclPropagation = aclPropagation; } + @Override public Map<String, PermissionMapping> getPermissionMapping() { if (permissionMapping == null) { permissionMapping = new HashMap<String, PermissionMapping>(); @@ -69,6 +72,7 @@ public class AclCapabilitiesDataImpl ext this.permissionMapping = permissionMapping; } + @Override public List<PermissionDefinition> getPermissions() { if (permissionDefinitionList == null) { permissionDefinitionList = new ArrayList<PermissionDefinition>(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java Thu Aug 13 12:05:59 2015 @@ -33,6 +33,7 @@ public class AllowableActionsImpl extend private Set<Action> allowableActions; + @Override public Set<Action> getAllowableActions() { if (allowableActions == null) { allowableActions = EnumSet.noneOf(Action.class);
