Author: fmui
Date: Mon Aug 29 15:12:25 2016
New Revision: 1758242
URL: http://svn.apache.org/viewvc?rev=1758242&view=rev
Log:
JavaDoc updates
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/Cache.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionFactoryImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/Cache.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterable.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterable.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamHashImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONArray.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONAware.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONObject.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONStreamAware.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContainerFactory.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContentHandler.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParseException.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParser.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/Yytoken.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/ObjectGenerator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/fractal/FractalGenerator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/loremipsum/LoremIpsum.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java
chemistry/opencmis/trunk/pom.xml
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
Mon Aug 29 15:12:25 2016
@@ -137,10 +137,6 @@ public class AtomEntryWriter {
/**
* Writes the entry to an output stream.
- *
- * @throws IOException
- * @throws IllegalStateException
- * @throws IllegalArgumentException
*/
public void write(OutputStream out) throws IOException {
XmlSerializer writer = XMLUtils.createWriter(out);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/Cache.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/Cache.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/Cache.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/Cache.java
Mon Aug 29 15:12:25 2016
@@ -26,13 +26,12 @@ import java.io.Serializable;
* <p>
* Each level of the hierarchy could use a different caching strategy. The
cache
* is initialize by defining the classes that handle the caching for one level.
- * These classes must implement the {@link CacheLevel} interface.<br/>
- * <br/>
+ * These classes must implement the {@link CacheLevel} interface.<br>
+ * <br>
* Level configuration string format: "
- * <code><class name> [param1=value1,param2=value2,...]</code>".<br/>
+ * {@code <class name> [param1=value1,param2=value2,...]}".<br>
* For example:
- * <code>org.apache.opencmis.client.bindings.cache.impl.MapCacheLevelImpl
capacity=10</code>
- * <br/>
+ * {@code org.apache.opencmis.client.bindings.cache.impl.MapCacheLevelImpl
capacity=10}
* </p>
*
* @see CacheLevel
@@ -62,8 +61,8 @@ public interface Cache extends Serializa
*
* @param keys
* the keys
- * @return the object or
- * <code>null</code> if the branch or leaf doesn't exist
+ * @return the object or <code>null</code> if the branch or leaf doesn't
+ * exist
*/
Object get(String... keys);
@@ -79,7 +78,7 @@ public interface Cache extends Serializa
* Removes all entries from the cache.
*/
void removeAll();
-
+
/**
* Checks if a given key is in the cache.
*
@@ -87,7 +86,7 @@ public interface Cache extends Serializa
* the keys of the branch or leaf
*
* @return the index of the first key part that is not in the cache or
- * <code>keys.length</code> if the object is in the cache
+ * {@code keys.length} if the object is in the cache
*/
int check(String... keys);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/NTLMAuthenticationProvider.java
Mon Aug 29 15:12:25 2016
@@ -28,13 +28,17 @@ import org.w3c.dom.Element;
/**
* NTLM authentication provider class. USE WITH CARE!
*
+ * <p>
* This authentication provider sets a {@link java.net.Authenticator} which
will
* replace the current authenticator, if any. It will fail if this
authenticator
* will be replaced by another part of the code.
+ * </p>
*
+ * <p>
* Since {@link java.net.Authenticator} is a system-wide authenticator, it will
* not reliably work in multi-user environments! To achieve that you have to
* wrap OpenCMIS into its own class loader.
+ * </p>
*/
public class NTLMAuthenticationProvider extends AbstractAuthenticationProvider
{
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.java
Mon Aug 29 15:12:25 2016
@@ -58,9 +58,10 @@ import org.slf4j.LoggerFactory;
* Configuration with authorization code:
*
* <pre>
+ * {@code
* SessionFactory factory = ...
*
- * Map<String, String> parameter = new HashMap<String, String>();
+ * Map<String, String> parameter = new HashMap<String, String>();
*
* parameter.put(SessionParameter.ATOMPUB_URL, "http://localhost/cmis/atom";);
* parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
@@ -76,15 +77,17 @@ import org.slf4j.LoggerFactory;
*
* ...
* Session session = factory.createSession(parameter);
+ * }
* </pre>
*
* <p>
* Configuration with existing bearer token:
*
* <pre>
+ * {@code
* SessionFactory factory = ...
*
- * Map<String, String> parameter = new HashMap<String, String>();
+ * Map<String, String> parameter = new HashMap<String, String>();
*
* parameter.put(SessionParameter.ATOMPUB_URL, "http://localhost/cmis/atom";);
* parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
@@ -102,14 +105,15 @@ import org.slf4j.LoggerFactory;
*
* ...
* Session session = factory.createSession(parameter);
+ * }
* </pre>
*
* <p>
* Getting tokens at runtime:
*
* <pre>
- * OAuthAuthenticationProvider authProvider = (OAuthAuthenticationProvider)
session.getBinding()
- * .getAuthenticationProvider();
+ * {@code
+ * OAuthAuthenticationProvider authProvider = (OAuthAuthenticationProvider)
session.getBinding().getAuthenticationProvider();
*
* // get the current token
* Token token = authProvider.getToken();
@@ -120,27 +124,30 @@ import org.slf4j.LoggerFactory;
* // do something with the new token
* }
* });
+ * }
* </pre>
*
* <p>
* OAuth errors can be handled like this:
*
* <pre>
- * try {
+ * {@code
+ * try {
+ * ...
+ * // CMIS calls
* ...
- * // CMIS calls
- * ...
- * } catch (CmisConnectionException connEx) {
- * if (connEx.getCause() instanceof CmisOAuthException) {
- * CmisOAuthException oauthEx = (CmisOAuthException)
connEx.getCause();
- *
- * if
(CmisOAuthException.ERROR_INVALID_GRANT.equals(oauthEx.getError()) ||
- *
CmisOAuthException.ERROR_INVALID_TOKEN.equals(oauthEx.getError())) {
- * // ask the user to authenticate again
- * } else {
- * // a configuration or server problem
- * }
- * }
+ * } catch (CmisConnectionException connEx) {
+ * if (connEx.getCause() instanceof CmisOAuthException) {
+ * CmisOAuthException oauthEx = (CmisOAuthException) connEx.getCause();
+ *
+ * if
(CmisOAuthException.ERROR_INVALID_GRANT.equals(oauthEx.getError()) ||
+ *
CmisOAuthException.ERROR_INVALID_TOKEN.equals(oauthEx.getError())) {
+ * // ask the user to authenticate again
+ * } else {
+ * // a configuration or server problem
+ * }
+ * }
+ * }
* }
* </pre>
*/
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
Mon Aug 29 15:12:25 2016
@@ -231,7 +231,7 @@ public class StandardAuthenticationProvi
}
/**
- * Adds the {@link SessionParameter.HEADER} to the fixed headers. This
+ * Adds the {@link SessionParameter#HEADER} to the fixed headers. This
* method should only be called from the {@link
#setSession(BindingSession)}
* method to avoid threading issues.
*/
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomEntryWriter.java
Mon Aug 29 15:12:25 2016
@@ -137,8 +137,6 @@ public class AtomEntryWriter {
/**
* Writes the entry to an output stream.
- *
- * @throws XMLStreamException
*/
public void write(OutputStream out) throws XMLStreamException, IOException
{
XMLStreamWriter writer = XMLUtils.createWriter(out);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
Mon Aug 29 15:12:25 2016
@@ -22,7 +22,6 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.cookies;
-import java.io.IOException;
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
@@ -70,11 +69,11 @@ public class CmisCookieManager implement
}
/**
- * Searchs and gets all cookies in the cache by the specified uri in the
+ * Searches and gets all cookies in the cache by the specified URL in the
* request header.
*
- * @param uri
- * the specified uri to search for
+ * @param url
+ * the specified URL to search for
* @param requestHeaders
* a list of request headers
* @return a map that record all such cookies, the map is unchangeable
@@ -141,14 +140,12 @@ public class CmisCookieManager implement
}
/**
- * Sets cookies according to uri and responseHeaders
+ * Sets cookies according to URL and responseHeaders
*
- * @param uri
- * the specified uri
+ * @param url
+ * the specified URL
* @param responseHeaders
* a list of request headers
- * @throws IOException
- * if some error of I/O operation occurs
*/
public void put(String url, Map<String, List<String>> responseHeaders) {
if (url == null || responseHeaders == null) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionFactoryImpl.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionFactoryImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionFactoryImpl.java
Mon Aug 29 15:12:25 2016
@@ -39,19 +39,22 @@ import org.apache.chemistry.opencmis.com
/**
* Default implementation of a session factory. Used by unit tests or
* applications that depend directly on runtime implementation.
- * <p>
- * <code>
+ *
+ * <pre>
+ * {@code
* SessionFactory sf = new SessionFactoryImpl();<br>
* Session s = sf.createSession(...);
- * </code>
+ * }
+ * </pre>
* <p>
* Alternative factory lookup methods:
- * <p>
- * <p>
- * <code>
- * Context ctx = new DefaultContext();<br>
+ *
+ * <pre>
+ * {@code
+ * Context ctx = new DefaultContext();<
* SessionFactory sf = ctx.lookup(jndi_key);
- * </code>
+ * }
+ * </pre>
*/
public class SessionFactoryImpl implements SessionFactory, Serializable {
@@ -106,9 +109,9 @@ public class SessionFactoryImpl implemen
/**
* Returns all repositories that are available at the endpoint. See
- * {@link #createSession(Map, ObjectFactory, AuthenticationProvider,
Cache)}
+ * {@link #createSession(Map, ObjectFactory, AuthenticationProvider,
Cache, TypeDefinitionCache)}
* for parameter details. The parameter
- * {@code SessionParameter.REPOSITORY_ID} should not be set.
+ * {@code SessionParameter#REPOSITORY_ID} should not be set.
*/
public List<Repository> getRepositories(Map<String, String> parameters,
ObjectFactory objectFactory,
AuthenticationProvider authenticationProvider, Cache cache,
TypeDefinitionCache typeDefCache) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/Cache.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/Cache.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/Cache.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/cache/Cache.java
Mon Aug 29 15:12:25 2016
@@ -26,7 +26,6 @@ import org.apache.chemistry.opencmis.cli
/**
* Implements a session cache providing following capabilities:
- * <p>
* <ul>
* <li>access CmisObject by object object ID</li>
* <li>access CmisObject by object path</li>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java
Mon Aug 29 15:12:25 2016
@@ -24,9 +24,10 @@ import java.util.List;
import
org.apache.chemistry.opencmis.client.runtime.util.AbstractPageFetcher.Page;
/**
- * Abstract <code>Iterator</code> implementation.
+ * Abstract {@code Iterator} implementation.
*
- * @param <T> the type returned by the iterator
+ * @param <T>
+ * the type returned by the iterator
*/
public abstract class AbstractIterator<T> implements Iterator<T> {
@@ -39,10 +40,7 @@ public abstract class AbstractIterator<T
private Boolean hasMoreItems;
/**
- * Construct
- *
- * @param skipCount
- * @param pageFetcher
+ * Constructor.
*/
protected AbstractIterator(long skipCount, AbstractPageFetcher<T>
pageFetcher) {
this.skipCount = skipCount;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterable.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterable.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterable.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterable.java
Mon Aug 29 15:12:25 2016
@@ -18,7 +18,6 @@
*/
package org.apache.chemistry.opencmis.client.runtime.util;
-
/**
* CMIS Collection Iterable.
*/
@@ -26,8 +25,6 @@ public class CollectionIterable<T> exten
/**
* Constructor.
- *
- * @param pageFetcher
*/
public CollectionIterable(AbstractPageFetcher<T> pageFetcher) {
this(0, pageFetcher);
@@ -35,9 +32,6 @@ public class CollectionIterable<T> exten
/**
* Constructor.
- *
- * @param position
- * @param pageFetcher
*/
protected CollectionIterable(long position, AbstractPageFetcher<T>
pageFetcher) {
super(position, pageFetcher);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterator.java
Mon Aug 29 15:12:25 2016
@@ -30,10 +30,7 @@ import org.apache.chemistry.opencmis.cli
public class CollectionIterator<T> extends AbstractIterator<T> {
/**
- * Construct
- *
- * @param skipCount
- * @param pageFetcher
+ * Constructor.
*/
public CollectionIterator(long skipCount, AbstractPageFetcher<T>
pageFetcher) {
super(skipCount, pageFetcher);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterable.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterable.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterable.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterable.java
Mon Aug 29 15:12:25 2016
@@ -27,8 +27,6 @@ public class CollectionPageIterable<T> e
/**
* Constructor.
- *
- * @param pageFetcher
*/
public CollectionPageIterable(AbstractPageFetcher<T> pageFetcher) {
this(0, pageFetcher);
@@ -36,9 +34,6 @@ public class CollectionPageIterable<T> e
/**
* Constructor.
- *
- * @param position
- * @param pageFetcher
*/
protected CollectionPageIterable(long position, AbstractPageFetcher<T>
pageFetcher) {
super(position, pageFetcher);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionPageIterator.java
Mon Aug 29 15:12:25 2016
@@ -30,10 +30,7 @@ import org.apache.chemistry.opencmis.cli
public class CollectionPageIterator<T> extends AbstractIterator<T> {
/**
- * Construct
- *
- * @param skipCount
- * @param pageFetcher
+ * Constructor.
*/
public CollectionPageIterator(long skipCount, AbstractPageFetcher<T>
pageFetcher) {
super(skipCount, pageFetcher);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Base64.java
Mon Aug 29 15:12:25 2016
@@ -1629,7 +1629,7 @@ public final class Base64 {
* <pre>
* ENCODE or DECODE: Encode or Decode as data is read.
* DO_BREAK_LINES: break lines at 76 characters
- * (only meaningful when encoding)</i>
+ * <i>(only meaningful when encoding)</i>
* </pre>
* <p>
* Example: <code>new Base64.InputStream( in, Base64.DECODE )</code>
@@ -1839,7 +1839,7 @@ public final class Base64 {
* <pre>
* ENCODE or DECODE: Encode or Decode as data is read.
* DO_BREAK_LINES: don't break lines at 76 characters
- * (only meaningful when encoding)</i>
+ * <i>(only meaningful when encoding)</i>
* </pre>
* <p>
* Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamHashImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamHashImpl.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamHashImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamHashImpl.java
Mon Aug 29 15:12:25 2016
@@ -73,7 +73,7 @@ public class ContentStreamHashImpl imple
*
* @param algorithm
* the algorithm
- * @param hash
+ * @param hashStr
* the hash value
*/
public ContentStreamHashImpl(String algorithm, String hashStr) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONArray.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONArray.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONArray.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONArray.java
Mon Aug 29 15:12:25 2016
@@ -26,10 +26,10 @@ import java.util.List;
/**
* A JSON array. JSONObject supports java.util.List interface.
*
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public class JSONArray extends ArrayList<Object> implements List<Object>,
JSONAware, JSONStreamAware {
private static final long serialVersionUID = 3957988303675231981L;
@@ -39,7 +39,8 @@ public class JSONArray extends ArrayList
* JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific
* behaviours will be ignored at this top level.
*
- * @see org.json.simple.JSONValue#writeJSONString(Object, Writer)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.JSONValue#writeJSONString(Object,
+ * Writer)
*
* @param list
* @param out
@@ -80,7 +81,7 @@ public class JSONArray extends ArrayList
* also a JSONAware, JSONAware specific behaviours will be omitted at this
* top level.
*
- * @see org.json.simple.JSONValue#toJSONString(Object)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.JSONValue#toJSONString(Object)
*
* @param list
* @return JSON text, or "null" if list is null.
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONAware.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONAware.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONAware.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONAware.java
Mon Aug 29 15:12:25 2016
@@ -22,10 +22,10 @@ package org.apache.chemistry.opencmis.co
* Beans that support customized output of JSON text shall implement this
* interface.
*
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public interface JSONAware {
/**
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONObject.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONObject.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONObject.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONObject.java
Mon Aug 29 15:12:25 2016
@@ -27,10 +27,10 @@ import java.util.Map;
* A JSON object. Key value pairs are order by insertion. JSONObject supports
* java.util.Map interface.
*
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public class JSONObject extends LinkedHashMap<String, Object> implements
Map<String, Object>, JSONAware,
JSONStreamAware {
@@ -51,7 +51,7 @@ public class JSONObject extends LinkedHa
* JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific
* behaviours will be ignored at this top level.
*
- * @see org.json.simple.JSONValue#writeJSONString(Object, Writer)
+ * @see JSONValue#writeJSONString(Object, Writer)
*
* @param map
* @param out
@@ -95,7 +95,7 @@ public class JSONObject extends LinkedHa
* also a JSONAware, JSONAware specific behaviours will be omitted at this
* top level.
*
- * @see org.json.simple.JSONValue#toJSONString(Object)
+ * @see JSONValue#toJSONString(Object)
*
* @param map
* @return JSON text, or "null" if map is null.
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONStreamAware.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONStreamAware.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONStreamAware.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONStreamAware.java
Mon Aug 29 15:12:25 2016
@@ -25,10 +25,10 @@ import java.io.Writer;
* Beans that support customized output of JSON text to a writer shall
implement
* this interface.
*
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public interface JSONStreamAware {
/**
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java
Mon Aug 29 15:12:25 2016
@@ -30,10 +30,10 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.json.parser.JSONParser;
/**
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public final class JSONValue {
@@ -44,13 +44,12 @@ public final class JSONValue {
* Parse JSON text into java object from the input source. Please use
* parseWithException() if you don't want to ignore the exception.
*
- * @see org.json.simple.parser.JSONParser#parse(Reader)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.parser.JSONParser#parse(Reader)
* @see #parseWithException(Reader)
*
* @param in
- * @return Instance of the following: org.json.simple.JSONObject,
- * org.json.simple.JSONArray, java.lang.String, java.lang.Number,
- * java.lang.Boolean, null
+ * @return Instance of the following: JSONObject, JSONArray,
+ * java.lang.String, java.lang.Number, java.lang.Boolean, null
*
*/
public static Object parse(Reader in) {
@@ -70,15 +69,11 @@ public final class JSONValue {
/**
* Parse JSON text into java object from the input source.
*
- * @see org.json.simple.parser.JSONParser
+ * @see org.apache.chemistry.opencmis.commons.impl.json.parser.JSONParser
*
* @param in
- * @return Instance of the following: org.json.simple.JSONObject,
- * org.json.simple.JSONArray, java.lang.String, java.lang.Number,
- * java.lang.Boolean, null
- *
- * @throws IOException
- * @throws JSONParseException
+ * @return Instance of the following: JSONObject, JSONArray,
+ * java.lang.String, java.lang.Number, java.lang.Boolean, null
*/
public static Object parseWithException(Reader in) throws IOException,
JSONParseException {
JSONParser parser = new JSONParser();
@@ -101,11 +96,13 @@ public final class JSONValue {
* first parameter, use JSONObject.writeJSONString(Map, Writer) or
* JSONArray.writeJSONString(List, Writer) instead.
*
- * @see org.json.simple.JSONObject#writeJSONString(Map, Writer)
- * @see org.json.simple.JSONArray#writeJSONString(List, Writer)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.JSONObject#writeJSONString(Map,
+ * Writer)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.JSONArray#writeJSONString(List,
+ * Writer)
*
* @param value
- * @param writer
+ * @param out
*/
@SuppressWarnings("unchecked")
public static void writeJSONString(Object value, Writer out) throws
IOException {
@@ -187,8 +184,8 @@ public final class JSONValue {
* both JSONAware and Map or List with "this" as the parameter, use
* JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead.
*
- * @see org.json.simple.JSONObject#toJSONString(Map)
- * @see org.json.simple.JSONArray#toJSONString(List)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.JSONObject#toJSONString(Map)
+ * @see
org.apache.chemistry.opencmis.commons.impl.json.JSONArray#toJSONString(List)
*
* @param value
* @return JSON text, or "null" if value is null or it's an NaN or an INF
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContainerFactory.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContainerFactory.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContainerFactory.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContainerFactory.java
Mon Aug 29 15:12:25 2016
@@ -24,12 +24,12 @@ import java.util.Map;
/**
* Container factory for creating containers for JSON object and JSON array.
*
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
* @see JSONParser#parse(java.io.Reader, ContainerFactory)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public interface ContainerFactory {
/**
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContentHandler.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContentHandler.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContentHandler.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/ContentHandler.java
Mon Aug 29 15:12:25 2016
@@ -24,13 +24,13 @@ import java.io.IOException;
* A simplified and stoppable SAX-like content handler for stream processing of
* JSON text.
*
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
* @see org.xml.sax.ContentHandler
* @see JSONParser#parse(java.io.Reader, ContentHandler, boolean)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public interface ContentHandler {
/**
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParseException.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParseException.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParseException.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParseException.java
Mon Aug 29 15:12:25 2016
@@ -94,7 +94,7 @@ public class JSONParseException extends
}
/**
- * @see org.json.simple.parser.JSONParser#getPosition()
+ * @see JSONParser#getPosition()
*
* @return The character position (starting with 0) of the input where the
* error occurs.
@@ -108,12 +108,11 @@ public class JSONParseException extends
}
/**
- * @see org.json.simple.parser.Yytoken
+ * @see Yytoken
*
* @return One of the following base on the value of errorType:
* ERROR_UNEXPECTED_CHAR java.lang.Character ERROR_UNEXPECTED_TOKEN
- * org.json.simple.parser.Yytoken ERROR_UNEXPECTED_EXCEPTION
- * java.lang.Exception
+ * Yytoken ERROR_UNEXPECTED_EXCEPTION java.lang.Exception
*/
public Object getUnexpectedObject() {
return unexpectedObject;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParser.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParser.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParser.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/JSONParser.java
Mon Aug 29 15:12:25 2016
@@ -77,9 +77,7 @@ public class JSONParser {
* Reset the parser to the initial state with a new character reader.
*
* @param in
- * - The new character reader.
- * @throws IOException
- * @throws JSONParseException
+ * the new character reader
*/
public void reset(Reader in) {
lexer.yyreset(in);
@@ -118,14 +116,10 @@ public class JSONParser {
*
* @param in
* @param containerFactory
- * - Use this factory to createyour own JSON object and JSON
+ * - Use this factory to create your own JSON object and JSON
* array containers.
- * @return Instance of the following: org.json.simple.JSONObject,
- * org.json.simple.JSONArray, java.lang.String, java.lang.Number,
- * java.lang.Boolean, null
- *
- * @throws IOException
- * @throws JSONParseException
+ * @return Instance of the following: JSONObject, JSONArray,
+ * java.lang.String, java.lang.Number, java.lang.Boolean, null
*/
@SuppressWarnings("unchecked")
public Object parse(Reader in, ContainerFactory containerFactory) throws
IOException, JSONParseException {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/Yytoken.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/Yytoken.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/Yytoken.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/parser/Yytoken.java
Mon Aug 29 15:12:25 2016
@@ -19,10 +19,10 @@
package org.apache.chemistry.opencmis.commons.impl.json.parser;
/**
- * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
- * for OpenCMIS.)
+ * (Taken from JSON.simple <http://code.google.com/p/json-simple/> and
+ * modified for OpenCMIS.)
*
- * @author FangYidong<[email protected]>
+ * @author FangYidong<[email protected]>
*/
public class Yytoken {
public static final int TYPE_VALUE = 0;// JSON primitive value:
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStream.java
Mon Aug 29 15:12:25 2016
@@ -46,8 +46,8 @@ import org.slf4j.LoggerFactory;
* file.
*
* It it is important to close this OutputStream before
- * {@link #getInputStream()} is called or call {@link #destroy()} if the
- * InputStream isn't required!
+ * {@link #getInputStream()} is called or call {@link #destroy(Throwable)} if
+ * the InputStream isn't required!
*/
public class ThresholdOutputStream extends TempStoreOutputStream {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/NameValidator.java
Mon Aug 29 15:12:25 2016
@@ -31,7 +31,7 @@ public final class NameValidator {
}
/**
- * check whether id contains only valid characters Allowed are 'a'..'z',
+ * Checks whether id contains only valid characters Allowed are 'a'..'z',
* 'A'..'Z', '0'..'9', '.', '-', ' ', '_'.
*
* @param s
@@ -58,8 +58,9 @@ public final class NameValidator {
}
/**
- * check whether id contains only valid characters. Not allowed are '/',
- * '\\', ':', '\"', '*'. '?', '<','>', '|'"
+ * Checks whether id contains only valid characters.
+ *
+ * Not allowed are '/', '\\', ':', '\"', '*'. '?', '<','>', '|'"
*
* @param s
* string to verify
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManagerImpl.java
Mon Aug 29 15:12:25 2016
@@ -50,25 +50,11 @@ public class TypeManagerImpl implements
*/
private final Map<String, TypeDefinitionContainer> fTypesMap = new
HashMap<String, TypeDefinitionContainer>();
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.chemistry.opencmis.inmemory.TypeManager#getTypeById(java.lang
- * .String)
- */
@Override
public TypeDefinitionContainer getTypeById(String typeId) {
return fTypesMap.get(typeId);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.chemistry.opencmis.inmemory.TypeManager#getTypeByQueryName
- * (java.lang.String)
- */
@Override
public TypeDefinition getTypeByQueryName(String typeQueryName) {
for (Entry<String, TypeDefinitionContainer> entry :
fTypesMap.entrySet()) {
@@ -79,23 +65,11 @@ public class TypeManagerImpl implements
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.chemistry.opencmis.inmemory.TypeManager#getTypeDefinitionList
- * ()
- */
@Override
public Collection<TypeDefinitionContainer> getTypeDefinitionList() {
return Collections.unmodifiableCollection(fTypesMap.values());
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.chemistry.opencmis.inmemory.TypeManager#getRootTypes()
- */
@Override
public List<TypeDefinitionContainer> getRootTypes() {
// just take first repository
@@ -137,14 +111,6 @@ public class TypeManagerImpl implements
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.chemistry.opencmis.inmemory.storedobj.api.TypeManagerCreatable
- * #addTypeDefinition(org.apache.chemistry.opencmis.commons.definitions.
- * TypeDefinition, boolean)
- */
@Override
public void addTypeDefinition(TypeDefinition cmisType, boolean
addInheritedProperties) {
@@ -168,26 +134,11 @@ public class TypeManagerImpl implements
fTypesMap.put(cmisType.getId(), typeContainer);
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.chemistry.opencmis.inmemory.storedobj.api.TypeManagerCreatable
- * #updateTypeDefinition(org.apache.chemistry.opencmis.commons.definitions.
- * TypeDefinition)
- */
@Override
public void updateTypeDefinition(TypeDefinition typeDefinition) {
throw new CmisNotSupportedException("updating a type definition is not
supported.");
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.chemistry.opencmis.inmemory.storedobj.api.TypeManagerCreatable
- * #deleteTypeDefinition(java.lang.String)
- */
@Override
public void deleteTypeDefinition(String typeId) {
TypeDefinitionContainer typeDef = fTypesMap.remove(typeId);
@@ -198,25 +149,15 @@ public class TypeManagerImpl implements
}
/**
- * Remove all types from the type system. After this call only the default
+ * Removes all types from the type system. After this call only the default
* CMIS types are present in the type system. Use this method with care,
its
- * mainly intended for unit tests
- *
- * @param repositoryId
+ * mainly intended for unit tests.
*/
public void clearTypeSystem() {
fTypesMap.clear();
createCmisDefaultTypes();
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.chemistry.opencmis.inmemory.TypeManager#getPropertyIdForQueryName
- * (org.apache.chemistry.opencmis.commons.definitions.TypeDefinition,
- * java.lang.String)
- */
@Override
public String getPropertyIdForQueryName(TypeDefinition typeDefinition,
String propQueryName) {
for (PropertyDefinition<?> pd :
typeDefinition.getPropertyDefinitions().values()) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/ObjectGenerator.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/ObjectGenerator.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/ObjectGenerator.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/ObjectGenerator.java
Mon Aug 29 15:12:25 2016
@@ -38,7 +38,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.data.ObjectInFolderList;
import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.commons.data.PropertyData;
-import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionList;
import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
@@ -219,13 +218,8 @@ public class ObjectGenerator {
}
/**
- * retrieve the index-th folder from given level of the hierarchy starting
- * at rootId
- *
- * @param rootId
- * @param level
- * @param index
- * @return
+ * Retrieves the index-th folder from given level of the hierarchy starting
+ * at rootId.
*/
public String getFolderId(String rootId, int level, int index) {
String objectId = rootId;
@@ -244,13 +238,12 @@ public class ObjectGenerator {
}
/**
- * retrieve the index-th document from given folder
+ * Retrieves the index-th document from given folder.
*
* @param folderId
* folder to retrieve document from
* @param index
* index of document to retrieve from this folder
- * @return
*/
public String getDocumentId(String folderId, int index) {
String docId = null;
@@ -276,25 +269,21 @@ public class ObjectGenerator {
}
/**
- * return the total number of documents created
- *
- * @return
+ * Returns the total number of documents created.
*/
public int getDocumentsInTotal() {
return fDocumentsInTotalCount;
}
/**
- * return the total number of folders created
- *
- * @return
+ * Returns the total number of folders created.
*/
public int getFoldersInTotal() {
return fFoldersInTotalCount;
}
/**
- * return the total number of objects created
+ * Returns the total number of objects created.
*/
public int getObjectsInTotal() {
return fDocumentsInTotalCount + fFoldersInTotalCount;
@@ -363,7 +352,7 @@ public class ObjectGenerator {
Properties props = createFolderProperties(i, level);
id = fObjSvc.createFolder(fRepositoryId, props, parentId, null,
null, null, null);
if (level == 0) {
- fTopLevelFoldersCreated.add(id);
+ fTopLevelFoldersCreated.add(id);
}
if (id != null) {
@@ -416,8 +405,8 @@ public class ObjectGenerator {
}
}
- id = fObjSvc.createDocument(fRepositoryId, props, folderId,
contentStream, versioningState, policies,
- addACEs, removeACEs, extension);
+ id = fObjSvc.createDocument(fRepositoryId, props, folderId,
contentStream, versioningState, policies, addACEs,
+ removeACEs, extension);
if (null == id) {
LOG.error("createDocument failed.");
@@ -435,12 +424,12 @@ public class ObjectGenerator {
// delete recursively all folders from first level
for (String id : fTopLevelFoldersCreated) {
- fObjSvc.deleteTree(fRepositoryId, id, true,
UnfileObject.DELETE, true, null);
+ fObjSvc.deleteTree(fRepositoryId, id, true, UnfileObject.DELETE,
true, null);
}
}
private void deleteObject(String objectId) {
- fObjSvc.deleteObject(fRepositoryId, objectId, true, null);
+ fObjSvc.deleteObject(fRepositoryId, objectId, true, null);
}
public ContentStream createContentLoremIpsumHtml() {
@@ -659,9 +648,9 @@ public class ObjectGenerator {
}
public void createTypes(TypeDefinitionList typeDefList) {
- for (TypeDefinition td : typeDefList.getList()) {
- // TODO: enable this if available!
- // fRepSvc.createTypeDefinition(fRepositoryId, td);
- }
+ // for (TypeDefinition td : typeDefList.getList()) {
+ // TODO: enable this if available!
+ // fRepSvc.createTypeDefinition(fRepositoryId, td);
+ // }
}
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/fractal/FractalGenerator.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/fractal/FractalGenerator.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/fractal/FractalGenerator.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/fractal/FractalGenerator.java
Mon Aug 29 15:12:25 2016
@@ -146,14 +146,13 @@ public class FractalGenerator {
}
/**
- * Create a fractal image as JPEG in memory and return it
+ * Creates a fractal image as JPEG in memory and return it.
*
* @param rect
* rectangle of mandelbrot or julia set
* @param juliaPoint
* point in Julia set or null
* @return byte array with JPEG stream
- * @throws IOException
*/
public ByteArrayOutputStream genFractal(ComplexRectangle rect,
ComplexPoint juliaPoint) throws IOException {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/loremipsum/LoremIpsum.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/loremipsum/LoremIpsum.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/loremipsum/LoremIpsum.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/content/loremipsum/LoremIpsum.java
Mon Aug 29 15:12:25 2016
@@ -31,9 +31,9 @@ import java.util.Set;
/**
* A generator of lorem ipsum text ported from the Python implementation at
- * http://code.google.com/p/lorem-ipsum-generator/. Note: original code
licensed
- * under the BSD license
+ * http://code.google.com/p/lorem-ipsum-generator/.
*
+ * Note: Original code licensed under the BSD license
*/
public class LoremIpsum {
@@ -73,7 +73,6 @@ public class LoremIpsum {
* Delimiters that end sentences.
*
* @type {Array.<string>}
- * @private
*/
private static final String DELIMITERS_SENTENCES[] = { ".", "?", "!" };
@@ -81,7 +80,6 @@ public class LoremIpsum {
* Regular expression for splitting a text into sentences.
*
* @type {RegExp}
- * @private
*/
private static final String SENTENCE_SPLIT_REGEX = "[\\.\\?\\!]";
@@ -89,15 +87,11 @@ public class LoremIpsum {
* Delimiters that end words.
*
* @type {Array.<string>}
- * @private
*/
private static final String DELIMITERS_WORDS[] = { ".", ",", "?", "!" };
/**
* Regular expression for splitting text into words.
- *
- * @type {RegExp}
- * @private
*/
private static final String WORD_SPLIT_REGEX = "\\s";
@@ -106,9 +100,6 @@ public class LoremIpsum {
/**
* Words that can be used in the generated output. Maps a word-length to a
* list of words of that length.
- *
- * @type {goog.structs.Map}
- * @private
*/
private Map<Integer, List<String>> words;
@@ -116,40 +107,27 @@ public class LoremIpsum {
* Chains of three words that appear in the sample text Maps a pair of
* word-lengths to a third word-length and an optional piece of trailing
* punctuation (for example, a period, comma, etc.).
- *
- * @type {goog.structs.Map}
- * @private
*/
private Map<WordLengthPair, List<WordInfo>> chains;
/**
* Pairs of word-lengths that can appear at the beginning of sentences.
- *
- * @type {Array}
*/
private List<WordLengthPair> starts;
/**
* Average sentence length in words.
- *
- * @type {number}
- * @private
*/
+
private double sentenceMean;
/**
* Sigma (sqrt of Objectiance) for the sentence length in words.
- *
- * @type {number}
- * @private
*/
private double sentenceSigma;
/**
* Average paragraph length in sentences.
- *
- * @type {number}
- * @private
*/
private double paragraphMean;
@@ -157,7 +135,6 @@ public class LoremIpsum {
* Sigma (sqrt of variance) for the paragraph length in sentences.
*
* @type {number}
- * @private
*/
private double paragraphSigma;
@@ -178,8 +155,9 @@ public class LoremIpsum {
/**
* Picks a random element of the array.
*
- * @param {Array} array The array to pick from.
- * @return {*} An element from the array.
+ * @param array
+ * the array to pick from
+ * @return an element from the array
*/
private WordInfo randomChoice(WordInfo[] array) {
return array[randomInt(array.length)];
@@ -203,8 +181,6 @@ public class LoremIpsum {
/**
* Generates random strings of "lorem ipsum" text, based on the word
* distribution of a sample text, using the words in a dictionary.
- *
- * @constructor
*/
public LoremIpsum() {
generateChains(this.sample);
@@ -243,9 +219,10 @@ public class LoremIpsum {
/**
* Generates a single lorem ipsum paragraph, of random length.
*
- * @param {boolean} optStartWithLorem Whether to start the sentence with
the
- * standard "Lorem ipsum..." first sentence.
- * @return {string} The generated sentence.
+ * @param optStartWithLorem
+ * Whether to start the sentence with the standard
+ * "Lorem ipsum..." first sentence
+ * @return the generated sentence
*/
public String generateParagraph(boolean optStartWithLorem) {
// The length of the paragraph is a normally distributed random
@@ -274,9 +251,10 @@ public class LoremIpsum {
/**
* Generates a single sentence, of random length.
*
- * @param {boolean} optStartWithLorem Whether to start the setnence with
the
- * standard "Lorem ipsum..." first sentence.
- * @return {string} The generated sentence.
+ * @param optStartWithLorem
+ * Whether to start the sentence with the standard
+ * "Lorem ipsum..." first sentence.
+ * @return the generated sentence
*/
public String generateSentence(boolean optStartWithLorem) {
if (this.chains.size() == 0 || this.starts.size() == 0) {
@@ -463,8 +441,8 @@ public class LoremIpsum {
/**
* Generates the chains and starts values required for sentence generation.
*
- * @param {string} sample The same text.
- * @private
+ * @param sample
+ * The same text.
*/
private void generateChains(String sample) {
@@ -507,8 +485,8 @@ public class LoremIpsum {
* Calculates the mean and standard deviation of sentence and paragraph
* lengths.
*
- * @param {string} sample The same text.
- * @private
+ * @param sample
+ * The same text.
*/
private void generateStatistics(String sample) {
this.generateSentenceStatistics(sample);
@@ -519,8 +497,8 @@ public class LoremIpsum {
* Calculates the mean and standard deviation of the lengths of sentences
* (in words) in a sample text.
*
- * @param {string} sample The same text.
- * @private
+ * @param sample
+ * The same text.
*/
private void generateSentenceStatistics(String sample) {
List<String> sentences =
filterNotEmptyOrWhiteSpace(splitSentences(sample));
@@ -537,8 +515,8 @@ public class LoremIpsum {
* Calculates the mean and standard deviation of the lengths of paragraphs
* (in sentences) in a sample text.
*
- * @param {string} sample The same text.
- * @private
+ * @param sample
+ * The same text.
*/
private void generateParagraphStatistics(String sample) {
List<String> paragraphs =
filterNotEmptyOrWhiteSpace(splitParagraphs(sample));
@@ -557,7 +535,8 @@ public class LoremIpsum {
* Sets the generator to use a given selection of words for generating
* sentences with.
*
- * @param {string} dictionary The dictionary to use.
+ * @param dictionary
+ * The dictionary to use.
*/
private void initializeDictionary(String dictionary) {
String[] dictionaryWords = splitWords(dictionary);
@@ -586,7 +565,6 @@ public class LoremIpsum {
* Picks a random starting chain.
*
* @return {string} The starting key.
- * @private
*/
private WordLengthPair chooseRandomStart_() {
Set<WordLengthPair> keys = chains.keySet();
@@ -600,9 +578,9 @@ public class LoremIpsum {
/**
* Splits a piece of text into paragraphs.
*
- * @param {string} text The text to split.
- * @return {Array.<string>} An array of paragraphs.
- * @private
+ * @param text
+ * The text to split.
+ * @return An array of paragraphs.
*/
static String[] splitParagraphs(String text) {
@@ -612,9 +590,9 @@ public class LoremIpsum {
/**
* Splits a piece of text into sentences.
*
- * @param {string} text The text to split.
- * @return {Array.<string>} An array of sentences.
- * @private
+ * @param text
+ * The text to split.
+ * @return An array of sentences.
*/
static String[] splitSentences(String text) {
return
filterNotEmptyOrWhiteSpace(text.split(SENTENCE_SPLIT_REGEX)).toArray(new
String[0]);
@@ -623,9 +601,9 @@ public class LoremIpsum {
/**
* Splits a piece of text into words..
*
- * @param {string} text The text to split.
- * @return {Array.<string>} An array of words.
- * @private
+ * @param text
+ * The text to split.
+ * @return An array of words.
*/
static String[] splitWords(String text) {
return
filterNotEmptyOrWhiteSpace(text.split(WORD_SPLIT_REGEX)).toArray(new String[0]);
@@ -634,9 +612,11 @@ public class LoremIpsum {
/**
* Find the number in the list of values that is closest to the target.
*
- * @param {Array.<number>} values The values.
- * @param {number} target The target value.
- * @return {number} The closest value.
+ * @param values
+ * The values.
+ * @param target
+ * The target value.
+ * @return The closest value.
*/
static int chooseClosest(Integer[] values, int target) {
int closest = values[0];
@@ -652,10 +632,10 @@ public class LoremIpsum {
/**
* Gets info about a word used as part of the lorem ipsum algorithm.
*
- * @param {string} word The word to check.
- * @return {Array} A two element array. The first element is the size of
the
- * word. The second element is the delimiter used in the word.
- * @private
+ * @param word
+ * The word to check.
+ * @return A two element array. The first element is the size of the word.
+ * The second element is the delimiter used in the word.
*/
private static WordInfo getWordInfo(String word) {
WordInfo ret = new WordInfo();
@@ -682,9 +662,6 @@ public class LoremIpsum {
/**
* Constant used for {@link #randomNormal_}.
- *
- * @type {number}
- * @private
*/
private static final double NV_MAGICCONST_ = 4 * Math.exp(-0.5) /
Math.sqrt(2.0);
@@ -692,9 +669,10 @@ public class LoremIpsum {
* Generates a random number for a normal distribution with the specified
* mean and sigma.
*
- * @param {number} mu The mean of the distribution.
- * @param {number} sigma The sigma of the distribution.
- * @private
+ * @param mu
+ * The mean of the distribution.
+ * @param sigma
+ * The sigma of the distribution.
*/
private static double randomNormal(double mu, double sigma) {
double z = 0.0d;
@@ -713,9 +691,9 @@ public class LoremIpsum {
/**
* Returns the text if it is not empty or just whitespace.
*
- * @param {string} text the text to check.
- * @return {boolean} Whether the text is neither empty nor whitespace.
- * @private
+ * @param text
+ * the text to check.
+ * @return Whether the text is neither empty nor whitespace.
*/
private static List<String> filterNotEmptyOrWhiteSpace(String[] arr) {
List<String> result = new ArrayList<String>();
@@ -803,9 +781,6 @@ public class LoremIpsum {
/**
* Dictionary of words for lorem ipsum.
- *
- * @type {string}
- * @private
*/
private static final String DICT = "a ac accumsan ad adipiscing aenean
aliquam aliquet amet ante "
+ "aptent arcu at auctor augue bibendum blandit class commodo "
@@ -832,9 +807,6 @@ public class LoremIpsum {
/**
* A sample to use for generating the distribution of word and sentence
* lengths in lorem ipsum.
- *
- * @type {string}
- * @private
*/
private static final String SAMPLE = "Lorem ipsum dolor sit amet,
consectetuer adipiscing elit. Aenean "
+ "commodo ligula eget dolor. Aenean massa. Cum sociis natoque
penatibus "
@@ -992,11 +964,7 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph surrounded by HTML
- * pararaph tags.
- *
- * @param quantity
- * @param startWithLorem
- * @return
+ * paragraph tags.
*/
public String generateParagraphsHtml(int quantity, boolean startWithLorem)
{
@@ -1007,12 +975,7 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph surrounded by HTML
- * pararaph tags.
- *
- * @param writer
- * @param quantity
- * @param startWithLorem
- * @throws IOException
+ * paragraph tags.
*/
public void generateParagraphsHtml(Appendable writer, int quantity,
boolean startWithLorem) throws IOException {
@@ -1022,11 +985,7 @@ public class LoremIpsum {
}
/**
- * Generates one paragraph of HTML, surrounded by HTML pararaph tags.
- *
- * @param quantity
- * @param startWithLorem
- * @return
+ * Generates one paragraph of HTML, surrounded by HTML paragraph tags.
*/
public String generateOneParagraphHtml(int quantity, boolean
startWithLorem) {
@@ -1038,10 +997,6 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph surrounded by HTML
* paragraph tags as a full HTML page.
- *
- * @param quantity
- * @param startWithLorem
- * @return
*/
public String generateParagraphsFullHtml(int quantity, boolean
startWithLorem) {
@@ -1057,11 +1012,6 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph surrounded by HTML
* paragraph tags as a full HTML page.
- *
- * @param writer
- * @param quantity
- * @param startWithLorem
- * @throws IOException
*/
public void generateParagraphsFullHtml(Appendable writer, int quantity,
boolean startWithLorem) throws IOException {
@@ -1077,10 +1027,6 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph separated by two
* newlines.
- *
- * @param quantity
- * @param startWithLorem
- * @return
*/
public String generateParagraphsPlainText(int quantity, boolean
startWithLorem) {
@@ -1090,11 +1036,6 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph separated by two
* newlines.
- *
- * @param writer
- * @param quantity
- * @param startWithLorem
- * @throws IOException
*/
public void generateParagraphsPlainText(Appendable writer, int quantity,
boolean startWithLorem) throws IOException {
@@ -1104,10 +1045,6 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph separated by two
* newlines and no line exceeding maxCols columns
- *
- * @param quantity
- * @param startWithLorem
- * @return
*/
public String generateParagraphsPlainText(int quantity, int maxCols,
boolean startWithLorem) {
@@ -1123,11 +1060,6 @@ public class LoremIpsum {
/**
* Generates a number of paragraphs, with each paragraph separated by two
* newlines and no line exceeding maxCols columns
- *
- * @param writer
- * @param quantity
- * @param startWithLorem
- * @throws IOException
*/
public void generateParagraphsPlainText(Appendable writer, int quantity,
int maxCols, boolean startWithLorem)
throws IOException {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/Content.java
Mon Aug 29 15:12:25 2016
@@ -22,32 +22,26 @@ import org.apache.chemistry.opencmis.com
/**
* Interface to represent a content stream according to the CMIS spec.
- *
*/
public interface Content {
/**
- * return true if this object has content or false if there is no content
- * attached.
+ * Returns {@code true} if this object has content or false if there is no
+ * content attached.
*
* @return true if has content otherwise false
*/
boolean hasContent();
/**
- * Retrieve the content of a document.
- *
- * @param offset
- * offset in content stream
- * @param length
- * length of content to return
+ * Retrieves the content of a document.
*
* @return object containing mime-type, length and a stream with content
*/
ContentStream getContent();
/**
- * Assign content to a document. Existing content gets overwritten. The
+ * Assigns content to a document. Existing content gets overwritten. The
* document is not yet persisted in the new state.
*
* @param content
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java?rev=1758242&r1=1758241&r2=1758242&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/api/StoreManager.java
Mon Aug 29 15:12:25 2016
@@ -31,11 +31,10 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.server.support.TypeManager;
/**
- * interface to a repository implementation. This interface is the entry point
+ * Interface to a repository implementation. This interface is the entry point
* to a repository that can persist CMIS objects. Using this interface the type
* information can be retrieved or set, a repository can be created or for a
* given repository the store can be retrieved.
- *
*/
public interface StoreManager {
@@ -96,7 +95,8 @@ public interface StoreManager {
* true if for CMIS version 1.1 false if for 1.0
* @return map with type definition
*/
- Collection<TypeDefinitionContainer> getTypeDefinitionList(String
repositoryId, boolean includePropertyDefinitions, boolean cmis11);
+ Collection<TypeDefinitionContainer> getTypeDefinitionList(String
repositoryId, boolean includePropertyDefinitions,
+ boolean cmis11);
/**
* Retrieve a type definition for a give repository and type id.
@@ -158,7 +158,7 @@ public interface StoreManager {
/**
* Retrieve the repository information for a repository.
*
- * @param CallContext
+ * @param context
* call context of the corresponding call
* @param repositoryId
* id of repository
@@ -219,8 +219,8 @@ public interface StoreManager {
* items to skip
* @return list of objects matching the query
*/
- ObjectList query(CallContext callContext, String user, String
repositoryId, String statement, Boolean searchAllVersions,
- Boolean includeAllowableActions, IncludeRelationships
includeRelationships, String renditionFilter,
- BigInteger maxItems, BigInteger skipCount);
+ ObjectList query(CallContext callContext, String user, String
repositoryId, String statement,
+ Boolean searchAllVersions, Boolean includeAllowableActions,
IncludeRelationships includeRelationships,
+ String renditionFilter, BigInteger maxItems, BigInteger skipCount);
}
\ No newline at end of file
