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=1746713&r1=1746712&r2=1746713&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 Fri Jun 3 13:01:57 2016 @@ -64,8 +64,6 @@ public class QueryUtil extends QueryUtil * @param statement * 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 { CharStream input = new ANTLRStringStream(statement); @@ -104,9 +102,6 @@ public class QueryUtil extends QueryUtil * @param pw * 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 IOException, RecognitionException {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilBase.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/QueryUtilBase.java?rev=1746713&r1=1746712&r2=1746713&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilBase.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilBase.java Fri Jun 3 13:01:57 2016 @@ -53,8 +53,6 @@ public abstract class QueryUtilBase<T ex * parse the statement, check for syntax errors and create an AST * * @return the abstract syntax tree of the parsed statement - * - * @throws RecognitionException */ public abstract CommonTree parseStatement() throws RecognitionException; @@ -63,16 +61,12 @@ public abstract class QueryUtilBase<T ex * check for semantic errors, fill the query object. Usually a walker will * be CmisQueryWalker (or subclass) if the supporting OpenCMIS query classes * are used. - * - * @throws RecognitionException */ public abstract void walkStatement() throws RecognitionException; /** * Fully process a query by parsing and walking it and setting up the * supporting objects - * - * @throws RecognitionException */ public void processStatement() throws RecognitionException { parseStatement(); @@ -104,18 +98,19 @@ public abstract class QueryUtilBase<T ex /** * Same as traverseStatement but throws only CMIS Exceptions - */ + */ public void processStatementUsingCmisExceptions() { try { processStatement(); } catch (RecognitionException e) { String errorMsg = getErrorMessage(e); - throw new CmisInvalidArgumentException("Processing of query statement failed with RecognitionException error: \n " - + errorMsg, e); + throw new CmisInvalidArgumentException( + "Processing of query statement failed with RecognitionException error: \n " + errorMsg, e); } catch (CmisBaseException e) { throw e; } catch (Exception e) { - throw new CmisInvalidArgumentException("Processing of query statement failed with exception: " + e.getMessage(), e); + throw new CmisInvalidArgumentException("Processing of query statement failed with exception: " + + e.getMessage(), 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=1746713&r1=1746712&r2=1746713&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 Fri Jun 3 13:01:57 2016 @@ -71,6 +71,9 @@ public abstract class AbstractCmisServic /** * Initializes the wrapper with a set of parameters. + * + * @param params + * an array of parameter objects */ public void initialize(Object[] params) { } 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=1746713&r1=1746712&r2=1746713&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 Fri Jun 3 13:01:57 2016 @@ -72,6 +72,9 @@ public class ConformanceCmisServiceWrapp /** * Constructor used by {@link CmisServiceWrapperManager}. + * + * @param service + * the {@link CmisService} object, not {@code null} */ public ConformanceCmisServiceWrapper(CmisService service) { super(service); @@ -79,6 +82,9 @@ public class ConformanceCmisServiceWrapp /** * Alternative constructor. + * + * @param service + * the {@link CmisService} object, not {@code null} */ public ConformanceCmisServiceWrapper(CmisService service, BigInteger defaultTypesMaxItems, BigInteger defaultTypesDepth, BigInteger defaultMaxItems, BigInteger defaultDepth) { @@ -346,7 +352,7 @@ public class ConformanceCmisServiceWrapp } /** - * Returns <code>true</code> if <code>value</code> is {@code null}. + * Returns {@code true} if {@code value} is {@code null}. */ protected Boolean getDefaultTrue(Boolean value) { if (value == null) { @@ -357,7 +363,7 @@ public class ConformanceCmisServiceWrapp } /** - * Returns <code>false</code> if <code>value</code> is {@code null}. + * Returns {@code false} if {@code value} is {@code null}. */ protected Boolean getDefaultFalse(Boolean value) { if (value == null) { @@ -368,8 +374,8 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the <code>IncludeRelationships.NONE</code> if <code>value</code> - * is {@code null}. + * Returns {@code IncludeRelationships.NONE} if {@code value} is + * {@code null}. */ protected IncludeRelationships getDefault(IncludeRelationships value) { if (value == null) { @@ -380,8 +386,7 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the <code>UnfileObjects.DELETE</code> if <code>value</code> is - * {@code null}. + * Returns {@code UnfileObjects.DELETE} if {@code value} is {@code null}. */ protected UnfileObject getDefault(UnfileObject value) { if (value == null) { @@ -392,8 +397,8 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the <code>AclPropagation.REPOSITORYDETERMINED</code> if - * <code>value</code> is {@code null}. + * Returns the {@code AclPropagation.REPOSITORYDETERMINED} if {@code value} + * is {@code null}. */ protected AclPropagation getDefault(AclPropagation value) { if (value == null) { @@ -404,8 +409,8 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the <code>RelationshipDirection.SOURCE</code> if - * <code>value</code> is {@code null} . + * Returns the {@code RelationshipDirection.SOURCE} if {@code value} is + * {@code null} . */ protected RelationshipDirection getDefault(RelationshipDirection value) { if (value == null) { @@ -416,8 +421,7 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the <code>"cmis:none"</code> if <code>value</code> is - * {@code null}. + * Returns the {@code "cmis:none"} if {@code value} is {@code null}. */ protected String getDefaultRenditionFilter(String value) { if ((value == null) || (value.length() == 0)) { @@ -428,9 +432,9 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the default maxItems if <code>maxItems</code> == {@code null}, - * throws an exception if <code>maxItems</code> < 0, returns - * <code>maxItems</code> otherwise. + * Returns the default maxItems if {@code maxItems} == {@code null}, throws + * an exception if {@code maxItems} < 0, returns {@code maxItems} + * otherwise. */ protected BigInteger getTypesMaxItems(BigInteger maxItems) { if (maxItems == null) { @@ -465,9 +469,9 @@ public class ConformanceCmisServiceWrapp } /** - * Returns the default maxItems if <code>maxItems</code> == {@code null}, - * throws an exception if <code>maxItems</code> < 0, returns - * <code>maxItems</code> otherwise. + * Returns the default maxItems if {@code maxItems} == {@code null}, throws + * an exception if {@code maxItems} < 0, returns {@code maxItems} + * otherwise. */ protected BigInteger getMaxItems(BigInteger maxItems) { if (maxItems == null) { @@ -482,9 +486,8 @@ public class ConformanceCmisServiceWrapp } /** - * Returns 0 if <code>skipCount</code> == {@code null}, throws an exception - * if <code>skipCount</code> < 0, returns <code>skipCount</code> - * otherwise. + * Returns 0 if {@code skipCount} == {@code null}, throws an exception if + * {@code skipCount} < 0, returns {@code skipCount} otherwise. */ protected BigInteger getSkipCount(BigInteger skipCount) { if (skipCount == null) { Modified: chemistry/opencmis/trunk/pom.xml URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1746713&r1=1746712&r2=1746713&view=diff ============================================================================== --- chemistry/opencmis/trunk/pom.xml (original) +++ chemistry/opencmis/trunk/pom.xml Fri Jun 3 13:01:57 2016 @@ -556,87 +556,92 @@ <version>2.7</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <inherited>false</inherited> - <reportSets> - <reportSet> - <id>aggregate</id> - <reports> - <report>aggregate</report> - </reports> - </reportSet> - </reportSets> - <configuration> - <doctitle>Apache Chemistry OpenCMIS ${project.version}</doctitle> - <windowtitle>Apache Chemistry OpenCMIS ${project.version}</windowtitle> - <!-- TODO: Update this for new packages --> - <groups> - <group> - <title>OpenCMIS Client API</title> - <packages>org.apache.chemistry.opencmis.client:org.apache.chemistry.opencmis.client.api:org.apache.chemistry.opencmis.client.util</packages> - </group> - <group> - <title>OpenCMIS Commons API</title> - <packages>org.apache.chemistry.opencmis.commons:org.apache.chemistry.opencmis.commons.*</packages> - </group> - <group> - <title>OpenCMIS Bindings SPI</title> - <packages>org.apache.chemistry.opencmis.client.bindings</packages> - </group> - <group> - <title>OpenCMIS Server</title> - <packages>org.apache.chemistry.opencmis.commons.server:org.apache.chemistry.opencmis.commons.impl.server:org.apache.chemistry.opencmis.server.support:org.apache.chemistry.opencmis.server.support.wrapper:org.apache.chemistry.opencmis.server.support.query:org.apache.chemistry.opencmis.server.filter:org.apache.chemistry.opencmis.server.shared</packages> - </group> - <group> - <title>OpenCMIS Server (async)</title> - <packages>org.apache.chemistry.opencmis.server.async</packages> - </group> - <group> - <title>OpenCMIS Bridge</title> - <packages>org.apache.chemistry.opencmis.bridge*</packages> - </group> - <group> - <title>OpenCMIS TCK</title> - <packages>org.apache.chemistry.opencmis.tck*</packages> - </group> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <doctitle>Apache Chemistry OpenCMIS ${project.version}</doctitle> + <windowtitle>Apache Chemistry OpenCMIS ${project.version}</windowtitle> + + <sourcepath> + ${basedir}/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java: + ${basedir}/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java: + ${basedir}/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java: + ${basedir}/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java: + ${basedir}/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java: + ${basedir}/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java: + ${basedir}/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java: + ${basedir}/chemistry-opencmis-server/chemistry-opencmis-server-async/src/main/java: + ${basedir}/chemistry-opencmis-server/chemistry-opencmis-bridge/src/main/java: + ${basedir}/chemistry-opencmis-server/chemistry-opencmis-test-tck/src/main/java + </sourcepath> + + <groups> + <group> + <title>OpenCMIS Client API</title> + <packages>org.apache.chemistry.opencmis.client:org.apache.chemistry.opencmis.client.api:org.apache.chemistry.opencmis.client.util</packages> + </group> + <group> + <title>OpenCMIS Commons API</title> + <packages>org.apache.chemistry.opencmis.commons:org.apache.chemistry.opencmis.commons.*</packages> + </group> + <group> + <title>OpenCMIS Bindings SPI</title> + <packages>org.apache.chemistry.opencmis.client.bindings</packages> + </group> + <group> + <title>OpenCMIS Server</title> + <packages>org.apache.chemistry.opencmis.commons.server:org.apache.chemistry.opencmis.commons.impl.server:org.apache.chemistry.opencmis.server.support:org.apache.chemistry.opencmis.server.support.wrapper:org.apache.chemistry.opencmis.server.support.query:org.apache.chemistry.opencmis.server.filter:org.apache.chemistry.opencmis.server.shared</packages> + </group> + <group> + <title>OpenCMIS Server (async)</title> + <packages>org.apache.chemistry.opencmis.server.async</packages> + </group> + <group> + <title>OpenCMIS Bridge</title> + <packages>org.apache.chemistry.opencmis.bridge*</packages> + </group> + <group> + <title>OpenCMIS TCK</title> + <packages>org.apache.chemistry.opencmis.tck*</packages> + </group> </groups> - <!--<excludePackageNames>org.apache.chemistry.opencmis.commons.impl:org.apache.chemistry.opencmis.commons.impl.dataobjects:org.apache.chemistry.opencmis.client.runtime:org.apache.chemistry.opencmis.client.runtime.*:org.apache.chemistry.opencmis.commons.impl.jaxb:org.apache.chemistry.opencmis.client.bindings.impl:org.apache.chemistry.opencmis.client.bindings.cache:org.apache.chemistry.opencmis.client.bindings.spi:org.apache.chemistry.opencmis.server.impl:org.apache.chemistry.opencmis.fit:org.apache.chemistry.opencmis.util.repository:org.apache.chemistry.opencmis.fileshare:org.apache.chemistry.opencmis.fileshare:org.apache.chemistry.opencmis.inmemory:org.apache.chemistry.opencmis.fileshare:org.apache.chemistry.opencmis.jcr:org.apache.chemistry.opencmis.browser:org.apache.chemistry.opencmis.workbench:org.apache.chemistry.opencmis.commander:org.apache.chemistry.opencmis.client.osgi</excludePackageNames>--> + <sourceFileExcludes> - <exclude>**/CmisQl*</exclude> - <exclude>**/CmisQueryWalk*</exclude> - <exclude>**/TextSearch*</exclude> - <exclude>org/apache/chemistry/opencmis/commons/impl/*</exclude> - <exclude>org/apache/chemistry/opencmis/commons/impl/dataobjects/**</exclude> - <exclude>org/apache/chemistry/opencmis/commons/impl/json/**</exclude> - <exclude>org/apache/chemistry/opencmis/commons/impl/jaxb/**</exclude> - <exclude>org/apache/chemistry/opencmis/commons/impl/server/ObjectInfoImpl*</exclude> - <exclude>org/apache/chemistry/opencmis/commons/impl/server/RenditionInfoImpl*</exclude> - <exclude>org/apache/chemistry/opencmis/client/runtime/**</exclude> - <exclude>org/apache/chemistry/opencmis/client/bindings/impl/**</exclude> - <exclude>org/apache/chemistry/opencmis/client/bindings/cache/**</exclude> - <exclude>org/apache/chemistry/opencmis/client/bindings/spi/**</exclude> - <exclude>org/apache/chemistry/opencmis/server/impl/**</exclude> - <exclude>org/apache/chemistry/opencmis/server/shared/**</exclude> - <exclude>org/apache/chemistry/opencmis/server/support/filter/**</exclude> - <exclude>org/apache/chemistry/opencmis/server/async/impl/**</exclude> - <exclude>org/apache/chemistry/opencmis/fit/**</exclude> - <exclude>org/apache/chemistry/opencmis/util/**</exclude> - <exclude>org/apache/chemistry/opencmis/fileshare/**</exclude> - <exclude>org/apache/chemistry/opencmis/inmemory/**</exclude> - <exclude>org/apache/chemistry/opencmis/browser/**</exclude> - <exclude>org/apache/chemistry/opencmis/workbench/**</exclude> - <exclude>org/apache/chemistry/opencmis/commander/**</exclude> - <exclude>org/apache/chemistry/opencmis/client/osgi/**</exclude> - <exclude>org/apache/chemistry/opencmis/tools/**</exclude> + <exclude>**/CmisQl*</exclude> + <exclude>**/CmisQueryWalk*</exclude> + <exclude>**/TextSearch*</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/*</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/dataobjects/**</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/json/**</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/jaxb/**</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/server/ObjectInfoImpl*</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/server/RenditionInfoImpl*</exclude> + <exclude>org/apache/chemistry/opencmis/commons/impl/server/LinkInfoImp*</exclude> + <exclude>org/apache/chemistry/opencmis/client/runtime/**</exclude> + <exclude>org/apache/chemistry/opencmis/client/bindings/impl/**</exclude> + <exclude>org/apache/chemistry/opencmis/client/bindings/cache/**</exclude> + <exclude>org/apache/chemistry/opencmis/client/bindings/spi/**</exclude> + <exclude>org/apache/chemistry/opencmis/server/impl/**</exclude> + <exclude>org/apache/chemistry/opencmis/server/shared/**</exclude> + <exclude>org/apache/chemistry/opencmis/server/support/filter/**</exclude> + <exclude>org/apache/chemistry/opencmis/server/async/impl/**</exclude> </sourceFileExcludes> <tags> - <tag> - <name>cmis</name> - <placement>a</placement> - <head>CMIS:</head> - </tag> + <tag> + <name>cmis</name> + <placement>a</placement> + <head>CMIS:</head> + </tag> </tags> </configuration> </plugin> @@ -733,16 +738,17 @@ </plugins> </build> </profile> - <!-- Added profile to fix "doclint" (see http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete). + <!-- Added profile to fix "doclint" (see http://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete). TODO: This is a temporary solution, until we solve https://issues.apache.org/jira/browse/CMIS-977 --> + <profile> <id>disable-java8-doclint</id> <activation> <jdk>[1.8,)</jdk> </activation> <properties> - <additionalparam>-Xdoclint:none</additionalparam> + <additionalparam>-Xdoclint:accessibility -Xdoclint:html -Xdoclint:reference -Xdoclint:syntax</additionalparam> </properties> </profile> </profiles>
