chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1695691 [9/12] - in /chemistry/opencmis/trunk: chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ chemistry-opencmis-android/chemistry-opencmis-android-clie...
Date Thu, 13 Aug 2015 12:06:03 GMT
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/AbstractPredicateWalker.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/AbstractPredicateWalker.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/AbstractPredicateWalker.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/AbstractPredicateWalker.java Thu Aug 13 12:05:59 2015
@@ -34,6 +34,7 @@ import org.apache.chemistry.opencmis.com
  */
 public abstract class AbstractPredicateWalker implements PredicateWalker {
 
+    @Override
     public Boolean walkPredicate(Tree node) {
         switch (node.getType()) {
         case CmisQlStrictLexer.NOT:
@@ -124,23 +125,27 @@ public abstract class AbstractPredicateW
         throw new CmisRuntimeException("Unknown node type: " + node.getType() + " (" + node.getText() + ")");
     }
 
+    @Override
     public Boolean walkNot(Tree opNode, Tree node) {
         walkPredicate(node);
         return false;
     }
 
+    @Override
     public Boolean walkAnd(Tree opNode, Tree leftNode, Tree rightNode) {
         walkPredicate(leftNode);
         walkPredicate(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkOr(Tree opNode, Tree leftNode, Tree rightNode) {
         walkPredicate(leftNode);
         walkPredicate(rightNode);
         return false;
     }
 
+    @Override
     public Object walkExpr(Tree node) {
         switch (node.getType()) {
         case CmisQlStrictLexer.BOOL_LIT:
@@ -185,94 +190,110 @@ public abstract class AbstractPredicateW
         throw new CmisRuntimeException("Unknown node type: " + node.getType() + " (" + node.getText() + ")");
     }
 
+    @Override
     public Boolean walkEquals(Tree opNode, Tree leftNode, Tree rightNode) {
         walkExpr(leftNode);
         walkExpr(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkNotEquals(Tree opNode, Tree leftNode, Tree rightNode) {
         walkExpr(leftNode);
         walkExpr(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkGreaterThan(Tree opNode, Tree leftNode, Tree rightNode) {
         walkExpr(leftNode);
         walkExpr(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkGreaterOrEquals(Tree opNode, Tree leftNode, Tree rightNode) {
         walkExpr(leftNode);
         walkExpr(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkLessThan(Tree opNode, Tree leftNode, Tree rightNode) {
         walkExpr(leftNode);
         walkExpr(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkLessOrEquals(Tree opNode, Tree leftNode, Tree rightNode) {
         walkExpr(leftNode);
         walkExpr(rightNode);
         return false;
     }
 
+    @Override
     public Boolean walkIn(Tree opNode, Tree colNode, Tree listNode) {
         walkExpr(colNode);
         walkExpr(listNode);
         return false;
     }
 
+    @Override
     public Boolean walkNotIn(Tree opNode, Tree colNode, Tree listNode) {
         walkExpr(colNode);
         walkExpr(listNode);
         return false;
     }
 
+    @Override
     public Boolean walkInAny(Tree opNode, Tree colNode, Tree listNode) {
         walkExpr(colNode);
         walkExpr(listNode);
         return false;
     }
 
+    @Override
     public Boolean walkNotInAny(Tree opNode, Tree colNode, Tree listNode) {
         walkExpr(colNode);
         walkExpr(listNode);
         return false;
     }
 
+    @Override
     public Boolean walkEqAny(Tree opNode, Tree literalNode, Tree colNode) {
         walkExpr(literalNode);
         walkExpr(colNode);
         return false;
     }
 
+    @Override
     public Boolean walkIsNull(Tree opNode, Tree colNode) {
         walkExpr(colNode);
         return false;
     }
 
+    @Override
     public Boolean walkIsNotNull(Tree opNode, Tree colNode) {
         walkExpr(colNode);
         return false;
     }
 
+    @Override
     public Boolean walkLike(Tree opNode, Tree colNode, Tree stringNode) {
         walkExpr(colNode);
         walkExpr(stringNode);
         return false;
     }
 
+    @Override
     public Boolean walkNotLike(Tree opNode, Tree colNode, Tree stringNode) {
         walkExpr(colNode);
         walkExpr(stringNode);
         return false;
     }
 
+    @Override
     public Boolean walkContains(Tree opNode, Tree qualNode, Tree queryNode) {
         if (qualNode != null) {
             return walkSearchExpr(qualNode);
@@ -280,6 +301,7 @@ public abstract class AbstractPredicateW
         return walkSearchExpr(queryNode);
     }
 
+    @Override
     public Boolean walkInFolder(Tree opNode, Tree qualNode, Tree paramNode) {
         if (qualNode != null) {
             walkExpr(qualNode);
@@ -288,6 +310,7 @@ public abstract class AbstractPredicateW
         return false;
     }
 
+    @Override
     public Boolean walkInTree(Tree opNode, Tree qualNode, Tree paramNode) {
         if (qualNode != null) {
             walkExpr(qualNode);
@@ -296,6 +319,7 @@ public abstract class AbstractPredicateW
         return false;
     }
 
+    @Override
     public Object walkList(Tree node) {
         int n = node.getChildCount();
         List<Object> res = new ArrayList<Object>(n);
@@ -305,11 +329,13 @@ public abstract class AbstractPredicateW
         return res;
     }
 
+    @Override
     public Object walkBoolean(Tree node) {
         String s = node.getText();
         return Boolean.valueOf(s);
     }
 
+    @Override
     public Object walkNumber(Tree node) {
         String s = node.getText();
         if (s.contains(".") || s.contains("e") || s.contains("E")) {
@@ -319,6 +345,7 @@ public abstract class AbstractPredicateW
         }
     }
 
+    @Override
     public Object walkString(Tree node) {
         String s = node.getText();
         s = s.substring(1, s.length() - 1);
@@ -326,16 +353,19 @@ public abstract class AbstractPredicateW
         return s;
     }
 
+    @Override
     public Object walkTimestamp(Tree node) {
         String s = node.getText();
         s = s.substring(s.indexOf('\'') + 1, s.length() - 1);
         return CalendarHelper.fromString(s);
     }
 
+    @Override
     public Object walkCol(Tree node) {
         return null;
     }
 
+    @Override
     public Object walkId(Tree node) {
         return null;
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java Thu Aug 13 12:05:59 2015
@@ -58,7 +58,7 @@ public final class CalendarHelper {
             throw new IllegalArgumentException("Invalid datetime format: " + datetime);
         }
         String tz = m.group(8);
-        GregorianCalendar cal = (GregorianCalendar) GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT"
+        GregorianCalendar cal = (GregorianCalendar) Calendar.getInstance(TimeZone.getTimeZone("GMT"
                 + (tz == null ? "" : tz)));
         cal.set(Calendar.YEAR, Integer.parseInt(m.group(1)));
         cal.set(Calendar.MONTH, Integer.parseInt(m.group(2)) - 1);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtil.java Thu Aug 13 12:05:59 2015
@@ -19,7 +19,6 @@
 package org.apache.chemistry.opencmis.server.support.query;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
@@ -34,39 +33,38 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.server.support.query.CmisQlStrictParser_CmisBaseGrammar.query_return;
 
 /**
- * Support class to assist in parsing and processing CMIS queries.
- * This class inherits from QueryUtilBase to use the error handling
- * methods. It does not follow its design and is only maintained for
- * backwards compatibility.
+ * Support class to assist in parsing and processing CMIS queries. This class
+ * inherits from QueryUtilBase to use the error handling methods. It does not
+ * follow its design and is only maintained for backwards compatibility.
  * 
  * @deprecated Use {@link QueryUtilBase} instead.
  */
 @Deprecated
 public class QueryUtil extends QueryUtilBase<CmisQueryWalker> {
-    
+
     public QueryUtil() {
         super(null, null, null);
     }
-    
+
     @Override
     public CommonTree parseStatement() throws RecognitionException {
-        throw new CmisRuntimeException("Not supported, use getWalker to parse a query using this legacy class.");        
+        throw new CmisRuntimeException("Not supported, use getWalker to parse a query using this legacy class.");
     }
 
     @Override
-    public void walkStatement() throws CmisQueryException, RecognitionException {
+    public void walkStatement() throws RecognitionException {
         throw new CmisRuntimeException("Not supported, use getWalker to parse a query using this legacy class.");
     }
 
     /**
-     * Parse a CMISQL statement and return a tree that can be walked to evaluate the expression
-     * of the query (usually not used directly but through traverseStatement)
+     * Parse a CMISQL statement and return a tree that can be walked to evaluate
+     * the expression of the query (usually not used directly but through
+     * traverseStatement)
      * 
      * @param statement
-     *      CMISQL statement
-     * @return
-     *      an AntLR tree grammar that can be traversed to evaluate the query
-     *      
+     *            CMISQL statement
+     * @return an AntLR tree grammar that can be traversed to evaluate the query
+     * 
      * @throws RecognitionException
      */
     public static CmisQueryWalker getWalker(String statement) throws RecognitionException {
@@ -81,40 +79,41 @@ public class QueryUtil extends QueryUtil
             throw new CmisInvalidArgumentException(lexer.getErrorMessages());
         } else if (parser.hasErrors()) {
             throw new CmisInvalidArgumentException(parser.getErrorMessages());
-        } else if ( tokens.index()!=tokens.size() ) {
-            throw new  CmisInvalidArgumentException("Query String has illegal tokens after end of statement: " + tokens.get(tokens.index()));
+        } else if (tokens.index() != tokens.size()) {
+            throw new CmisInvalidArgumentException("Query String has illegal tokens after end of statement: "
+                    + tokens.get(tokens.index()));
         }
-        
+
         parserTree = (CommonTree) parsedStatement.getTree();
 
         CommonTreeNodeStream nodes = new CommonTreeNodeStream(parserTree);
         nodes.setTokenStream(tokens);
         CmisQueryWalker walker = new CmisQueryWalker(nodes);
-        return walker;               
+        return walker;
     }
-    
+
     /**
-     * Parse and process a CMISQL statement using the higher level support classes
+     * Parse and process a CMISQL statement using the higher level support
+     * classes
      * 
      * @param statement
-     *      CMISQL statement
+     *            CMISQL statement
      * @param queryObj
-     *      CMIS query object filled with information what data need to be retrieved
+     *            CMIS query object filled with information what data need to be
+     *            retrieved
      * @param pw
-     *      predicate walker that evaluates the where clause
-     * @return
-     *      AntLR tree grammar created by this statement
-     *      
-     * @throws UnsupportedEncodingException
+     *            predicate walker that evaluates the where clause
+     * @return AntLR tree grammar created by this statement
+     * 
      * @throws IOException
      * @throws RecognitionException
      */
     public CmisQueryWalker traverseStatement(String statement, QueryObject queryObj, PredicateWalkerBase pw)
-            throws UnsupportedEncodingException, IOException, RecognitionException {
+            throws IOException, RecognitionException {
         walker = getWalker(statement);
         walker.query(queryObj, pw);
         walker.getWherePredicateTree();
-        return walker;        
+        return walker;
     }
 
     public CmisQueryWalker traverseStatementAndCatchExc(String statement, QueryObject queryObj, PredicateWalkerBase pw) {
@@ -122,7 +121,8 @@ public class QueryUtil extends QueryUtil
             return traverseStatement(statement, queryObj, pw);
         } catch (RecognitionException e) {
             String errorMsg = queryObj.getErrorMessage();
-            throw new CmisInvalidArgumentException("Walking of statement failed with RecognitionException error: \n   " + errorMsg, e);
+            throw new CmisInvalidArgumentException("Walking of statement failed with RecognitionException error: \n   "
+                    + errorMsg, e);
         } catch (CmisBaseException e) {
             throw e;
         } catch (Exception e) {

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/AbstractCmisServiceWrapper.java Thu Aug 13 12:05:59 2015
@@ -89,6 +89,7 @@ public abstract class AbstractCmisServic
      * or service if it implements the {@link CallContextAwareCmisService}
      * interface.
      */
+    @Override
     public void setCallContext(CallContext callContext) {
         this.context = callContext;
 
@@ -100,12 +101,14 @@ public abstract class AbstractCmisServic
     /**
      * Gets the current call context.
      */
+    @Override
     public CallContext getCallContext() {
         return context;
     }
 
     // --- processing ---
 
+    @Override
     public ProgressControlCmisService.Progress beforeServiceCall() {
         if (service instanceof ProgressControlCmisService) {
             return ((ProgressControlCmisService) service).beforeServiceCall();
@@ -114,6 +117,7 @@ public abstract class AbstractCmisServic
         return ProgressControlCmisService.Progress.CONTINUE;
     }
 
+    @Override
     public ProgressControlCmisService.Progress afterServiceCall() {
         if (service instanceof ProgressControlCmisService) {
             return ((ProgressControlCmisService) service).afterServiceCall();
@@ -124,41 +128,50 @@ public abstract class AbstractCmisServic
 
     // --- service methods ---
 
+    @Override
     public List<RepositoryInfo> getRepositoryInfos(ExtensionsData extension) {
         return service.getRepositoryInfos(extension);
     }
 
+    @Override
     public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) {
         return service.getRepositoryInfo(repositoryId, extension);
     }
 
+    @Override
     public TypeDefinitionList getTypeChildren(String repositoryId, String typeId, Boolean includePropertyDefinitions,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
         return service
                 .getTypeChildren(repositoryId, typeId, includePropertyDefinitions, maxItems, skipCount, extension);
     }
 
+    @Override
     public List<TypeDefinitionContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth,
             Boolean includePropertyDefinitions, ExtensionsData extension) {
         return service.getTypeDescendants(repositoryId, typeId, depth, includePropertyDefinitions, extension);
     }
 
+    @Override
     public TypeDefinition getTypeDefinition(String repositoryId, String typeId, ExtensionsData extension) {
         return service.getTypeDefinition(repositoryId, typeId, extension);
     }
 
+    @Override
     public TypeDefinition createType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
         return service.createType(repositoryId, type, extension);
     }
 
+    @Override
     public TypeDefinition updateType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
         return service.updateType(repositoryId, type, extension);
     }
 
+    @Override
     public void deleteType(String repositoryId, String typeId, ExtensionsData extension) {
         service.deleteType(repositoryId, typeId, extension);
     }
 
+    @Override
     public ObjectInFolderList getChildren(String repositoryId, String folderId, String filter, String orderBy,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -166,6 +179,7 @@ public abstract class AbstractCmisServic
                 includeRelationships, renditionFilter, includePathSegment, maxItems, skipCount, extension);
     }
 
+    @Override
     public List<ObjectInFolderContainer> getDescendants(String repositoryId, String folderId, BigInteger depth,
             String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePathSegment, ExtensionsData extension) {
@@ -173,6 +187,7 @@ public abstract class AbstractCmisServic
                 includeRelationships, renditionFilter, includePathSegment, extension);
     }
 
+    @Override
     public List<ObjectInFolderContainer> getFolderTree(String repositoryId, String folderId, BigInteger depth,
             String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePathSegment, ExtensionsData extension) {
@@ -180,6 +195,7 @@ public abstract class AbstractCmisServic
                 includeRelationships, renditionFilter, includePathSegment, extension);
     }
 
+    @Override
     public List<ObjectParentData> getObjectParents(String repositoryId, String objectId, String filter,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             Boolean includeRelativePathSegment, ExtensionsData extension) {
@@ -187,10 +203,12 @@ public abstract class AbstractCmisServic
                 renditionFilter, includeRelativePathSegment, extension);
     }
 
+    @Override
     public ObjectData getFolderParent(String repositoryId, String folderId, String filter, ExtensionsData extension) {
         return service.getFolderParent(repositoryId, folderId, filter, extension);
     }
 
+    @Override
     public ObjectList getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -198,6 +216,7 @@ public abstract class AbstractCmisServic
                 includeRelationships, renditionFilter, maxItems, skipCount, extension);
     }
 
+    @Override
     public String createDocument(String repositoryId, Properties properties, String folderId,
             ContentStream contentStream, VersioningState versioningState, List<String> policies, Acl addAces,
             Acl removeAces, ExtensionsData extension) {
@@ -205,6 +224,7 @@ public abstract class AbstractCmisServic
                 addAces, removeAces, extension);
     }
 
+    @Override
     public String createDocumentFromSource(String repositoryId, String sourceId, Properties properties,
             String folderId, VersioningState versioningState, List<String> policies, Acl addAces, Acl removeAces,
             ExtensionsData extension) {
@@ -212,30 +232,36 @@ public abstract class AbstractCmisServic
                 policies, addAces, removeAces, extension);
     }
 
+    @Override
     public String createFolder(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         return service.createFolder(repositoryId, properties, folderId, policies, addAces, removeAces, extension);
     }
 
+    @Override
     public String createRelationship(String repositoryId, Properties properties, List<String> policies, Acl addAces,
             Acl removeAces, ExtensionsData extension) {
         return service.createRelationship(repositoryId, properties, policies, addAces, removeAces, extension);
     }
 
+    @Override
     public String createPolicy(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         return service.createPolicy(repositoryId, properties, folderId, policies, addAces, removeAces, extension);
     }
 
+    @Override
     public String createItem(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         return service.createItem(repositoryId, properties, folderId, policies, addAces, removeAces, extension);
     }
 
+    @Override
     public AllowableActions getAllowableActions(String repositoryId, String objectId, ExtensionsData extension) {
         return service.getAllowableActions(repositoryId, objectId, extension);
     }
 
+    @Override
     public ObjectData getObject(String repositoryId, String objectId, String filter, Boolean includeAllowableActions,
             IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
             Boolean includeAcl, ExtensionsData extension) {
@@ -243,15 +269,18 @@ public abstract class AbstractCmisServic
                 renditionFilter, includePolicyIds, includeAcl, extension);
     }
 
+    @Override
     public Properties getProperties(String repositoryId, String objectId, String filter, ExtensionsData extension) {
         return service.getProperties(repositoryId, objectId, filter, extension);
     }
 
+    @Override
     public List<RenditionData> getRenditions(String repositoryId, String objectId, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
         return service.getRenditions(repositoryId, objectId, renditionFilter, maxItems, skipCount, extension);
     }
 
+    @Override
     public ObjectData getObjectByPath(String repositoryId, String path, String filter, Boolean includeAllowableActions,
             IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
             Boolean includeAcl, ExtensionsData extension) {
@@ -259,16 +288,19 @@ public abstract class AbstractCmisServic
                 renditionFilter, includePolicyIds, includeAcl, extension);
     }
 
+    @Override
     public ContentStream getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset,
             BigInteger length, ExtensionsData extension) {
         return service.getContentStream(repositoryId, objectId, streamId, offset, length, extension);
     }
 
+    @Override
     public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             Properties properties, ExtensionsData extension) {
         service.updateProperties(repositoryId, objectId, changeToken, properties, extension);
     }
 
+    @Override
     public List<BulkUpdateObjectIdAndChangeToken> bulkUpdateProperties(String repositoryId,
             List<BulkUpdateObjectIdAndChangeToken> objectIdsAndChangeTokens, Properties properties,
             List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds, ExtensionsData extension) {
@@ -276,44 +308,53 @@ public abstract class AbstractCmisServic
                 removeSecondaryTypeIds, extension);
     }
 
+    @Override
     public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId,
             ExtensionsData extension) {
         service.moveObject(repositoryId, objectId, targetFolderId, sourceFolderId, extension);
     }
 
+    @Override
     public void deleteObject(String repositoryId, String objectId, Boolean allVersions, ExtensionsData extension) {
         service.deleteObject(repositoryId, objectId, allVersions, extension);
     }
 
+    @Override
     public FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions,
             UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension) {
         return service.deleteTree(repositoryId, folderId, allVersions, unfileObjects, continueOnFailure, extension);
     }
 
+    @Override
     public void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag,
             Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) {
         service.setContentStream(repositoryId, objectId, overwriteFlag, changeToken, contentStream, extension);
     }
 
+    @Override
     public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             ExtensionsData extension) {
         service.deleteContentStream(repositoryId, objectId, changeToken, extension);
     }
 
+    @Override
     public void appendContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             ContentStream contentStream, boolean isLastChunk, ExtensionsData extension) {
         service.appendContentStream(repositoryId, objectId, changeToken, contentStream, isLastChunk, extension);
     }
 
+    @Override
     public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension,
             Holder<Boolean> contentCopied) {
         service.checkOut(repositoryId, objectId, extension, contentCopied);
     }
 
+    @Override
     public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) {
         service.cancelCheckOut(repositoryId, objectId, extension);
     }
 
+    @Override
     public void checkIn(String repositoryId, Holder<String> objectId, Boolean major, Properties properties,
             ContentStream contentStream, String checkinComment, List<String> policies, Acl addAces, Acl removeAces,
             ExtensionsData extension) {
@@ -321,6 +362,7 @@ public abstract class AbstractCmisServic
                 removeAces, extension);
     }
 
+    @Override
     public ObjectData getObjectOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
             Boolean major, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, ExtensionsData extension) {
@@ -330,17 +372,20 @@ public abstract class AbstractCmisServic
                         extension);
     }
 
