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 2010/11/06 18:26:00 UTC
svn commit: r1032117 - in /incubator/chemistry/opencmis/trunk:
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/ma...
Author: fmui
Date: Sat Nov 6 17:26:00 2010
New Revision: 1032117
URL: http://svn.apache.org/viewvc?rev=1032117&view=rev
Log:
- make more use of the generic CallContext map
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/AbstractLocalService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/server/CallContext.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java Sat Nov 6 17:26:00 2010
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.chemistry.opencmis.client.bindings.impl.CmisBindingImpl;
-import org.apache.chemistry.opencmis.client.bindings.spi.AbstractAuthenticationProvider;
import org.apache.chemistry.opencmis.commons.SessionParameter;
import org.apache.chemistry.opencmis.commons.spi.CmisBinding;
@@ -43,7 +42,6 @@ public final class CmisBindingFactory {
/** NTLM authentication provider class */
public static final String NTLM_AUTHENTICATION_PROVIDER = "org.apache.chemistry.opencmis.client.bindings.spi.NTLMAuthenticationProvider";
-
private Map<String, String> defaults;
/**
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/AbstractLocalService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/AbstractLocalService.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/AbstractLocalService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/AbstractLocalService.java Sat Nov 6 17:26:00 2010
@@ -1,4 +1,5 @@
package org.apache.chemistry.opencmis.client.bindings.spi.local;
+
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@ package org.apache.chemistry.opencmis.cl
*
*/
-
+import java.math.BigInteger;
import java.util.HashMap;
import java.util.Map;
@@ -125,6 +126,14 @@ public abstract class AbstractLocalServi
return null;
}
+ public BigInteger getOffset() {
+ return (BigInteger) get(OFFSET);
+ }
+
+ public BigInteger getLength() {
+ return (BigInteger) get(LENGTH);
+ }
+
public boolean isObjectInfoRequired() {
return false;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/server/CallContext.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/server/CallContext.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/server/CallContext.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/server/CallContext.java Sat Nov 6 17:26:00 2010
@@ -18,6 +18,8 @@
*/
package org.apache.chemistry.opencmis.commons.server;
+import java.math.BigInteger;
+
/**
* An object implementing this interface holds context data of the current call.
*/
@@ -52,7 +54,7 @@ public interface CallContext {
/**
* Returns context data by key.
- *
+ *
* @param key
* the key
* @return the data if the key is valid, <code>null</code> otherwise
@@ -78,4 +80,14 @@ public interface CallContext {
* Returns the locale.
*/
String getLocale();
+
+ /**
+ * Returns the content offset if set, <code>null</code> otherwise
+ */
+ BigInteger getOffset();
+
+ /**
+ * Returns the content length if set, <code>null</code> otherwise
+ */
+ BigInteger getLength();
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/CallContextImpl.java Sat Nov 6 17:26:00 2010
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.server.impl;
+import java.math.BigInteger;
import java.util.HashMap;
import java.util.Map;
@@ -66,6 +67,14 @@ public class CallContextImpl implements
return (String) get(LOCALE);
}
+ public BigInteger getOffset() {
+ return (BigInteger) get(OFFSET);
+ }
+
+ public BigInteger getLength() {
+ return (BigInteger) get(LENGTH);
+ }
+
/**
* Adds a parameter.
*/
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java Sat Nov 6 17:26:00 2010
@@ -388,17 +388,8 @@ public final class ObjectService {
String objectId = getStringParameter(request, Constants.PARAM_ID);
String streamId = getStringParameter(request, Constants.PARAM_STREAM_ID);
- BigInteger offset = null;
- String offsetStr = (String) context.get(CallContext.OFFSET);
- if (offsetStr != null) {
- offset = new BigInteger(offsetStr);
- }
-
- BigInteger length = null;
- String lengthStr = (String) context.get(CallContext.LENGTH);
- if (lengthStr != null) {
- length = new BigInteger(offsetStr);
- }
+ BigInteger offset = context.getOffset();
+ BigInteger length = context.getLength();
// execute
ContentStream content = service.getContentStream(repositoryId, objectId, streamId, offset, length, null);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java Sat Nov 6 17:26:00 2010
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.handler.MessageContext;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
@@ -39,8 +38,7 @@ public class HttpUtils {
/**
* Creates a {@link CallContext} object from a servlet request.
*/
- public static CallContext createContext(HttpServletRequest request,
- ServletContext servletContext, String binding,
+ public static CallContext createContext(HttpServletRequest request, ServletContext servletContext, String binding,
CallContextHandler callContextHandler) {
String[] pathFragments = splitPath(request);
@@ -90,10 +88,10 @@ public class HttpUtils {
}
if (offset != null) {
- context.put(CallContext.OFFSET, offset.toString());
+ context.put(CallContext.OFFSET, offset);
}
if (length != null) {
- context.put(CallContext.LENGTH, length.toString());
+ context.put(CallContext.LENGTH, length);
}
}
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DummyCallContext.java Sat Nov 6 17:26:00 2010
@@ -21,6 +21,7 @@ package org.apache.chemistry.opencmis.in
*/
+import java.math.BigInteger;
import java.util.HashMap;
import java.util.Map;
@@ -55,6 +56,14 @@ public class DummyCallContext implements
return (String) get(LOCALE);
}
+ public BigInteger getOffset() {
+ return (BigInteger) get(OFFSET);
+ }
+
+ public BigInteger getLength() {
+ return (BigInteger) get(LENGTH);
+ }
+
public String getPassword() {
return (String) get(PASSWORD);
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryMultiFilingServiceImpl.java Sat Nov 6 17:26:00 2010
@@ -19,9 +19,6 @@
package org.apache.chemistry.opencmis.inmemory.server;
import org.apache.chemistry.opencmis.commons.data.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.data.ObjectData;
-import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
import org.apache.chemistry.opencmis.commons.impl.server.ObjectInfoImpl;
@@ -32,7 +29,6 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.storedobj.api.ObjectStore;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoreManager;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoredObject;
-import org.apache.chemistry.opencmis.inmemory.types.PropertyCreationHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java?rev=1032117&r1=1032116&r2=1032117&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java Sat Nov 6 17:26:00 2010
@@ -179,6 +179,14 @@ public class InMemoryServiceFactoryImpl
return null;
}
+ public BigInteger getOffset() {
+ return null;
+ }
+
+ public BigInteger getLength() {
+ return null;
+ }
+
public String getPassword() {
return null;
}