You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2014/06/29 14:26:44 UTC
svn commit: r1606497 - in /chemistry/opencmis/trunk: ./
chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/
chemistry-opencmis-android/chemistry-opencmis-android-client/s...
Author: fmui
Date: Sun Jun 29 12:26:42 2014
New Revision: 1606497
URL: http://svn.apache.org/r1606497
Log:
code clean up and minor improvements
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-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java
chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/AbstractBridgeServiceFactory.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/browser/ObjectServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieStoreImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/Response.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.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-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilBase.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilStrict.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/CmisTestResultStatus.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ProxyDetector.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=1606497&r1=1606496&r2=1606497&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 Sun Jun 29 12:26:42 2014
@@ -45,15 +45,12 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.impl.Base64;
import org.apache.chemistry.opencmis.commons.impl.DateTimeHelper;
-import org.apache.chemistry.opencmis.commons.impl.IOUtils;
import org.apache.chemistry.opencmis.commons.impl.XMLConstants;
import org.apache.chemistry.opencmis.commons.impl.XMLConverter;
import org.apache.chemistry.opencmis.commons.impl.XMLUtils;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.BulkUpdateImpl;
import org.xmlpull.v1.XmlSerializer;
-import android.util.Xml;
-
/**
* Writes a CMIS Atom entry to an output stream.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Sun Jun 29 12:26:42 2014
@@ -2175,7 +2175,7 @@ public final class XMLConverter {
protected abstract void addValue(XmlPullParser parser, ChoiceImpl<T> target) throws XmlPullParserException;
protected abstract void addChoice(XmlPullParser parser, ChoiceImpl<T> target) throws XmlPullParserException;
- };
+ }
// ---------------------------------
// --- objects and lists parsers ---
@@ -2608,7 +2608,7 @@ public final class XMLConverter {
return false;
}
- };
+ }
private abstract static class PropertyStringAtomPubXMLWalker<T extends AbstractPropertyData<String>> extends
PropertyAtomPubXMLWalker<T> {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLWalker.java Sun Jun 29 12:26:42 2014
@@ -21,7 +21,6 @@ package org.apache.chemistry.opencmis.co
import static org.apache.chemistry.opencmis.commons.impl.XMLUtils.next;
import static org.apache.chemistry.opencmis.commons.impl.XMLUtils.skip;
-import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/AbstractBridgeServiceFactory.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/AbstractBridgeServiceFactory.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/AbstractBridgeServiceFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-bridge/chemistry-opencmis-bridge/src/main/java/org/apache/chemistry/opencmis/bridge/AbstractBridgeServiceFactory.java Sun Jun 29 12:26:42 2014
@@ -26,7 +26,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.server.AbstractServiceFactory;
import org.apache.chemistry.opencmis.commons.server.CallContext;
import org.apache.chemistry.opencmis.commons.server.CmisService;
-import org.apache.chemistry.opencmis.server.support.CmisServiceWrapper;
import org.apache.chemistry.opencmis.server.support.wrapper.CallContextAwareCmisService;
import org.apache.chemistry.opencmis.server.support.wrapper.ConformanceCmisServiceWrapper;
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=1606497&r1=1606496&r2=1606497&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 Sun Jun 29 12:26:42 2014
@@ -29,6 +29,7 @@ import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -396,7 +397,7 @@ public class OAuthAuthenticationProvider
if (contentType != null) {
String[] parts = contentType.split(";");
for (int i = 1; i < parts.length; i++) {
- String part = parts[i].trim().toLowerCase();
+ String part = parts[i].trim().toLowerCase(Locale.ENGLISH);
if (part.startsWith("charset")) {
int x = part.indexOf('=');
charset = part.substring(x + 1).trim();
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.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/browser/ObjectServiceImpl.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ObjectServiceImpl.java Sun Jun 29 12:26:42 2014
@@ -18,6 +18,8 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.browser;
+import static org.apache.chemistry.opencmis.commons.impl.CollectionsHelper.isNullOrEmpty;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -416,7 +418,7 @@ public class ObjectServiceImpl extends A
List<BulkUpdateObjectIdAndChangeToken> objectIdAndChangeToken, Properties properties,
List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds, ExtensionsData extension) {
// we need object ids
- if ((objectIdAndChangeToken == null) || (objectIdAndChangeToken.size() == 0)) {
+ if (isNullOrEmpty(objectIdAndChangeToken)) {
throw new CmisInvalidArgumentException("Object ids must be set!");
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieStoreImpl.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/CmisCookieStoreImpl.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieStoreImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieStoreImpl.java Sun Jun 29 12:26:42 2014
@@ -83,7 +83,7 @@ public class CmisCookieStoreImpl impleme
throw new IllegalArgumentException("URI is null!");
}
- final String uriHost = uri.getHost().toLowerCase();
+ final String uriHost = uri.getHost().toLowerCase(Locale.ENGLISH);
boolean isSecure = false;
String scheme = uri.getScheme();
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/Response.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/http/Response.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/Response.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/Response.java Sun Jun 29 12:26:42 2014
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.http;
-import static org.apache.chemistry.opencmis.commons.impl.CollectionsHelper.*;
+import static org.apache.chemistry.opencmis.commons.impl.CollectionsHelper.isNullOrEmpty;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -63,7 +63,7 @@ public class Response {
this.headers = new HashMap<String, List<String>>();
if (headers != null) {
for (Map.Entry<String, List<String>> e : headers.entrySet()) {
- this.headers.put(e.getKey() == null ? null : e.getKey().toLowerCase(), e.getValue());
+ this.headers.put(e.getKey() == null ? null : e.getKey().toLowerCase(Locale.ENGLISH), e.getValue());
}
}
@@ -73,7 +73,7 @@ public class Response {
if (contentType != null) {
String[] parts = contentType.split(";");
for (int i = 1; i < parts.length; i++) {
- String part = parts[i].trim().toLowerCase();
+ String part = parts[i].trim().toLowerCase(Locale.ENGLISH);
if (part.startsWith("charset")) {
int x = part.indexOf('=');
charset = part.substring(x + 1).trim();
@@ -85,7 +85,7 @@ public class Response {
// if there is an error page, get it
if (errorStream != null) {
if (contentType != null) {
- String contentTypeLower = contentType.toLowerCase().split(";")[0];
+ String contentTypeLower = contentType.toLowerCase(Locale.ENGLISH).split(";")[0];
if (contentTypeLower.startsWith("text/") || contentTypeLower.endsWith("+xml")
|| contentTypeLower.startsWith("application/xml")
|| contentTypeLower.startsWith("application/json")) {
@@ -95,9 +95,10 @@ public class Response {
try {
String encoding = getContentEncoding();
if (encoding != null) {
- if (encoding.toLowerCase().trim().equals("gzip") && !isGZIP) {
+ String encLower = encoding.trim().toLowerCase(Locale.ENGLISH);
+ if (encLower.equals("gzip") && !isGZIP) {
errorStream = new GZIPInputStream(errorStream, 4096);
- } else if (encoding.toLowerCase().trim().equals("deflate")) {
+ } else if (encLower.equals("deflate")) {
errorStream = new InflaterInputStream(errorStream, new Inflater(true), 4096);
}
}
@@ -151,7 +152,8 @@ public class Response {
if (hasResponseStream) {
String encoding = getContentEncoding();
if (encoding != null) {
- if (encoding.toLowerCase().trim().equals("gzip") && !isGZIP) {
+ String encLower = encoding.trim().toLowerCase(Locale.ENGLISH);
+ if (encLower.equals("gzip") && !isGZIP) {
// if the stream is gzip encoded, decode it
length = null;
try {
@@ -161,7 +163,7 @@ public class Response {
stream = null;
IOUtils.closeQuietly(responseStream);
}
- } else if (encoding.toLowerCase().trim().equals("deflate")) {
+ } else if (encLower.equals("deflate")) {
// if the stream is deflate encoded, decode it
length = null;
stream = new InflaterInputStream(stream, new Inflater(true), 4096);
@@ -169,7 +171,7 @@ public class Response {
}
String transferEncoding = getContentTransferEncoding();
- if (transferEncoding != null && transferEncoding.toLowerCase().trim().equals("base64")) {
+ if (transferEncoding != null && transferEncoding.trim().toLowerCase(Locale.ENGLISH).equals("base64")) {
// if the stream is base64 encoded, decode it
length = null;
stream = new Base64.InputStream(stream);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.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/webservices/AbstractPortProvider.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java Sun Jun 29 12:26:42 2014
@@ -27,11 +27,11 @@ import java.lang.reflect.InvocationTarge
import java.math.BigInteger;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayDeque;
import java.util.Collections;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
@@ -241,7 +241,7 @@ public abstract class AbstractPortProvid
private String acceptLanguage;
private final ReentrantLock portObjectLock = new ReentrantLock();
- private final EnumMap<CmisWebSerivcesService, LinkedList<SoftReference<BindingProvider>>> portObjectCache = new EnumMap<CmisWebSerivcesService, LinkedList<SoftReference<BindingProvider>>>(
+ private final EnumMap<CmisWebSerivcesService, ArrayDeque<SoftReference<BindingProvider>>> portObjectCache = new EnumMap<CmisWebSerivcesService, ArrayDeque<SoftReference<BindingProvider>>>(
CmisWebSerivcesService.class);
public BindingSession getSession() {
@@ -405,7 +405,7 @@ public abstract class AbstractPortProvid
portObjectLock.lock();
try {
- LinkedList<SoftReference<BindingProvider>> queue = portObjectCache.get(service);
+ ArrayDeque<SoftReference<BindingProvider>> queue = portObjectCache.get(service);
if (queue == null) {
throw new CmisRuntimeException("This is a bug!");
}
@@ -679,7 +679,7 @@ public abstract class AbstractPortProvid
*/
protected void setSoapAction(BindingProvider portObject, String soapAction, CmisVersion cmisVersion) {
portObject.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, Boolean.TRUE);
-
+
if (cmisVersion == CmisVersion.CMIS_1_0) {
portObject.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, "");
} else {
@@ -694,9 +694,9 @@ public abstract class AbstractPortProvid
WebServiceFeature... features) throws Exception {
portObjectLock.lock();
try {
- LinkedList<SoftReference<BindingProvider>> queue = portObjectCache.get(serviceHolder.getService());
+ ArrayDeque<SoftReference<BindingProvider>> queue = portObjectCache.get(serviceHolder.getService());
if (queue == null) {
- queue = new LinkedList<SoftReference<BindingProvider>>();
+ queue = new ArrayDeque<SoftReference<BindingProvider>>();
portObjectCache.put(serviceHolder.getService(), queue);
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java Sun Jun 29 12:26:42 2014
@@ -19,6 +19,7 @@
package org.apache.chemistry.opencmis.client.bindings.webservices;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory;
@@ -29,13 +30,15 @@ import org.apache.chemistry.opencmis.com
* Web Services Binding Factory.
*/
public class WebServicesTestBindingFactory {
-
+
private WebServicesTestBindingFactory() {
}
public static CmisBinding createBinding(String url, String username, String password) {
boolean isPrefix = true;
- String urlLower = url.toLowerCase();
+
+ url = url.trim();
+ String urlLower = url.toLowerCase(Locale.ENGLISH);
if (urlLower.endsWith("?wsdl")) {
isPrefix = false;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.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/PropertyImpl.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java Sun Jun 29 12:26:42 2014
@@ -92,7 +92,7 @@ public class PropertyImpl<T> extends Abs
public String getValueAsString() {
List<T> values = getValues();
- if (values.size() == 0) {
+ if (values.isEmpty()) {
return null;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.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/SessionImpl.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java Sun Jun 29 12:26:42 2014
@@ -28,7 +28,6 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -394,7 +393,7 @@ public class SessionImpl implements Sess
ctxt.isIncludeAcls(), BigInteger.valueOf(this.maxNumItems), null);
// convert type definitions
- LinkedList<ChangeEvent> page = new LinkedList<ChangeEvent>();
+ List<ChangeEvent> page = new ArrayList<ChangeEvent>();
for (ObjectData objectData : objectList.getObjects()) {
page.add(of.convertChangeEvent(objectData));
}
@@ -402,7 +401,7 @@ public class SessionImpl implements Sess
if (!firstPage) {
// the last entry of the previous page is repeated
// -> remove the first entry
- page.removeFirst();
+ page.remove(0);
}
firstPage = false;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java Sun Jun 29 12:26:42 2014
@@ -2911,7 +2911,7 @@ public final class JSONConverter {
} else if (value instanceof String) {
GregorianCalendar cal = DateTimeHelper.parseXmlDateTime((String) value);
if (cal == null) {
- new CmisRuntimeException("Invalid DateTime value!");
+ throw new CmisRuntimeException("Invalid DateTime value!");
}
return cal;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/MimeTypes.java Sun Jun 29 12:26:42 2014
@@ -452,7 +452,7 @@ public final class MimeTypes {
ext = ext.substring(x + 1);
}
- String mime = EXT2MIME.get(ext.toLowerCase());
+ String mime = EXT2MIME.get(ext.toLowerCase(Locale.ENGLISH));
if (mime == null) {
mime = URLConnection.getFileNameMap().getContentTypeFor("x." + ext);
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.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/UrlBuilder.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java Sun Jun 29 12:26:42 2014
@@ -210,7 +210,7 @@ public class UrlBuilder {
// quote some additional reserved characters to be safe
for (char c : RFC7232_RESERVED) {
if (r.indexOf(c) >= 0) {
- r = r.replace("" + c, "%" + Integer.toHexString(c));
+ r = r.replace(String.valueOf(c), "%" + Integer.toHexString(c));
}
}
if (quoteSlash && r.indexOf('/') >= 0) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Sun Jun 29 12:26:42 2014
@@ -2168,7 +2168,7 @@ public final class XMLConverter {
protected abstract void addValue(XMLStreamReader parser, ChoiceImpl<T> target) throws XMLStreamException;
protected abstract void addChoice(XMLStreamReader parser, ChoiceImpl<T> target) throws XMLStreamException;
- };
+ }
// ---------------------------------
// --- objects and lists parsers ---
@@ -2600,7 +2600,7 @@ public final class XMLConverter {
return false;
}
- };
+ }
private abstract static class PropertyStringXMLWalker<T extends AbstractPropertyData<String>> extends
PropertyXMLWalker<T> {
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=1606497&r1=1606496&r2=1606497&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 Sun Jun 29 12:26:42 2014
@@ -21,7 +21,8 @@ package org.apache.chemistry.opencmis.co
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.util.LinkedList;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.List;
import java.util.Map;
@@ -47,12 +48,12 @@ public class JSONParser {
public static final int S_END = 6;
public static final int S_IN_ERROR = -1;
- private LinkedList<Integer> handlerStatusStack;
+ private ArrayDeque<Integer> handlerStatusStack;
private Yylex lexer = new Yylex((Reader) null);
private Yytoken token = null;
private int status = S_INIT;
- private int peekStatus(LinkedList<Integer> statusStack) {
+ private int peekStatus(Deque<Integer> statusStack) {
if (statusStack.isEmpty()) {
return -1;
}
@@ -128,8 +129,8 @@ public class JSONParser {
@SuppressWarnings("unchecked")
public Object parse(Reader in, ContainerFactory containerFactory) throws IOException, JSONParseException {
reset(in);
- LinkedList<Integer> statusStack = new LinkedList<Integer>();
- LinkedList<Object> valueStack = new LinkedList<Object>();
+ Deque<Integer> statusStack = new ArrayDeque<Integer>();
+ Deque<Object> valueStack = new ArrayDeque<Object>();
try {
do {
@@ -355,16 +356,16 @@ public class JSONParser {
JSONParseException {
if (!isResume) {
reset(in);
- handlerStatusStack = new LinkedList<Integer>();
+ handlerStatusStack = new ArrayDeque<Integer>();
} else {
if (handlerStatusStack == null) {
isResume = false;
reset(in);
- handlerStatusStack = new LinkedList<Integer>();
+ handlerStatusStack = new ArrayDeque<Integer>();
}
}
- LinkedList<Integer> statusStack = handlerStatusStack;
+ ArrayDeque<Integer> statusStack = handlerStatusStack;
try {
do {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.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/impl/browser/token/AbstractSimpleTokenHandler.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/token/AbstractSimpleTokenHandler.java Sun Jun 29 12:26:42 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.Serializable;
import java.net.URL;
+import java.util.Locale;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
@@ -246,7 +247,7 @@ public abstract class AbstractSimpleToke
// check URL
String url = request.getParameter(SimpleTokenHandlerSessionHelper.PARAM_URL);
- if (url == null || url.trim().length() < 8 || !url.toLowerCase().startsWith("http")) {
+ if (url == null || url.trim().length() < 8 || !url.toLowerCase(Locale.ENGLISH).startsWith("http")) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.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/NoBodyHttpServletResponseWrapper.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/NoBodyHttpServletResponseWrapper.java Sun Jun 29 12:26:42 2014
@@ -50,7 +50,7 @@ public class NoBodyHttpServletResponseWr
return writer;
}
- private class NoBodyOutputStream extends ServletOutputStream {
+ private static class NoBodyOutputStream extends ServletOutputStream {
@Override
public void write(int b) throws IOException {
// ignore
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Sun Jun 29 12:26:42 2014
@@ -1316,7 +1316,7 @@ public class FileShareRepository {
public ObjectData getFolderParent(CallContext context, String folderId, String filter, ObjectInfoHandler objectInfos) {
List<ObjectParentData> parents = getObjectParents(context, folderId, filter, false, false, objectInfos);
- if (parents.size() == 0) {
+ if (parents.isEmpty()) {
throw new CmisInvalidArgumentException("The root folder has no parent!");
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java Sun Jun 29 12:26:42 2014
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.jcr.JcrTypeManager;
-import org.apache.chemistry.opencmis.server.support.query.CmisQueryWalker;
import org.apache.chemistry.opencmis.server.support.query.QueryObject;
import org.apache.chemistry.opencmis.server.support.query.QueryObject.SortSpec;
import org.apache.chemistry.opencmis.server.support.query.QueryUtilStrict;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.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/QueryObject.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java Sun Jun 29 12:26:42 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -64,7 +63,7 @@ public class QueryObject {
/** main from alias name */
protected String from = null;
- protected final List<JoinSpec> joinSpecs = new LinkedList<JoinSpec>();
+ protected final List<JoinSpec> joinSpecs = new ArrayList<JoinSpec>();
// where part
protected final Map<Integer, CmisSelector> columnReferences = new HashMap<Integer, CmisSelector>();
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=1606497&r1=1606496&r2=1606497&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 Sun Jun 29 12:26:42 2014
@@ -66,7 +66,7 @@ public abstract class QueryUtilBase<T ex
*
* @throws RecognitionException
*/
- public abstract void walkStatement() throws RecognitionException;;
+ public abstract void walkStatement() throws RecognitionException;
/**
* Fully process a query by parsing and walking it and setting up the
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilStrict.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/QueryUtilStrict.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilStrict.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryUtilStrict.java Sun Jun 29 12:26:42 2014
@@ -22,7 +22,6 @@ import org.antlr.runtime.ANTLRStringStre
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
import org.antlr.runtime.TokenSource;
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.tree.CommonTree;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/CmisTestResultStatus.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/CmisTestResultStatus.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/CmisTestResultStatus.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/CmisTestResultStatus.java Sun Jun 29 12:26:42 2014
@@ -46,6 +46,6 @@ public enum CmisTestResultStatus {
return c;
}
}
- throw new IllegalArgumentException("" + level);
+ throw new IllegalArgumentException(String.valueOf(level));
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/TimeLogger.java Sun Jun 29 12:26:42 2014
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.util.repository;
-import java.util.LinkedList;
+import java.util.ArrayDeque;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,13 +35,13 @@ public class TimeLogger {
}
private final String fAction;
- private LinkedList<TimeRecord> fTimeRecs = new LinkedList<TimeRecord>();
+ private ArrayDeque<TimeRecord> fTimeRecs = new ArrayDeque<TimeRecord>();
private static final int MAX_SIZE = 2500;
TimeRecord fCurrentRec;
public TimeLogger() {
fAction = "";
- fTimeRecs = new LinkedList<TimeRecord>();
+ fTimeRecs = new ArrayDeque<TimeRecord>();
}
public TimeLogger(String action) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/PropertyEditorFrame.java Sun Jun 29 12:26:42 2014
@@ -37,7 +37,6 @@ import java.util.Calendar;
import java.util.Collections;
import java.util.GregorianCalendar;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
@@ -250,7 +249,7 @@ public class PropertyEditorFrame extends
private final Object value;
private final Color bgColor;
private JComboBox changeBox;
- private LinkedList<JComponent> valueComponents;
+ private List<JComponent> valueComponents;
public PropertyInputPanel(PropertyDefinition<?> propDef, Object value, int position) {
super();
@@ -296,7 +295,7 @@ public class PropertyEditorFrame extends
changeBox = new JComboBox(new Object[] { "Don't change ", "Update ", "Unset " });
titlePanel.add(changeBox, BorderLayout.LINE_END);
- valueComponents = new LinkedList<JComponent>();
+ valueComponents = new ArrayList<JComponent>();
if (propDef.getCardinality() == Cardinality.SINGLE) {
JComponent valueField = createInputField(value);
valueComponents.add(valueField);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ProxyDetector.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ProxyDetector.java?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ProxyDetector.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ProxyDetector.java Sun Jun 29 12:26:42 2014
@@ -45,7 +45,7 @@ public class ProxyDetector {
public static final Pattern PROXY_ENV_VAR2 = Pattern.compile("(.+):(\\d+)");
public static final Pattern PROXY_WIN_REG = Pattern.compile("\\s+Proxy(.+)\\s+REG.+\\s+(.+)");
- public static boolean debug = false;
+ private static boolean debug = false;
/**
* Gets proxy settings from system properties.
@@ -98,7 +98,9 @@ public class ProxyDetector {
Map<String, String> env = System.getenv();
for (Map.Entry<String, String> e : env.entrySet()) {
- if (e.getKey().equalsIgnoreCase("http_proxy")) {
+ String key = e.getKey().trim().toLowerCase(Locale.ENGLISH);
+
+ if ("http_proxy".equals(key)) {
Matcher m = PROXY_ENV_VAR1.matcher(e.getValue());
if (m.matches()) {
settings.setHttpProxyHost(parseHost(m.group(1)));
@@ -110,9 +112,7 @@ public class ProxyDetector {
settings.setHttpProxyPort(parsePort(m.group(2)));
}
}
- }
-
- if (e.getKey().equalsIgnoreCase("https_proxy")) {
+ } else if ("https_proxy".equals(key)) {
Matcher m = PROXY_ENV_VAR1.matcher(e.getValue());
if (m.matches()) {
settings.setHttpsProxyHost(parseHost(m.group(1)));
@@ -124,9 +124,7 @@ public class ProxyDetector {
settings.setHttpProxyPort(parsePort(m.group(2)));
}
}
- }
-
- if (e.getKey().equalsIgnoreCase("no_proxy")) {
+ } else if ("no_proxy".equals(key)) {
List<String> noHosts = new ArrayList<String>();
for (String noHost : e.getValue().split(",")) {
noHost = noHost.trim();
@@ -184,12 +182,12 @@ public class ProxyDetector {
String key = m.group(1).trim().toLowerCase(Locale.ENGLISH);
String value = m.group(2).trim();
- if (key.equals("enable")) {
+ if ("enable".equals(key)) {
if (!value.equals("0x1")) {
// proxies disabled
return null;
}
- } else if (key.equals("server")) {
+ } else if ("server".equals(key)) {
// server
String host = value;
int port = 80;
@@ -204,7 +202,7 @@ public class ProxyDetector {
settings.setHttpProxyPort(port);
settings.setHttpsProxyHost(host);
settings.setHttpsProxyPort(port);
- } else if (key.equals("override")) {
+ } else if ("override".equals(key)) {
// no proxy
List<String> noHosts = new ArrayList<String>();
for (String noHost : value.split(";")) {
Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1606497&r1=1606496&r2=1606497&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Sun Jun 29 12:26:42 2014
@@ -431,11 +431,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.14.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
</plugin>