+    @Override
     public Properties getPropertiesOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
             Boolean major, String filter, ExtensionsData extension) {
         return service.getPropertiesOfLatestVersion(repositoryId, objectId, versionSeriesId, major, filter, extension);
     }
 
+    @Override
     public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter,
             Boolean includeAllowableActions, ExtensionsData extension) {
         return service.getAllVersions(repositoryId, objectId, versionSeriesId, filter, includeAllowableActions,
                 extension);
     }
 
+    @Override
     public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -348,21 +393,25 @@ public abstract class AbstractCmisServic
                 renditionFilter, maxItems, skipCount, extension);
     }
 
+    @Override
     public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties,
             String filter, Boolean includePolicyIds, Boolean includeAcl, BigInteger maxItems, ExtensionsData extension) {
         return service.getContentChanges(repositoryId, changeLogToken, includeProperties, filter, includePolicyIds,
                 includeAcl, maxItems, extension);
     }
 
+    @Override
     public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions,
             ExtensionsData extension) {
         service.addObjectToFolder(repositoryId, objectId, folderId, allVersions, extension);
     }
 
+    @Override
     public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, ExtensionsData extension) {
         service.removeObjectFromFolder(repositoryId, objectId, folderId, extension);
     }
 
+    @Override
     public ObjectList getObjectRelationships(String repositoryId, String objectId, Boolean includeSubRelationshipTypes,
             RelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -370,46 +419,56 @@ public abstract class AbstractCmisServic
                 relationshipDirection, typeId, filter, includeAllowableActions, maxItems, skipCount, extension);
     }
 
