You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/22 13:43:58 UTC
[50/51] [abbrv] [partial] Removing /ODataJClient: merge complete
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/pom.xml b/ODataJClient/engine/pom.xml
deleted file mode 100644
index d19de08..0000000
--- a/ODataJClient/engine/pom.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Engine</name>
- <description>Java client API for OData 3.0 services: Engine</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine-xml</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <systemPropertyVariables>
- <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
- <org.slf4j.simpleLogger.defaultLogLevel>ERROR</org.slf4j.simpleLogger.defaultLogLevel>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/*PerfTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- </plugins>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../test-service/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>perf</id>
-
- <build>
- <defaultGoal>clean test exec:exec</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>perf-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*PerfTest.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>java</executable>
- <classpathScope>test</classpathScope>
- <arguments>
- <argument>-classpath</argument>
- <classpath />
- <argument>com.msopentech.odatajclient.engine.performance.PerfTestReporter</argument>
- <argument>${project.basedir}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java
deleted file mode 100644
index f5fc169..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public abstract class AbstractConfiguration implements Configuration {
-
- private static final String DEFAULT_PUB_FORMAT = "pubFormat";
-
- private static final String DEFAULT_VALUE_FORMAT = "valueFormat";
-
- private static final String DEFAULT_MEDIA_FORMAT = "valueFormat";
-
- private static final String HTTP_CLIENT_FACTORY = "httpClientFactory";
-
- private static final String HTTP_URI_REQUEST_FACTORY = "httpUriRequestFactory";
-
- private static final String USE_XHTTP_METHOD = "useHTTPMethod";
-
- private static final String KEY_AS_SEGMENT = "keyAsSegment";
-
- private static final String GZIP_COMPRESSION = "gzipCompression";
-
- private static final String CHUNKING = "chunking";
-
- private final Map<String, Object> CONF = new HashMap<String, Object>();
-
- private transient ExecutorService executor = Executors.newFixedThreadPool(10);
-
- /**
- * Gets given configuration property.
- *
- * @param key key value of the property to be retrieved.
- * @param defaultValue default value to be used in case of the given key doesn't exist.
- * @return property value if exists; default value if does not exist.
- */
- private Object getProperty(final String key, final Object defaultValue) {
- return CONF.containsKey(key) ? CONF.get(key) : defaultValue;
- }
-
- /**
- * Sets new configuration property.
- *
- * @param key configuration property key.
- * @param value configuration property value.
- * @return given value.
- */
- private Object setProperty(final String key, final Object value) {
- return CONF.put(key, value);
- }
-
- @Override
- public ODataPubFormat getDefaultPubFormat() {
- return ODataPubFormat.valueOf(
- getProperty(DEFAULT_PUB_FORMAT, ODataPubFormat.JSON_FULL_METADATA.name()).toString());
- }
-
- @Override
- public void setDefaultPubFormat(final ODataPubFormat format) {
- setProperty(DEFAULT_PUB_FORMAT, format.name());
- }
-
- @Override
- public ODataFormat getDefaultFormat() {
- ODataFormat format;
-
- switch (getDefaultPubFormat()) {
- case ATOM:
- format = ODataFormat.XML;
- break;
-
- case JSON_FULL_METADATA:
- format = ODataFormat.JSON_FULL_METADATA;
- break;
-
- case JSON_NO_METADATA:
- format = ODataFormat.JSON_NO_METADATA;
- break;
-
- case JSON:
- default:
- format = ODataFormat.JSON;
- }
-
- return format;
- }
-
- @Override
- public ODataValueFormat getDefaultValueFormat() {
- return ODataValueFormat.valueOf(
- getProperty(DEFAULT_VALUE_FORMAT, ODataValueFormat.TEXT.name()).toString());
- }
-
- @Override
- public void setDefaultValueFormat(final ODataValueFormat format) {
- setProperty(DEFAULT_VALUE_FORMAT, format.name());
- }
-
- @Override
- public ODataMediaFormat getDefaultMediaFormat() {
- return ODataMediaFormat.valueOf(
- getProperty(DEFAULT_VALUE_FORMAT, ODataMediaFormat.APPLICATION_OCTET_STREAM.name()).toString());
- }
-
- @Override
- public void setDefaultMediaFormat(final ODataMediaFormat format) {
- setProperty(DEFAULT_MEDIA_FORMAT, format.name());
- }
-
- @Override
- public HttpClientFactory getHttpClientFactory() {
- return (HttpClientFactory) getProperty(HTTP_CLIENT_FACTORY, new DefaultHttpClientFactory());
- }
-
- @Override
- public void setHttpClientFactory(final HttpClientFactory factory) {
- setProperty(HTTP_CLIENT_FACTORY, factory);
- }
-
- @Override
- public HttpUriRequestFactory getHttpUriRequestFactory() {
- return (HttpUriRequestFactory) getProperty(HTTP_URI_REQUEST_FACTORY, new DefaultHttpUriRequestFactory());
- }
-
- @Override
- public void setHttpUriRequestFactory(final HttpUriRequestFactory factory) {
- setProperty(HTTP_URI_REQUEST_FACTORY, factory);
- }
-
- @Override
- public boolean isUseXHTTPMethod() {
- return (Boolean) getProperty(USE_XHTTP_METHOD, false);
- }
-
- @Override
- public void setUseXHTTPMethod(final boolean value) {
- setProperty(USE_XHTTP_METHOD, value);
- }
-
- @Override
- public boolean isKeyAsSegment() {
- return (Boolean) getProperty(KEY_AS_SEGMENT, false);
- }
-
- @Override
- public void setKeyAsSegment(final boolean value) {
- setProperty(KEY_AS_SEGMENT, value);
- }
-
- @Override
- public boolean isGzipCompression() {
- return (Boolean) getProperty(GZIP_COMPRESSION, false);
- }
-
- @Override
- public void setGzipCompression(final boolean value) {
- setProperty(GZIP_COMPRESSION, value);
- }
-
- @Override
- public boolean isUseChuncked() {
- return (Boolean) getProperty(CHUNKING, true);
- }
-
- @Override
- public void setUseChuncked(final boolean value) {
- setProperty(CHUNKING, value);
- }
-
- @Override
- public ExecutorService getExecutor() {
- return executor;
- }
-
- @Override
- public void setExecutor(final ExecutorService executorService) {
- executor = executorService;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java
deleted file mode 100644
index d19fc0f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-
-abstract class AbstractODataClient implements ODataClient {
-
- private static final long serialVersionUID = 7269096702397630265L;
-
- @Override
- public ODataPrimitiveValue.Builder getPrimitiveValueBuilder() {
- return new ODataPrimitiveValue.Builder(this);
- }
-
- @Override
- public ODataGeospatialValue.Builder getGeospatialValueBuilder() {
- return new ODataGeospatialValue.Builder(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java
deleted file mode 100644
index f302d66..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.io.Serializable;
-import java.util.concurrent.ExecutorService;
-
-/**
- * Configuration wrapper.
- */
-public interface Configuration extends Serializable {
-
- /**
- * Gets the configured OData format for AtomPub exchanges.
- * If this configuration parameter doesn't exist the JSON_FULL_METADATA format will be used as default.
- *
- * @return configured OData format for AtomPub if specified; JSON_FULL_METADATA format otherwise.
- * @see ODataPubFormat#JSON_FULL_METADATA
- */
- ODataPubFormat getDefaultPubFormat();
-
- /**
- * Sets the default OData format for AtomPub exchanges.
- *
- * @param format default format.
- */
- void setDefaultPubFormat(ODataPubFormat format);
-
- /**
- * Gets the configured OData format.
- * This value depends on what is returned from <tt>getDefaultPubFormat()</tt>.
- *
- * @return configured OData format
- * @see #getDefaultPubFormat()
- */
- ODataFormat getDefaultFormat();
-
- /**
- * Gets the configured OData value format.
- * If this configuration parameter doesn't exist the TEXT format will be used as default.
- *
- * @return configured OData value format if specified; TEXT format otherwise.
- * @see ODataValueFormat#TEXT
- */
- ODataValueFormat getDefaultValueFormat();
-
- /**
- * Sets the default OData value format.
- *
- * @param format default format.
- */
- void setDefaultValueFormat(ODataValueFormat format);
-
- /**
- * Gets the configured OData media format.
- * If this configuration parameter doesn't exist the APPLICATION_OCTET_STREAM format will be used as default.
- *
- * @return configured OData media format if specified; APPLICATION_OCTET_STREAM format otherwise.
- * @see ODataMediaFormat#WILDCARD
- */
- ODataMediaFormat getDefaultMediaFormat();
-
- /**
- * Sets the default OData media format.
- *
- * @param format default format.
- */
- void setDefaultMediaFormat(ODataMediaFormat format);
-
- /**
- * Gets the HttpClient factory to be used for executing requests.
- *
- * @return provided implementation (if configured via <tt>setHttpClientFactory</tt> or default.
- * @see DefaultHttpClientFactory
- */
- HttpClientFactory getHttpClientFactory();
-
- /**
- * Sets the HttpClient factory to be used for executing requests.
- *
- * @param factory implementation of <tt>HttpClientFactory</tt>.
- * @see HttpClientFactory
- */
- void setHttpClientFactory(HttpClientFactory factory);
-
- /**
- * Gets the HttpUriRequest factory for generating requests to be executed.
- *
- * @return provided implementation (if configured via <tt>setHttpUriRequestFactory</tt> or default.
- * @see DefaultHttpUriRequestFactory
- */
- HttpUriRequestFactory getHttpUriRequestFactory();
-
- /**
- * Sets the HttpUriRequest factory generating requests to be executed.
- *
- * @param factory implementation of <tt>HttpUriRequestFactory</tt>.
- * @see HttpUriRequestFactory
- */
- void setHttpUriRequestFactory(HttpUriRequestFactory factory);
-
- /**
- * Gets whether <tt>PUT</tt>, <tt>MERGE</tt>, <tt>PATCH</tt>, <tt>DELETE</tt> HTTP methods need to be translated to
- * <tt>POST</tt> with additional <tt>X-HTTTP-Method</tt> header.
- *
- * @return whether <tt>X-HTTTP-Method</tt> header is to be used
- */
- boolean isUseXHTTPMethod();
-
- /**
- * Sets whether <tt>PUT</tt>, <tt>MERGE</tt>, <tt>PATCH</tt>, <tt>DELETE</tt> HTTP methods need to be translated to
- * <tt>POST</tt> with additional <tt>X-HTTTP-Method</tt> header.
- *
- * @param value 'TRUE' to use tunneling.
- */
- void setUseXHTTPMethod(boolean value);
-
- /**
- * Checks whether URIs contain entity key between parentheses (standard) or instead as additional segment.
- * Example: http://services.odata.org/V4/OData/OData.svc/Products(0) or
- * http://services.odata.org/V4/OData/OData.svc/Products/0
- *
- * @return
- */
- boolean isKeyAsSegment();
-
- /**
- * Sets whether URIs shall be built with entity key between parentheses (standard) or instead as additional
- * segment.
- * Example: http://services.odata.org/V4/OData/OData.svc/Products(0) or
- * http://services.odata.org/V4/OData/OData.svc/Products/0
- *
- * @return whether URIs shall be built with entity key between parentheses (standard) or instead as additional
- * segment.
- */
- void setKeyAsSegment(boolean value);
-
- /**
- * Checks whether Gzip compression (e.g. support for <tt>Accept-Encoding: gzip</tt> and
- * <tt>Content-Encoding: gzip</tt> HTTP headers) is enabled.
- *
- * @return whether HTTP Gzip compression is enabled
- */
- boolean isGzipCompression();
-
- /**
- * Sets Gzip compression (e.g. support for <tt>Accept-Encoding: gzip</tt> and
- * <tt>Content-Encoding: gzip</tt> HTTP headers) enabled or disabled.
- *
- * @param value whether to use Gzip compression.
- */
- void setGzipCompression(boolean value);
-
- /**
- * Checks whether chunk HTTP encoding is being used.
- *
- * @return whether chunk HTTP encoding is being used
- */
- boolean isUseChuncked();
-
- /**
- * Sets chunk HTTP encoding enabled or disabled.
- *
- * @param value whether to use chunk HTTP encoding.
- */
- void setUseChuncked(boolean value);
-
- /**
- * Retrieves request executor service.
- *
- * @return request executor service.
- */
- ExecutorService getExecutor();
-
- /**
- * Sets request executor service.
- *
- * @param executorService new executor services.
- */
- void setExecutor(ExecutorService executorService);
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java
deleted file mode 100644
index c0eba2f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.data.ODataDeserializer;
-import com.msopentech.odatajclient.engine.data.ODataBinder;
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataObjectFactory;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataReader;
-import com.msopentech.odatajclient.engine.data.ODataWriter;
-import com.msopentech.odatajclient.engine.data.ODataSerializer;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.FilterFactory;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.Serializable;
-
-public interface ODataClient extends Serializable {
-
- ODataVersion getWorkingVersion();
-
- ODataHeaders getVersionHeaders();
-
- Configuration getConfiguration();
-
- URIBuilder getURIBuilder(String serviceRoot);
-
- FilterFactory getFilterFactory();
-
- ODataPrimitiveValue.Builder getPrimitiveValueBuilder();
-
- ODataGeospatialValue.Builder getGeospatialValueBuilder();
-
- ODataSerializer getSerializer();
-
- ODataDeserializer getDeserializer();
-
- ODataReader getReader();
-
- ODataWriter getWriter();
-
- ODataBinder getBinder();
-
- ODataObjectFactory getObjectFactory();
-
- RetrieveRequestFactory getRetrieveRequestFactory();
-
- CUDRequestFactory getCUDRequestFactory();
-
- StreamedRequestFactory getStreamedRequestFactory();
-
- InvokeRequestFactory<?, ?, ?, ?, ?, ?, ?, ?> getInvokeRequestFactory();
-
- BatchRequestFactory getBatchRequestFactory();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java
deleted file mode 100644
index 721cd0d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-public final class ODataClientFactory {
-
- public static ODataV3Client getV3() {
- return new ODataV3Client();
- }
-
- public static ODataV4Client getV4() {
- return new ODataV4Client();
- }
-
- private ODataClientFactory() {
- // empty constructory for static utility class
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java
deleted file mode 100644
index 7cabdb2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.V3BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.V3CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.V3InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.V3RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.V3StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataBinderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataReaderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataWriterImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataDeserializerImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataObjectFactoryImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataSerializerImpl;
-import com.msopentech.odatajclient.engine.uri.V3URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.V3FilterFactory;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-
-public class ODataV3Client extends AbstractODataClient {
-
- private static final long serialVersionUID = -1655712193243609209L;
-
- private final V3Configuration configuration = new V3Configuration();
-
- private final V3FilterFactory filterFactory = new V3FilterFactory();
-
- private final ODataDeserializerImpl deserializer = new ODataDeserializerImpl(this);
-
- private final ODataSerializerImpl serializer = new ODataSerializerImpl(this);
-
- private final ODataReaderImpl reader = new ODataReaderImpl(this);
-
- private final ODataWriterImpl writer = new ODataWriterImpl(this);
-
- private final ODataBinderImpl binder = new ODataBinderImpl(this);
-
- private final ODataObjectFactoryImpl objectFactory = new ODataObjectFactoryImpl(this);
-
- private final V3RetrieveRequestFactory retrieveReqFact = new V3RetrieveRequestFactory(this);
-
- private final V3CUDRequestFactory cudReqFact = new V3CUDRequestFactory(this);
-
- private final V3StreamedRequestFactory streamedReqFact = new V3StreamedRequestFactory(this);
-
- private final V3InvokeRequestFactory invokeReqFact = new V3InvokeRequestFactory(this);
-
- private final V3BatchRequestFactory batchReqFact = new V3BatchRequestFactory(this);
-
- @Override
- public ODataVersion getWorkingVersion() {
- return ODataVersion.V3;
- }
-
- @Override
- public ODataHeaders getVersionHeaders() {
- final ODataHeaders odataHeaders = new ODataHeaders();
- odataHeaders.setHeader(ODataHeaders.HeaderName.minDataServiceVersion, ODataVersion.V3.toString());
- odataHeaders.setHeader(ODataHeaders.HeaderName.maxDataServiceVersion, ODataVersion.V3.toString());
- odataHeaders.setHeader(ODataHeaders.HeaderName.dataServiceVersion, ODataVersion.V3.toString());
- return odataHeaders;
- }
-
- @Override
- public V3Configuration getConfiguration() {
- return configuration;
- }
-
- @Override
- public V3URIBuilder getURIBuilder(final String serviceRoot) {
- return new V3URIBuilder(configuration, serviceRoot);
- }
-
- @Override
- public V3FilterFactory getFilterFactory() {
- return filterFactory;
- }
-
- @Override
- public ODataDeserializerImpl getDeserializer() {
- return deserializer;
- }
-
- @Override
- public ODataSerializerImpl getSerializer() {
- return serializer;
- }
-
- @Override
- public ODataReaderImpl getReader() {
- return reader;
- }
-
- @Override
- public ODataWriterImpl getWriter() {
- return writer;
- }
-
- @Override
- public ODataBinderImpl getBinder() {
- return binder;
- }
-
- @Override
- public ODataObjectFactoryImpl getObjectFactory() {
- return objectFactory;
- }
-
- @Override
- public V3RetrieveRequestFactory getRetrieveRequestFactory() {
- return retrieveReqFact;
- }
-
- @Override
- public V3CUDRequestFactory getCUDRequestFactory() {
- return cudReqFact;
- }
-
- @Override
- public V3StreamedRequestFactory getStreamedRequestFactory() {
- return streamedReqFact;
- }
-
- @Override
- public V3InvokeRequestFactory getInvokeRequestFactory() {
- return invokeReqFact;
- }
-
- @Override
- public V3BatchRequestFactory getBatchRequestFactory() {
- return batchReqFact;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java
deleted file mode 100644
index d27177c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.V4BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.V4CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.V4InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.V4RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.V4StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataBinderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataReaderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataWriterImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataDeserializerImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataObjectFactoryImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataSerializerImpl;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.uri.V4URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.V4FilterFactory;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-
-public class ODataV4Client extends AbstractODataClient {
-
- private static final long serialVersionUID = -6653176125573631964L;
-
- private final V4Configuration configuration = new V4Configuration();
-
- private final V4FilterFactory filterFactory = new V4FilterFactory();
-
- private final ODataDeserializerImpl deserializer = new ODataDeserializerImpl(this);
-
- private final ODataSerializerImpl serializer = new ODataSerializerImpl(this);
-
- private final ODataReaderImpl reader = new ODataReaderImpl(this);
-
- private final ODataWriterImpl writer = new ODataWriterImpl(this);
-
- private final ODataBinderImpl binder = new ODataBinderImpl(this);
-
- private final ODataObjectFactoryImpl objectFactory = new ODataObjectFactoryImpl(this);
-
- private final V4RetrieveRequestFactory retrieveReqFact = new V4RetrieveRequestFactory(this);
-
- private final V4CUDRequestFactory cudReqFact = new V4CUDRequestFactory(this);
-
- private final V4StreamedRequestFactory streamedReqFact = new V4StreamedRequestFactory(this);
-
- private final V4InvokeRequestFactory invokeReqFact = new V4InvokeRequestFactory(this);
-
- private final V4BatchRequestFactory batchReqFact = new V4BatchRequestFactory(this);
-
- @Override
- public ODataVersion getWorkingVersion() {
- return ODataVersion.V4;
- }
-
- @Override
- public ODataHeaders getVersionHeaders() {
- final ODataHeaders odataHeaders = new ODataHeaders();
- odataHeaders.setHeader(ODataHeaders.HeaderName.maxDataServiceVersion, ODataVersion.V4.toString());
- odataHeaders.setHeader(ODataHeaders.HeaderName.dataServiceVersion, ODataVersion.V4.toString());
- return odataHeaders;
- }
-
- @Override
- public V4Configuration getConfiguration() {
- return configuration;
- }
-
- @Override
- public URIBuilder getURIBuilder(final String serviceRoot) {
- return new V4URIBuilder(configuration, serviceRoot);
- }
-
- @Override
- public V4FilterFactory getFilterFactory() {
- return filterFactory;
- }
-
- @Override
- public ODataDeserializerImpl getDeserializer() {
- return deserializer;
- }
-
- @Override
- public ODataSerializerImpl getSerializer() {
- return serializer;
- }
-
- @Override
- public ODataReaderImpl getReader() {
- return reader;
- }
-
- @Override
- public ODataWriterImpl getWriter() {
- return writer;
- }
-
- @Override
- public ODataBinderImpl getBinder() {
- return binder;
- }
-
- @Override
- public ODataObjectFactoryImpl getObjectFactory() {
- return objectFactory;
- }
-
- @Override
- public V4RetrieveRequestFactory getRetrieveRequestFactory() {
- return retrieveReqFact;
- }
-
- @Override
- public V4CUDRequestFactory getCUDRequestFactory() {
- return cudReqFact;
- }
-
- @Override
- public V4StreamedRequestFactory getStreamedRequestFactory() {
- return streamedReqFact;
- }
-
- @Override
- public V4InvokeRequestFactory getInvokeRequestFactory() {
- return invokeReqFact;
- }
-
- @Override
- public V4BatchRequestFactory getBatchRequestFactory() {
- return batchReqFact;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java
deleted file mode 100644
index e4e0564..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-public class V3Configuration extends AbstractConfiguration {
-
- private static final long serialVersionUID = -8719958537946884777L;
-
- protected V3Configuration() {
- super();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java
deleted file mode 100644
index 1685e13..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client;
-
-public class V4Configuration extends AbstractConfiguration {
-
- private static final long serialVersionUID = -1134213707190176857L;
-
- protected V4Configuration() {
- super();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java
deleted file mode 100644
index 590f9e2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-/**
- * Base implementation for working with Basic Authentication: needs to be subclassed in order to provide actual username
- * and password.
- */
-public abstract class AbstractBasicAuthHttpClientFactory extends DefaultHttpClientFactory {
-
- private static final long serialVersionUID = 7985626503125490244L;
-
- protected abstract String getUsername();
-
- protected abstract String getPassword();
-
- @Override
- public HttpClient createHttpClient(final HttpMethod method, final URI uri) {
- final DefaultHttpClient httpclient = (DefaultHttpClient) super.createHttpClient(method, uri);
-
- httpclient.getCredentialsProvider().setCredentials(
- new AuthScope(uri.getHost(), uri.getPort()),
- new UsernamePasswordCredentials(getUsername(), getPassword()));
-
- return httpclient;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java
deleted file mode 100644
index b32fbf3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.NTCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-/**
- * Base implementation for working with NTLM Authentication via embedded HttpClient features: needs to be subclassed
- * in order to provide all needed login information.
- * <br/>
- * External NTLM engine such as <a href="http://jcifs.samba.org/">JCIFS</a> library developed by the
- * <a href="http://www.samba.org/">Samba</a> project as a part of their Windows interoperability suite of programs.
- *
- * @see NTCredentials
- * @see http://hc.apache.org/httpcomponents-client-ga/ntlm.html#Using_Samba_JCIFS_as_an_alternative_NTLM_engine
- */
-public abstract class AbstractNTLMAuthHttpClientFactory extends DefaultHttpClientFactory {
-
- protected abstract String getUsername();
-
- protected abstract String getPassword();
-
- protected abstract String getWorkstation();
-
- protected abstract String getDomain();
-
- @Override
- public HttpClient createHttpClient(final HttpMethod method, final URI uri) {
- final DefaultHttpClient httpclient = (DefaultHttpClient) super.createHttpClient(method, uri);
-
- final CredentialsProvider credsProvider = new BasicCredentialsProvider();
- credsProvider.setCredentials(AuthScope.ANY,
- new NTCredentials(getUsername(), getPassword(), getWorkstation(), getDomain()));
-
- httpclient.setCredentialsProvider(credsProvider);
-
- return httpclient;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java
deleted file mode 100644
index 8ed3040..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.io.Serializable;
-import java.net.URI;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-/**
- * Default implementation returning HttpClients with default parameters.
- */
-public class DefaultHttpClientFactory implements HttpClientFactory, Serializable {
-
- private static final long serialVersionUID = -2461355444507227332L;
-
- @Override
- public HttpClient createHttpClient(final HttpMethod method, final URI uri) {
- return new DefaultHttpClient();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java
deleted file mode 100644
index c469ef9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * Default implementation returning default HttpUriRequest implementations.
- */
-public class DefaultHttpUriRequestFactory implements HttpUriRequestFactory {
-
- @Override
- public HttpUriRequest createHttpUriRequest(final HttpMethod method, final URI uri) {
- HttpUriRequest result;
-
- switch (method) {
- case POST:
- result = new HttpPost(uri);
- break;
-
- case PUT:
- result = new HttpPut(uri);
- break;
-
- case PATCH:
- result = new HttpPatch(uri);
- break;
-
- case MERGE:
- result = new HttpMerge(uri);
- break;
-
- case DELETE:
- result = new HttpDelete(uri);
- break;
-
- case GET:
- default:
- result = new HttpGet(uri);
- break;
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java
deleted file mode 100644
index 1642000..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-/**
- * A client-side processing runtime exception.
- *
- * The exception is thrown during HTTP request invocation processing,
- * to signal a failure to process the HTTP request or response. The exception
- * message or nested {@link Throwable} cause SHOULD contain additional information
- * about the reason of the processing failure.
- */
-public class HttpClientException extends RuntimeException {
-
- private static final long serialVersionUID = -4232431597816056514L;
-
- /**
- * Constructs a new client-side runtime exception with the specified cause
- * and a detail message of {@code (cause==null ? null : cause.toString())}
- * (which typically contains the class and detail message of {@code cause}).
- * This constructor is useful for runtime exceptions that are little more
- * than wrappers for other throwables.
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A {@code null} value is permitted,
- * and indicates that the cause is nonexistent or unknown.)
- */
- public HttpClientException(final Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a new client-side runtime exception with the specified detail
- * message and cause.
- * <p/>
- * Note that the detail message associated with {@code cause} is <i>not</i>
- * automatically incorporated in this runtime exception's detail message.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A {@code null} value is permitted,
- * and indicates that the cause is nonexistent or unknown.)
- */
- public HttpClientException(final String message, final Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Constructs a new client-side runtime exception with the specified detail
- * message. The cause is not initialized, and may subsequently be initialized
- * by a call to {@link #initCause}.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- */
- public HttpClientException(final String message) {
- super(message);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java
deleted file mode 100644
index 53d4a5b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.client.HttpClient;
-
-/**
- * Interface used by ODataRequest implementations to instantiate HttpClient.
- */
-public interface HttpClientFactory {
-
- HttpClient createHttpClient(HttpMethod method, URI uri);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java
deleted file mode 100644
index 0ce7fd9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * Class identifying MERGE HTTP method.
- */
-@NotThreadSafe
-public class HttpMerge extends HttpEntityEnclosingRequestBase {
-
- public final static String METHOD_NAME = "MERGE";
-
- /**
- * Constructor.
- */
- public HttpMerge() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- */
- public HttpMerge(final URI uri) {
- super();
- setURI(uri);
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- * @throws IllegalArgumentException if the uri is invalid.
- */
- public HttpMerge(final String uri) {
- super();
- setURI(URI.create(uri));
- }
-
- /**
- * Gets HTTP method name.
- *
- * @return HTTP method name.
- */
- @Override
- public String getMethod() {
- return METHOD_NAME;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java
deleted file mode 100644
index 1dde334..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-/**
- * Supported HTTP methods.
- */
-public enum HttpMethod {
-
- GET,
- POST,
- PUT,
- PATCH,
- MERGE,
- DELETE;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java
deleted file mode 100644
index 13bb077..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * Class identifying PATCH HTTP method.
- */
-@NotThreadSafe
-public class HttpPatch extends HttpEntityEnclosingRequestBase {
-
- public final static String METHOD_NAME = "PATCH";
-
- /**
- * Constructor.
- */
- public HttpPatch() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- */
- public HttpPatch(final URI uri) {
- super();
- setURI(uri);
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- * @throws IllegalArgumentException if the uri is invalid.
- */
- public HttpPatch(final String uri) {
- super();
- setURI(URI.create(uri));
- }
-
- /**
- * Gets HTTP method name.
- *
- * @return HTTP method name.
- */
- @Override
- public String getMethod() {
- return METHOD_NAME;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java
deleted file mode 100644
index d28ba13..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * Interface used by ODataRequest implementations to create the HttpUriRequest.
- */
-public interface HttpUriRequestFactory {
-
- HttpUriRequest createHttpUriRequest(HttpMethod method, URI uri);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java
deleted file mode 100644
index 0501f83..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.client.http;
-
-import org.apache.http.HttpStatus;
-
-/**
- * Exception to be thrown when trying to read content with HTTP status 204.
- */
-public class NoContentException extends HttpClientException {
-
- private static final long serialVersionUID = 7947066635285809192L;
-
- /**
- * Constructs a new client-side runtime exception, with fixed message.
- */
- public NoContentException() {
- super("No content found when HTTP status is " + HttpStatus.SC_NO_CONTENT);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java
deleted file mode 100644
index b26d9a4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.communication;
-
-import com.msopentech.odatajclient.engine.data.ODataError;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Collections;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.StatusLine;
-
-/**
- * Represents a client error in OData.
- *
- * @see ODataError
- */
-public class ODataClientErrorException extends RuntimeException {
-
- private static final long serialVersionUID = -2551523202755268162L;
-
- private final StatusLine statusLine;
-
- private final ODataError error;
-
- /**
- * Constructor.
- *
- * @param statusLine request status info.
- */
- public ODataClientErrorException(final StatusLine statusLine) {
- super(statusLine.toString());
-
- this.statusLine = statusLine;
- this.error = null;
- }
-
- /**
- * Constructor.
- *
- * @param statusLine request status info.
- * @param error OData error to be wrapped.
- */
- public ODataClientErrorException(final StatusLine statusLine, final ODataError error) {
- super((StringUtils.isBlank(error.getCode()) ? StringUtils.EMPTY : "(" + error.getCode() + ") ")
- + error.getMessageValue() + " [" + statusLine.toString() + "]");
-
- this.statusLine = statusLine;
- this.error = error;
-
- if (this.error.getInnerErrorType() != null && this.error.getInnerErrorMessage() != null) {
- final RuntimeException cause =
- new RuntimeException(this.error.getInnerErrorType() + ": " + this.error.getInnerErrorMessage());
-
- if (this.error.getInnerErrorStacktrace() != null) {
- List<String> stLines;
- try {
- stLines = IOUtils.readLines(new StringReader(this.error.getInnerErrorStacktrace()));
- } catch (IOException e) {
- stLines = Collections.<String>emptyList();
- }
- StackTraceElement[] stElements = new StackTraceElement[stLines.size()];
- for (int i = 0; i < stLines.size(); i++) {
- final String stLine = stLines.get(i).substring(stLines.get(i).indexOf("at ") + 3);
- final int lastDotPos = stLine.lastIndexOf('.');
- stElements[i] = new StackTraceElement(
- stLine.substring(0, lastDotPos), stLine.substring(lastDotPos + 1), null, 0);
- }
- cause.setStackTrace(stElements);
- }
-
- initCause(cause);
- }
- }
-
- /**
- * Gets request status info.
- *
- * @return request status info.
- */
- public StatusLine getStatusLine() {
- return statusLine;
- }
-
- /**
- * Gets OData error.
- *
- * @return OData error.
- */
- public ODataError getODataError() {
- return error;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java
deleted file mode 100644
index df5ca57..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.communication;
-
-import org.apache.http.StatusLine;
-
-/**
- * Represents a server error in OData.
- */
-public class ODataServerErrorException extends RuntimeException {
-
- private static final long serialVersionUID = -6423014532618680135L;
-
- /**
- * Constructor.
- *
- * @param statusLine request status info.
- */
- public ODataServerErrorException(final StatusLine statusLine) {
- super(statusLine.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java
deleted file mode 100644
index b449e40..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.communication.header;
-
-/**
- * Constant header values class.
- */
-public class ODataHeaderValues {
-
- /**
- * <code>Prefer</code> header, return content.
- *
- * @see ODataHeaders.HeaderName#prefer
- */
- public static final String preferReturnContent = "return-content";
-
- /**
- * <code>Prefer</code> header, return no content.
- *
- * @see ODataHeaders.HeaderName#prefer
- */
- public static final String preferReturnNoContent = "return-no-content";
-
- /**
- * @see ODataHeaders.HeaderName#dataServiceUrlConventions
- */
- public static final String keyAsSegment = "KeyAsSegment";
-
-}