+    @Override
     public Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension) {
         return service.getAcl(repositoryId, objectId, onlyBasicPermissions, extension);
     }
 
+    @Override
     public Acl applyAcl(String repositoryId, String objectId, Acl addAces, Acl removeAces,
             AclPropagation aclPropagation, ExtensionsData extension) {
         return service.applyAcl(repositoryId, objectId, addAces, removeAces, aclPropagation, extension);
     }
 
+    @Override
     public void applyPolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) {
         service.applyPolicy(repositoryId, policyId, objectId, extension);
     }
 
+    @Override
     public void removePolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) {
         service.removePolicy(repositoryId, policyId, objectId, extension);
     }
 
+    @Override
     public List<ObjectData> getAppliedPolicies(String repositoryId, String objectId, String filter,
             ExtensionsData extension) {
         return service.getAppliedPolicies(repositoryId, objectId, filter, extension);
     }
 
+    @Override
     public String create(String repositoryId, Properties properties, String folderId, ContentStream contentStream,
             VersioningState versioningState, List<String> policies, ExtensionsData extension) {
         return service.create(repositoryId, properties, folderId, contentStream, versioningState, policies, extension);
     }
 
+    @Override
     public void deleteObjectOrCancelCheckOut(String repositoryId, String objectId, Boolean allVersions,
             ExtensionsData extension) {
         service.deleteObjectOrCancelCheckOut(repositoryId, objectId, allVersions, extension);
     }
 
+    @Override
     public Acl applyAcl(String repositoryId, String objectId, Acl aces, AclPropagation aclPropagation) {
         return service.applyAcl(repositoryId, objectId, aces, aclPropagation);
     }
 
+    @Override
     public ObjectInfo getObjectInfo(String repositoryId, String objectId) {
         return service.getObjectInfo(repositoryId, objectId);
     }
 
+    @Override
     public void close() {
         service.close();
         context = null;

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/ConformanceCmisServiceWrapper.java Thu Aug 13 12:05:59 2015
@@ -90,6 +90,7 @@ public class ConformanceCmisServiceWrapp
         this.defaultDepth = defaultDepth;
     }
 
+    @Override
     public void initialize(Object[] params) {
         if (params == null) {
             return;
@@ -532,6 +533,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- repository service ---
 
+    @Override
     public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
 
@@ -542,6 +544,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<RepositoryInfo> getRepositoryInfos(ExtensionsData extension) {
         try {
             return getWrappedService().getRepositoryInfos(extension);
@@ -550,6 +553,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public TypeDefinitionList getTypeChildren(String repositoryId, String typeId, Boolean includePropertyDefinitions,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -565,6 +569,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public TypeDefinition getTypeDefinition(String repositoryId, String typeId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Type Id", typeId);
@@ -576,6 +581,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<TypeDefinitionContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth,
             Boolean includePropertyDefinitions, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -590,6 +596,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public TypeDefinition createType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkTypeDefinition(type);
@@ -601,6 +608,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public TypeDefinition updateType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkTypeDefinition(type);
@@ -612,6 +620,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void deleteType(String repositoryId, String typeId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Type Id", typeId);
@@ -625,6 +634,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- navigation service ---
 
+    @Override
     public ObjectList getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -643,6 +653,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ObjectInFolderList getChildren(String repositoryId, String folderId, String filter, String orderBy,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -663,6 +674,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<ObjectInFolderContainer> getDescendants(String repositoryId, String folderId, BigInteger depth,
             String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePathSegment, ExtensionsData extension) {
@@ -682,6 +694,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ObjectData getFolderParent(String repositoryId, String folderId, String filter, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Folder Id", folderId);
@@ -693,6 +706,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<ObjectInFolderContainer> getFolderTree(String repositoryId, String folderId, BigInteger depth,
             String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePathSegment, ExtensionsData extension) {
@@ -712,6 +726,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<ObjectParentData> getObjectParents(String repositoryId, String objectId, String filter,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             Boolean includeRelativePathSegment, ExtensionsData extension) {
@@ -732,6 +747,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- object service ---
 
+    @Override
     public String create(String repositoryId, Properties properties, String folderId, ContentStream contentStream,
             VersioningState versioningState, List<String> policies, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -746,6 +762,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public String createDocument(String repositoryId, Properties properties, String folderId,
             ContentStream contentStream, VersioningState versioningState, List<String> policies, Acl addAces,
             Acl removeAces, ExtensionsData extension) {
@@ -761,6 +778,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public String createDocumentFromSource(String repositoryId, String sourceId, Properties properties,
             String folderId, VersioningState versioningState, List<String> policies, Acl addAces, Acl removeAces,
             ExtensionsData extension) {
@@ -775,6 +793,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public String createFolder(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -790,6 +809,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public String createPolicy(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -804,6 +824,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public String createItem(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -818,6 +839,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public String createRelationship(String repositoryId, Properties properties, List<String> policies, Acl addAces,
             Acl removeAces, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -834,6 +856,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -846,6 +869,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void deleteObject(String repositoryId, String objectId, Boolean allVersions, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -858,6 +882,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void deleteObjectOrCancelCheckOut(String repositoryId, String objectId, Boolean allVersions,
             ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -871,6 +896,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions,
             UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -887,6 +913,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public AllowableActions getAllowableActions(String repositoryId, String objectId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -898,6 +925,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ContentStream getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset,
             BigInteger length, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -912,6 +940,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ObjectData getObject(String repositoryId, String objectId, String filter, Boolean includeAllowableActions,
             IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
             Boolean includeAcl, ExtensionsData extension) {
@@ -931,6 +960,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ObjectData getObjectByPath(String repositoryId, String path, String filter, Boolean includeAllowableActions,
             IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
             Boolean includeAcl, ExtensionsData extension) {
@@ -950,6 +980,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public Properties getProperties(String repositoryId, String objectId, String filter, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -961,6 +992,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<RenditionData> getRenditions(String repositoryId, String objectId, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -977,6 +1009,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId,
             ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -990,6 +1023,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag,
             Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1005,6 +1039,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void appendContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             ContentStream contentStream, boolean isLastChunk, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1019,6 +1054,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             Properties properties, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1032,6 +1068,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<BulkUpdateObjectIdAndChangeToken> bulkUpdateProperties(String repositoryId,
             List<BulkUpdateObjectIdAndChangeToken> objectIdAndChangeToken, Properties properties,
             List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds, ExtensionsData extension) {
@@ -1049,6 +1086,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- versioning service ---
 
+    @Override
     public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -1060,6 +1098,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void checkIn(String repositoryId, Holder<String> objectId, Boolean major, Properties properties,
             ContentStream contentStream, String checkinComment, List<String> policies, Acl addAces, Acl removeAces,
             ExtensionsData extension) {
@@ -1075,6 +1114,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension,
             Holder<Boolean> contentCopied) {
         checkRepositoryId(repositoryId);
@@ -1087,6 +1127,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ObjectData getObjectOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
             Boolean major, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, ExtensionsData extension) {
@@ -1108,6 +1149,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public Properties getPropertiesOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
             Boolean major, String filter, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1122,6 +1164,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter,
             Boolean includeAllowableActions, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1138,6 +1181,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- discovery service ---
 
+    @Override
     public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties,
             String filter, Boolean includePolicyIds, Boolean includeAcl, BigInteger maxItems, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1154,6 +1198,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -1176,6 +1221,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- multi filing service ---
 
+    @Override
     public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions,
             ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1190,6 +1236,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -1203,6 +1250,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- relationship service ---
 
+    @Override
     public ObjectList getObjectRelationships(String repositoryId, String objectId, Boolean includeSubRelationshipTypes,
             RelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -1224,6 +1272,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- ACL service ---
 
+    @Override
     public Acl applyAcl(String repositoryId, String objectId, Acl aces, AclPropagation aclPropagation) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -1236,6 +1285,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public Acl applyAcl(String repositoryId, String objectId, Acl addAces, Acl removeAces,
             AclPropagation aclPropagation, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1249,6 +1299,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Object Id", objectId);
@@ -1263,6 +1314,7 @@ public class ConformanceCmisServiceWrapp
 
     // --- policy service ---
 
+    @Override
     public void applyPolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Policy Id", policyId);
@@ -1275,6 +1327,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public List<ObjectData> getAppliedPolicies(String repositoryId, String objectId, String filter,
             ExtensionsData extension) {
         checkRepositoryId(repositoryId);
@@ -1287,6 +1340,7 @@ public class ConformanceCmisServiceWrapp
         }
     }
 
+    @Override
     public void removePolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) {
         checkRepositoryId(repositoryId);
         checkId("Policy Id", policyId);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/SimpleLoggingCmisServiceWrapper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/SimpleLoggingCmisServiceWrapper.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/SimpleLoggingCmisServiceWrapper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/wrapper/SimpleLoggingCmisServiceWrapper.java Thu Aug 13 12:05:59 2015
@@ -82,16 +82,19 @@ public class SimpleLoggingCmisServiceWra
                 userAgent);
     }
 
+    @Override
     public List<RepositoryInfo> getRepositoryInfos(ExtensionsData extension) {
         log("getRepositoryInfos", null);
         return getWrappedService().getRepositoryInfos(extension);
     }
 
+    @Override
     public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) {
         log("getRepositoryInfo", repositoryId);
         return getWrappedService().getRepositoryInfo(repositoryId, extension);
     }
 
+    @Override
     public TypeDefinitionList getTypeChildren(String repositoryId, String typeId, Boolean includePropertyDefinitions,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
         log("getTypeChildren", repositoryId);
@@ -99,6 +102,7 @@ public class SimpleLoggingCmisServiceWra
                 skipCount, extension);
     }
 
+    @Override
     public List<TypeDefinitionContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth,
             Boolean includePropertyDefinitions, ExtensionsData extension) {
         log("getTypeDescendants", repositoryId);
@@ -106,26 +110,31 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public TypeDefinition getTypeDefinition(String repositoryId, String typeId, ExtensionsData extension) {
         log("getTypeDefinition", repositoryId);
         return getWrappedService().getTypeDefinition(repositoryId, typeId, extension);
     }
 
+    @Override
     public TypeDefinition createType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
         log("createType", repositoryId);
         return getWrappedService().createType(repositoryId, type, extension);
     }
 
+    @Override
     public TypeDefinition updateType(String repositoryId, TypeDefinition type, ExtensionsData extension) {
         log("updateType", repositoryId);
         return getWrappedService().updateType(repositoryId, type, extension);
     }
 
+    @Override
     public void deleteType(String repositoryId, String typeId, ExtensionsData extension) {
         log("deleteType", repositoryId);
         getWrappedService().deleteType(repositoryId, typeId, extension);
     }
 
+    @Override
     public ObjectInFolderList getChildren(String repositoryId, String folderId, String filter, String orderBy,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -134,6 +143,7 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, includePathSegment, maxItems, skipCount, extension);
     }
 
+    @Override
     public List<ObjectInFolderContainer> getDescendants(String repositoryId, String folderId, BigInteger depth,
             String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePathSegment, ExtensionsData extension) {
@@ -142,6 +152,7 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, includePathSegment, extension);
     }
 
+    @Override
     public List<ObjectInFolderContainer> getFolderTree(String repositoryId, String folderId, BigInteger depth,
             String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePathSegment, ExtensionsData extension) {
@@ -150,6 +161,7 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, includePathSegment, extension);
     }
 
+    @Override
     public List<ObjectParentData> getObjectParents(String repositoryId, String objectId, String filter,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             Boolean includeRelativePathSegment, ExtensionsData extension) {
@@ -158,11 +170,13 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, includeRelativePathSegment, extension);
     }
 
+    @Override
     public ObjectData getFolderParent(String repositoryId, String folderId, String filter, ExtensionsData extension) {
         log("getFolderParent", repositoryId);
         return getWrappedService().getFolderParent(repositoryId, folderId, filter, extension);
     }
 
+    @Override
     public ObjectList getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -171,6 +185,7 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, maxItems, skipCount, extension);
     }
 
+    @Override
     public String createDocument(String repositoryId, Properties properties, String folderId,
             ContentStream contentStream, VersioningState versioningState, List<String> policies, Acl addAces,
             Acl removeAces, ExtensionsData extension) {
@@ -179,6 +194,7 @@ public class SimpleLoggingCmisServiceWra
                 policies, addAces, removeAces, extension);
     }
 
+    @Override
     public String createDocumentFromSource(String repositoryId, String sourceId, Properties properties,
             String folderId, VersioningState versioningState, List<String> policies, Acl addAces, Acl removeAces,
             ExtensionsData extension) {
@@ -187,6 +203,7 @@ public class SimpleLoggingCmisServiceWra
                 versioningState, policies, addAces, removeAces, extension);
     }
 
+    @Override
     public String createFolder(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         log("createFolder", repositoryId);
@@ -194,6 +211,7 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public String createRelationship(String repositoryId, Properties properties, List<String> policies, Acl addAces,
             Acl removeAces, ExtensionsData extension) {
         log("createRelationship", repositoryId);
@@ -201,6 +219,7 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public String createPolicy(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         log("createPolicy", repositoryId);
@@ -208,6 +227,7 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public String createItem(String repositoryId, Properties properties, String folderId, List<String> policies,
             Acl addAces, Acl removeAces, ExtensionsData extension) {
         log("createItem", repositoryId);
@@ -215,11 +235,13 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public AllowableActions getAllowableActions(String repositoryId, String objectId, ExtensionsData extension) {
         log("getAllowableActions", repositoryId);
         return getWrappedService().getAllowableActions(repositoryId, objectId, extension);
     }
 
+    @Override
     public ObjectData getObject(String repositoryId, String objectId, String filter, Boolean includeAllowableActions,
             IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
             Boolean includeAcl, ExtensionsData extension) {
@@ -228,11 +250,13 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, includePolicyIds, includeAcl, extension);
     }
 
+    @Override
     public Properties getProperties(String repositoryId, String objectId, String filter, ExtensionsData extension) {
         log("getProperties", repositoryId);
         return getWrappedService().getProperties(repositoryId, objectId, filter, extension);
     }
 
+    @Override
     public List<RenditionData> getRenditions(String repositoryId, String objectId, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
         log("getRenditions", repositoryId);
@@ -240,6 +264,7 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public ObjectData getObjectByPath(String repositoryId, String path, String filter, Boolean includeAllowableActions,
             IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
             Boolean includeAcl, ExtensionsData extension) {
@@ -248,18 +273,21 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, includePolicyIds, includeAcl, extension);
     }
 
+    @Override
     public ContentStream getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset,
             BigInteger length, ExtensionsData extension) {
         log("getContentStream", repositoryId);
         return getWrappedService().getContentStream(repositoryId, objectId, streamId, offset, length, extension);
     }
 
+    @Override
     public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             Properties properties, ExtensionsData extension) {
         log("updateProperties", repositoryId);
         getWrappedService().updateProperties(repositoryId, objectId, changeToken, properties, extension);
     }
 
+    @Override
     public List<BulkUpdateObjectIdAndChangeToken> bulkUpdateProperties(String repositoryId,
             List<BulkUpdateObjectIdAndChangeToken> objectIdsAndChangeTokens, Properties properties,
             List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds, ExtensionsData extension) {
@@ -268,17 +296,20 @@ public class SimpleLoggingCmisServiceWra
                 addSecondaryTypeIds, removeSecondaryTypeIds, extension);
     }
 
+    @Override
     public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId,
             ExtensionsData extension) {
         log("moveObject", repositoryId);
         getWrappedService().moveObject(repositoryId, objectId, targetFolderId, sourceFolderId, extension);
     }
 
+    @Override
     public void deleteObject(String repositoryId, String objectId, Boolean allVersions, ExtensionsData extension) {
         log("deleteObject", repositoryId);
         getWrappedService().deleteObject(repositoryId, objectId, allVersions, extension);
     }
 
+    @Override
     public FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions,
             UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension) {
         log("deleteTree", repositoryId);
@@ -286,6 +317,7 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag,
             Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) {
         log("setContentStream", repositoryId);
@@ -293,12 +325,14 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             ExtensionsData extension) {
         log("deleteContentStream", repositoryId);
         getWrappedService().deleteContentStream(repositoryId, objectId, changeToken, extension);
     }
 
+    @Override
     public void appendContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken,
             ContentStream contentStream, boolean isLastChunk, ExtensionsData extension) {
         log("appendContentStream", repositoryId);
@@ -306,17 +340,20 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension,
             Holder<Boolean> contentCopied) {
         log("checkOut", repositoryId);
         getWrappedService().checkOut(repositoryId, objectId, extension, contentCopied);
     }
 
+    @Override
     public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) {
         log("cancelCheckOut", repositoryId);
         getWrappedService().cancelCheckOut(repositoryId, objectId, extension);
     }
 
+    @Override
     public void checkIn(String repositoryId, Holder<String> objectId, Boolean major, Properties properties,
             ContentStream contentStream, String checkinComment, List<String> policies, Acl addAces, Acl removeAces,
             ExtensionsData extension) {
@@ -325,6 +362,7 @@ public class SimpleLoggingCmisServiceWra
                 addAces, removeAces, extension);
     }
 
+    @Override
     public ObjectData getObjectOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
             Boolean major, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
             String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, ExtensionsData extension) {
@@ -335,6 +373,7 @@ public class SimpleLoggingCmisServiceWra
                         extension);
     }
 
+    @Override
     public Properties getPropertiesOfLatestVersion(String repositoryId, String objectId, String versionSeriesId,
             Boolean major, String filter, ExtensionsData extension) {
         log("getPropertiesOfLatestVersion", repositoryId);
@@ -342,6 +381,7 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter,
             Boolean includeAllowableActions, ExtensionsData extension) {
         log("getAllVersions", repositoryId);
@@ -349,6 +389,7 @@ public class SimpleLoggingCmisServiceWra
                 includeAllowableActions, extension);
     }
 
+    @Override
     public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions,
             Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -357,6 +398,7 @@ public class SimpleLoggingCmisServiceWra
                 includeRelationships, renditionFilter, maxItems, skipCount, extension);
     }
 
+    @Override
     public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties,
             String filter, Boolean includePolicyIds, Boolean includeAcl, BigInteger maxItems, ExtensionsData extension) {
         log("getContentChanges", repositoryId);
@@ -364,17 +406,20 @@ public class SimpleLoggingCmisServiceWra
                 includePolicyIds, includeAcl, maxItems, extension);
     }
 
+    @Override
     public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions,
             ExtensionsData extension) {
         log("addObjectToFolder", repositoryId);
         getWrappedService().addObjectToFolder(repositoryId, objectId, folderId, allVersions, extension);
     }
 
+    @Override
     public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, ExtensionsData extension) {
         log("removeObjectFromFolder", repositoryId);
         getWrappedService().removeObjectFromFolder(repositoryId, objectId, folderId, extension);
     }
 
+    @Override
     public ObjectList getObjectRelationships(String repositoryId, String objectId, Boolean includeSubRelationshipTypes,
             RelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions,
             BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
@@ -383,33 +428,39 @@ public class SimpleLoggingCmisServiceWra
                 relationshipDirection, typeId, filter, includeAllowableActions, maxItems, skipCount, extension);
     }
 
+    @Override
     public Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension) {
         log("getAcl", repositoryId);
         return getWrappedService().getAcl(repositoryId, objectId, onlyBasicPermissions, extension);
     }
 
+    @Override
     public Acl applyAcl(String repositoryId, String objectId, Acl addAces, Acl removeAces,
             AclPropagation aclPropagation, ExtensionsData extension) {
         log("applyAcl", repositoryId);
         return getWrappedService().applyAcl(repositoryId, objectId, addAces, removeAces, aclPropagation, extension);
     }
 
+    @Override
     public void applyPolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) {
         log("applyPolicy", repositoryId);
         getWrappedService().applyPolicy(repositoryId, policyId, objectId, extension);
     }
 
+    @Override
     public void removePolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) {
         log("removePolicy", repositoryId);
         getWrappedService().removePolicy(repositoryId, policyId, objectId, extension);
     }
 
+    @Override
     public List<ObjectData> getAppliedPolicies(String repositoryId, String objectId, String filter,
             ExtensionsData extension) {
         log("getRepositoryInfos", repositoryId);
         return getWrappedService().getAppliedPolicies(repositoryId, objectId, filter, extension);
     }
 
+    @Override
     public String create(String repositoryId, Properties properties, String folderId, ContentStream contentStream,
             VersioningState versioningState, List<String> policies, ExtensionsData extension) {
         log("create", repositoryId);
@@ -417,12 +468,14 @@ public class SimpleLoggingCmisServiceWra
                 extension);
     }
 
+    @Override
     public void deleteObjectOrCancelCheckOut(String repositoryId, String objectId, Boolean allVersions,
             ExtensionsData extension) {
         log("deleteObjectOrCancelCheckOut", repositoryId);
         getWrappedService().deleteObjectOrCancelCheckOut(repositoryId, objectId, allVersions, extension);
     }
 
+    @Override
     public Acl applyAcl(String repositoryId, String objectId, Acl aces, AclPropagation aclPropagation) {
         log("applyAcl", repositoryId);
         return getWrappedService().applyAcl(repositoryId, objectId, aces, aclPropagation);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java Thu Aug 13 12:05:59 2015
@@ -174,24 +174,29 @@ public abstract class AbstractTckIT exte
     }
 
     private static class TestProgressMonitor implements CmisTestProgressMonitor {
+        @Override
         public void startGroup(CmisTestGroup group) {
             System.out.println();
             System.out.println(group.getName() + " (" + group.getTests().size() + " tests)");
         }
 
+        @Override
         public void endGroup(CmisTestGroup group) {
             System.out.println();
         }
 
+        @Override
         public void startTest(CmisTest test) {
             System.out.print("  " + test.getName());
         }
 
+        @Override
         public void endTest(CmisTest test) {
             System.out.print(" (" + test.getTime() + "ms): ");
             System.out.println(getWorst(test.getResults()));
         }
 
+        @Override
         public void message(String msg) {
             System.out.println(msg);
         }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTest.java Thu Aug 13 12:05:59 2015
@@ -45,6 +45,7 @@ public abstract class AbstractCmisTest i
     private List<CmisTestResult> results;
     private long time;
 
+    @Override
     public void init(Map<String, String> parameters) {
         this.parameters = parameters;
         results = new ArrayList<CmisTestResult>();
@@ -54,6 +55,7 @@ public abstract class AbstractCmisTest i
         return parameters;
     }
 
+    @Override
     public String getName() {
         return name;
     }
@@ -62,6 +64,7 @@ public abstract class AbstractCmisTest i
         this.name = name;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
@@ -78,6 +81,7 @@ public abstract class AbstractCmisTest i
         return group;
     }
 
+    @Override
     public abstract void run() throws Exception;
 
     @Test
@@ -85,18 +89,22 @@ public abstract class AbstractCmisTest i
         JUnitHelper.run(this);
     }
 
+    @Override
     public List<CmisTestResult> getResults() {
         return results;
     }
 
+    @Override
     public boolean isEnabled() {
         return isEnabled;
     }
 
+    @Override
     public void setEnabled(boolean enabled) {
         this.isEnabled = enabled;
     }
 
+    @Override
     public long getTime() {
         return time;
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTestGroup.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTestGroup.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTestGroup.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractCmisTestGroup.java Thu Aug 13 12:05:59 2015
@@ -39,6 +39,7 @@ public abstract class AbstractCmisTestGr
     private boolean isEnabled = true;
     private CmisTestProgressMonitor progressMonitor;
 
+    @Override
     public void init(Map<String, String> parameters) throws Exception {
         this.parameters = parameters;
     }
@@ -47,6 +48,7 @@ public abstract class AbstractCmisTestGr
         return parameters;
     }
 
+    @Override
     public String getName() {
         return name;
     }
@@ -55,6 +57,7 @@ public abstract class AbstractCmisTestGr
         this.name = name;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
@@ -63,6 +66,7 @@ public abstract class AbstractCmisTestGr
         this.description = description;
     }
 
+    @Override
     public List<CmisTest> getTests() {
         return tests;
     }
@@ -77,6 +81,7 @@ public abstract class AbstractCmisTestGr
         }
     }
 
+    @Override
     public void setProgressMonitor(CmisTestProgressMonitor progressMonitor) {
         this.progressMonitor = progressMonitor;
     }
@@ -85,6 +90,7 @@ public abstract class AbstractCmisTestGr
         return this.progressMonitor;
     }
 
+    @Override
     public void run() throws Exception {
         if (progressMonitor != null) {
             progressMonitor.startGroup(this);
@@ -150,10 +156,12 @@ public abstract class AbstractCmisTestGr
     protected void postTest(CmisTest test) {
     }
 
+    @Override
     public boolean isEnabled() {
         return isEnabled;
     }
 
+    @Override
     public void setEnabled(boolean enabled) {
         this.isEnabled = enabled;
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java Thu Aug 13 12:05:59 2015
@@ -1411,7 +1411,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult checkACL(Session session, Acl acl, boolean checkExact, String message) {
@@ -1452,7 +1452,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     private void checkRelationships(Session session, List<CmisTestResult> results, CmisObject object) {
@@ -1683,7 +1683,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult checkVersionHistory(Session session, CmisObject object, String[] properties, String message) {
@@ -1924,7 +1924,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult assertAllowableAction(CmisObject object, Action action, CmisTestResult success,
@@ -2021,7 +2021,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult checkChildren(Session session, Folder folder, String message) {
@@ -2155,7 +2155,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     private void checkChild(Session session, List<CmisTestResult> results, Folder folder, CmisObject child) {
@@ -2372,7 +2372,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult checkTypeDefinition(Session session, TypeDefinition type, String message) {
@@ -2719,7 +2719,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult checkPropertyDefinition(PropertyDefinition<?> propDef, String message) {
@@ -2775,7 +2775,7 @@ public abstract class AbstractSessionTes
         CmisTestResultImpl result = createResult(getWorst(results), message);
         result.getChildren().addAll(results);
 
-        return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+        return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
     }
 
     protected CmisTestResult assertEquals(TypeDefinition expected, TypeDefinition actual, CmisTestResult success,
@@ -3698,7 +3698,7 @@ public abstract class AbstractSessionTes
             CmisTestResultImpl result = createResult(getWorst(results), "Property definition: " + id);
             result.getChildren().addAll(results);
 
-            return (result.getStatus().getLevel() <= OK.getLevel() ? null : result);
+            return result.getStatus().getLevel() <= OK.getLevel() ? null : result;
         }
     }
 }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/CmisTestResultImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/CmisTestResultImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/CmisTestResultImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/CmisTestResultImpl.java Thu Aug 13 12:05:59 2015
@@ -50,26 +50,32 @@ public class CmisTestResultImpl implemen
         this.isFatal = isFatal;
     }
 
+    @Override
     public String getGroupName() {
         return groupName;
     }
 
+    @Override
     public String getTestName() {
         return testName;
     }
 
+    @Override
     public String getMessage() {
         return message;
     }
 
+    @Override
     public CmisTestResultStatus getStatus() {
         return status;
     }
 
+    @Override
     public Throwable getException() {
         return exception;
     }
 
+    @Override
     public StackTraceElement[] getStackTrace() {
         return stackTrace;
     }
@@ -79,6 +85,7 @@ public class CmisTestResultImpl implemen
         this.stackTrace = stackTrace;
     }
 
+    @Override
     public String getRequest() {
         return request;
     }
@@ -87,6 +94,7 @@ public class CmisTestResultImpl implemen
         this.request = request;
     }
 
+    @Override
     public String getResponse() {
         return response;
     }
@@ -95,6 +103,7 @@ public class CmisTestResultImpl implemen
         this.response = response;
     }
 
+    @Override
     public String getUrl() {
         return url;
     }
@@ -103,10 +112,12 @@ public class CmisTestResultImpl implemen
         this.url = url;
     }
 
+    @Override
     public List<CmisTestResult> getChildren() {
         return children;
     }
 
+    @Override
     public boolean isFatal() {
         return isFatal;
     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/JUnitHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/JUnitHelper.java?rev=1695691&r1=1695690&r2=1695691&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/JUnitHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/JUnitHelper.java Thu Aug 13 12:05:59 2015
@@ -78,22 +78,27 @@ public final class JUnitHelper {
 
     private static class JUnitProgressMonitor implements CmisTestProgressMonitor {
 
+        @Override
         @SuppressWarnings("PMD.SystemPrintln")
         public void startGroup(CmisTestGroup group) {
             System.out.println(group.getName() + " (" + group.getTests().size() + " tests)");
         }
 
+        @Override
         public void endGroup(CmisTestGroup group) {
         }
 
+        @Override
         @SuppressWarnings("PMD.SystemPrintln")
         public void startTest(CmisTest test) {
             System.out.println("  " + test.getName());
         }
 
+        @Override
         public void endTest(CmisTest test) {
         }
 
+        @Override
         @SuppressWarnings("PMD.SystemPrintln")
         public void message(String msg) {
             System.out.println(msg);



Mime
View raw message