You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/05/18 07:06:41 UTC
[13/38] git commit: Run code clean up (again)
Run code clean up (again)
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/c8cdf378
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/c8cdf378
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/c8cdf378
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: c8cdf3785facd2f9aad529bab4e90f5fdabf445e
Parents: f6ffb05
Author: Michael Bolz <mi...@apache.org>
Authored: Wed Mar 26 13:31:13 2014 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Wed Mar 26 13:31:13 2014 +0100
----------------------------------------------------------------------
.../core/edm/AnnotationEdmProvider.java | 62 ++++++++++----------
.../core/edm/AnnotationEdmProviderTest.java | 2 +-
.../processor/ref/EntryJsonCreateTest.java | 16 ++---
.../olingo/odata2/api/ep/EntityProvider.java | 8 +--
.../olingo/odata2/core/ODataContextImpl.java | 2 +-
.../core/ep/consumer/JsonEntryConsumer.java | 4 +-
.../ep/consumer/JsonErrorDocumentConsumer.java | 13 ++--
.../ep/consumer/XmlErrorDocumentConsumer.java | 9 +--
.../core/servlet/ODataExceptionWrapper.java | 2 +-
.../olingo/odata2/core/servlet/RestUtil.java | 18 +++---
.../consumer/XmlErrorDocumentConsumerTest.java | 56 +++++++++---------
.../BasicContentNegotiationTest.java | 2 +-
.../odata2/testutil/fit/AbstractFitTest.java | 4 +-
.../odata2/testutil/server/TestServer.java | 28 ++++-----
14 files changed, 115 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
index 984a677..9c46da2 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
@@ -497,37 +497,37 @@ public class AnnotationEdmProvider extends EdmProvider {
return navProp;
}
- // private EdmSimpleTypeKind getEdmSimpleType(Class<?> type) {
- // if (type == String.class) {
- // return EdmType.String;
- // } else if (type == boolean.class || type == Boolean.class) {
- // return EdmType.Boolean;
- // } else if (type == byte.class || type == Byte.class) {
- // return EdmType.SByte;
- // } else if (type == short.class || type == Short.class) {
- // return EdmType.Int16;
- // } else if (type == int.class || type == Integer.class) {
- // return EdmType.Int32;
- // } else if (type == long.class || type == Long.class) {
- // return EdmType.Int64;
- // } else if (type == double.class || type == Double.class) {
- // return EdmType.Double;
- // } else if (type == float.class || type == Float.class) {
- // return EdmType.Single;
- // } else if (type == BigInteger.class || type == BigDecimal.class) {
- // return EdmType.Decimal;
- // } else if (type == Byte[].class || type == byte[].class) {
- // return EdmType.Binary;
- // } else if (type == Date.class) {
- // return EdmType.DateTime;
- // } else if (type == Calendar.class) {
- // return EdmType.DateTimeOffset;
- // } else if (type == UUID.class) {
- // return EdmType.Guid;
- // } else {
- // throw new UnsupportedOperationException("Not yet supported type '" + type + "'.");
- // }
- // }
+ // private EdmSimpleTypeKind getEdmSimpleType(Class<?> type) {
+ // if (type == String.class) {
+ // return EdmType.String;
+ // } else if (type == boolean.class || type == Boolean.class) {
+ // return EdmType.Boolean;
+ // } else if (type == byte.class || type == Byte.class) {
+ // return EdmType.SByte;
+ // } else if (type == short.class || type == Short.class) {
+ // return EdmType.Int16;
+ // } else if (type == int.class || type == Integer.class) {
+ // return EdmType.Int32;
+ // } else if (type == long.class || type == Long.class) {
+ // return EdmType.Int64;
+ // } else if (type == double.class || type == Double.class) {
+ // return EdmType.Double;
+ // } else if (type == float.class || type == Float.class) {
+ // return EdmType.Single;
+ // } else if (type == BigInteger.class || type == BigDecimal.class) {
+ // return EdmType.Decimal;
+ // } else if (type == Byte[].class || type == byte[].class) {
+ // return EdmType.Binary;
+ // } else if (type == Date.class) {
+ // return EdmType.DateTime;
+ // } else if (type == Calendar.class) {
+ // return EdmType.DateTimeOffset;
+ // } else if (type == UUID.class) {
+ // return EdmType.Guid;
+ // } else {
+ // throw new UnsupportedOperationException("Not yet supported type '" + type + "'.");
+ // }
+ // }
private EdmType getEdmType(final Class<?> type) {
if (type == String.class) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
index 84e9192..30c87bb 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
@@ -359,7 +359,7 @@ public class AnnotationEdmProviderTest {
PropertyRef imageFormat = getPropertyRef(keyReferences, "ImageFormat");
assertEquals("ImageFormat", imageFormat.getName());
- // assertEquals(0, photo.getNavigationProperties().size());
+ // assertEquals(0, photo.getNavigationProperties().size());
assertNull(photo.getNavigationProperties());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
index 90b0384..b661d77 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/EntryJsonCreateTest.java
@@ -137,14 +137,14 @@ public class EntryJsonCreateTest extends AbstractRefJsonTest {
private static final String JSON_EMPLOYEE = "{" +
" \"d\": {" +
- // " \"__metadata\": {" +
- // " \"id\": \"http://localhost:19000/abc/EntryJsonCreateTest/Employees('1')\"," +
- // " \"uri\": \"http://localhost:19000/abc/EntryJsonCreateTest/Employees('1')\"," +
- // " \"type\": \"RefScenario.Employee\"," +
- // " \"content_type\": \"application/octet-stream\"," +
- // " \"media_src\": \"Employees('1')/$value\"," +
- // " \"edit_media\": \"http://localhost:19000/abc/EntryJsonCreateTest/Employees('1')/$value\"" +
- // " }," +
+ // " \"__metadata\": {" +
+ // " \"id\": \"http://localhost:19000/abc/EntryJsonCreateTest/Employees('1')\"," +
+ // " \"uri\": \"http://localhost:19000/abc/EntryJsonCreateTest/Employees('1')\"," +
+ // " \"type\": \"RefScenario.Employee\"," +
+ // " \"content_type\": \"application/octet-stream\"," +
+ // " \"media_src\": \"Employees('1')/$value\"," +
+ // " \"edit_media\": \"http://localhost:19000/abc/EntryJsonCreateTest/Employees('1')/$value\"" +
+ // " }," +
" \"EmployeeId\": \"1\"," +
" \"EmployeeName\": \"Douglas\"," +
" \"Age\": 42," +
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
index b43e448..f989d4a 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
@@ -424,7 +424,7 @@ public final class EntityProvider {
/**
* Read (de-serialize) data from error document as {@link InputStream} and provide according
* {@link ODataErrorContext}.
- *
+ *
* @param errorDocument error document which is read
* @param contentType format of content in the given input stream
* @return read error document
@@ -811,9 +811,9 @@ public final class EntityProvider {
}
/**
- * Read (de-serialize) data from error document as {@link InputStream} and provide according
- * {@link ODataErrorContext}.
- *
+ * Read (de-serialize) data from error document as {@link InputStream} and provide according {@link ODataErrorContext}
+ * .
+ *
* @param errorDocument error document which is read
* @param contentType format of content in the given input stream
* @return read error document
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
index 3a75f73..d38664e 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
import org.apache.olingo.odata2.core.debug.ODataDebugResponseWrapper;
/**
- * Context.
+ * Context.
*/
public class ODataContextImpl implements ODataContext {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
index 9f452e4..11350b1 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
@@ -133,8 +133,8 @@ public class JsonEntryConsumer {
/**
* Ensure that instance field {@link #resultEntry} exists.
- * If it not already exists create an instance (as well as all other necessary objects like:
- * {@link #properties}, {@link #mediaMetadata}, {@link #entryMetadata}, {@link #expandSelectTree}).
+ * If it not already exists create an instance (as well as all other necessary objects like: {@link #properties},
+ * {@link #mediaMetadata}, {@link #entryMetadata}, {@link #expandSelectTree}).
*/
private void ensureODataEntryExists() {
if (resultEntry == null) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumer.java
index 3b065d0..9348b2a 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumer.java
@@ -6,9 +6,9 @@
* 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
@@ -40,7 +40,8 @@ import com.google.gson.stream.JsonToken;
public class JsonErrorDocumentConsumer {
/** Default used charset for reader */
private static final String DEFAULT_CHARSET = "UTF-8";
- /** Map containing language code (language - country) to Locale mapping
+ /**
+ * Map containing language code (language - country) to Locale mapping
* based on Locale.getAvailableLocales()
* */
private final static Map<String, Locale> AVAILABLE_LOCALES = new HashMap<String, Locale>();
@@ -53,7 +54,7 @@ public class JsonErrorDocumentConsumer {
/**
* Deserialize / read OData error document in ODataErrorContext.
- *
+ *
* @param errorDocument OData error document in JSON format
* @return created ODataErrorContext based on input stream content.
* @throws EntityProviderException if an exception during read / deserialization occurs.
@@ -130,7 +131,7 @@ public class JsonErrorDocumentConsumer {
String innerError = reader.nextString();
errorContext.setInnerError(innerError);
// implementation for OData v2 Section 2.2.8.1.2 JSON Error Response
- // (RFC4627 Section 2.2 -> https://www.ietf.org/rfc/rfc4627.txt))
+ // (RFC4627 Section 2.2 -> https://www.ietf.org/rfc/rfc4627.txt))
// currently not provided
}
@@ -176,7 +177,7 @@ public class JsonErrorDocumentConsumer {
/**
* Read the string value from the JsonReader or 'null' if no value is available.
- *
+ *
* @param reader to read from
* @return the string value or 'null'
* @throws IOException if an exception occurs
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumer.java
index e69f896..d584951 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumer.java
@@ -6,9 +6,9 @@
* 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
@@ -38,7 +38,8 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
* Consuming (read / deserialization) for OData error document in XML format.
*/
public class XmlErrorDocumentConsumer {
- /** Map containing language code (language - country) to Locale mapping
+ /**
+ * Map containing language code (language - country) to Locale mapping
* based on Locale.getAvailableLocales()
* */
private final static Map<String, Locale> AVAILABLE_LOCALES = new HashMap<String, Locale>();
@@ -51,7 +52,7 @@ public class XmlErrorDocumentConsumer {
/**
* Deserialize / read OData error document in ODataErrorContext.
- *
+ *
* @param errorDocument OData error document in XML format
* @return created ODataErrorContext based on input stream content.
* @throws EntityProviderException if an exception during read / deserialization occurs.
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
index 643e03d..7edd411 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
@@ -84,7 +84,7 @@ public class ODataExceptionWrapper {
ODataResponse oDataResponse;
// if (callback != null) {
- // oDataResponse = handleErrorCallback(callback);
+ // oDataResponse = handleErrorCallback(callback);
// } else {
oDataResponse = EntityProvider.writeErrorDocument(errorContext);
// }
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
index 3339723..e5b5555 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
@@ -49,17 +49,17 @@ import org.apache.olingo.odata2.core.commons.Decoder;
public class RestUtil {
private static final String REG_EX_OPTIONAL_WHITESPACE = "\\s?";
- //RFC 2616, 3.9: qvalue = ("0"["." 0*3DIGIT]) | ("1"["." 0*3("0")])
+ // RFC 2616, 3.9: qvalue = ("0"["." 0*3DIGIT]) | ("1"["." 0*3("0")])
private static final String REG_EX_QVALUE = "q=((?:1(?:\\.0{0,3})?)|(?:0(?:\\.[0-9]{0,3})?))";
- //RFC 2616, 14.1: the media-range parameters
+ // RFC 2616, 14.1: the media-range parameters
private static final String REG_EX_PARAMETER = "(?:;\\s*(?:(?:[^qQ].*)|(?:[qQ]\\s*=\\s*(?:[^01].*))))*";
private static final Pattern REG_EX_ACCEPT =
Pattern.compile("([a-z\\*\\s]+/[a-zA-Z\\+\\*\\-=\\s]+" + REG_EX_PARAMETER + ")");
private static final Pattern REG_EX_ACCEPT_WITH_Q_FACTOR =
Pattern.compile(REG_EX_ACCEPT + "(?:" + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QVALUE + ")?");
- //RFC 2616, 14.4: language-range = ((1*8ALPHA *("-" 1*8ALPHA)) | "*")
+ // RFC 2616, 14.4: language-range = ((1*8ALPHA *("-" 1*8ALPHA)) | "*")
private static final Pattern REG_EX_ACCEPT_LANGUAGES =
Pattern.compile("((?:\\*)|(?:[a-z]{1,8}(?:\\-[a-zA-Z]{1,8})?))");
private static final Pattern REG_EX_ACCEPT_LANGUAGES_WITH_Q_FACTOR =
@@ -85,12 +85,12 @@ public class RestUtil {
}
/*
- * Parses query parameters.
+ * Parses query parameters.
*/
public static Map<String, String> extractQueryParameters(final String queryString) {
Map<String, String> queryParametersMap = new HashMap<String, String>();
if (queryString != null) {
- //At first the queryString will be decoded.
+ // At first the queryString will be decoded.
List<String> queryParameters = Arrays.asList(Decoder.decode(queryString).split("\\&"));
for (String param : queryParameters) {
int indexOfEqualSign = param.indexOf("=");
@@ -105,7 +105,7 @@ public class RestUtil {
}
/*
- * Parses Accept-Language header. Returns a list sorted by quality parameter
+ * Parses Accept-Language header. Returns a list sorted by quality parameter
*/
public static List<Locale> extractAcceptableLanguage(final String acceptableLanguageHeader) {
List<Locale> acceptLanguages = new ArrayList<Locale>();
@@ -123,7 +123,7 @@ public class RestUtil {
}
for (Accept accept : acceptTree) {
String languageRange = accept.getValue();
- //The languageRange has to be splitted in language tag and country tag
+ // The languageRange has to be splitted in language tag and country tag
int indexOfMinus = languageRange.indexOf("-");
Locale locale;
if (indexOfMinus < 0) {
@@ -140,7 +140,7 @@ public class RestUtil {
}
/*
- * Parses Accept header. Returns a list of media ranges sorted by quality parameter
+ * Parses Accept header. Returns a list of media ranges sorted by quality parameter
*/
public static List<String> extractAcceptHeaders(final String acceptHeader) {
TreeSet<Accept> acceptTree = getAcceptTree();
@@ -347,7 +347,7 @@ public class RestUtil {
/*
* The class is used in order to sort headers by "q" parameter.
- * The object of this class contains a value of the Accept header or Accept-Language header and value of the
+ * The object of this class contains a value of the Accept header or Accept-Language header and value of the
* quality parameter.
*/
private static class Accept {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
index 4106bcd..55ceb1d 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
@@ -18,15 +18,18 @@
******************************************************************************/
package org.apache.olingo.odata2.core.ep.consumer;
-import org.apache.olingo.odata2.api.ep.EntityProviderException;
-import org.apache.olingo.odata2.api.processor.ODataErrorContext;
-import org.apache.olingo.odata2.testutil.helper.StringHelper;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.InputStream;
import java.util.Locale;
-import static org.junit.Assert.*;
+import org.apache.olingo.odata2.api.ep.EntityProviderException;
+import org.apache.olingo.odata2.api.processor.ODataErrorContext;
+import org.apache.olingo.odata2.testutil.helper.StringHelper;
+import org.junit.Test;
/**
*
@@ -34,33 +37,33 @@ import static org.junit.Assert.*;
public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
private static final String XML_ERROR_DOCUMENT_SIMPLE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
+ "\t<code>ErrorCode</code>\n" +
+ "\t<message xml:lang=\"en-US\">Message</message>\n" +
+ "</error>";
private static final String XML_ERROR_DOCUMENT_NULL_LOCALE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"\">Message</message>\n" +
- "</error>";
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
+ "\t<code>ErrorCode</code>\n" +
+ "\t<message xml:lang=\"\">Message</message>\n" +
+ "</error>";
private static final String XML_ERROR_DOCUMENT_INNER_ERROR =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<code>ErrorCode</code>\n" +
"\t<message xml:lang=\"en-US\">Message</message>\n" +
"<innererror>Some InnerError</innererror>\n" +
"</error>";
private static final String XML_ERROR_DOCUMENT_INVALID_XML =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<code>ErrorCode</CODE>\n" +
"\t<message xml:lang=\"en-US\">Message</message>\n" +
"</error>";
/* error document with name 'locale' instead of 'lang' for message object */
private static final String XML_ERROR_DOCUMENT_UNKNOWN_CONTENT =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<code>ErrorCode</code>\n" +
"\t<message xml:locale=\"en-US\">Message</message>\n" +
@@ -68,23 +71,23 @@ public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
"</error>";
/* error document without value for message object */
private static final String XML_ERROR_DOCUMENT_EMPTY_MESSAGE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<code>ErrorCode</code>\n" +
"\t<message xml:lang=\"en-US\" />\n" +
"</error>";
private static final String XML_ERROR_DOCUMENT_MISSING_MESSAGE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<code>ErrorCode</code>\n" +
"</error>";
private static final String XML_ERROR_DOCUMENT_MISSING_CODE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<message xml:lang=\"en-US\">Message</message>\n" +
"</error>";
private static final String XML_ERROR_DOCUMENT_MISSING_ERROR =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
+ "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<errorForMe xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
"\t<code>ErrorCode</code>\n" +
"\t<message xml:lang=\"en-US\">Message</message>\n" +
@@ -125,7 +128,6 @@ public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
assertNull("Expected NULL for locale", error.getLocale());
}
-
@Test
public void innerError() throws Exception {
InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR);
@@ -157,7 +159,7 @@ public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
fail("Expected exception was not thrown");
} catch (EntityProviderException e) {
assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.INVALID_STATE, e.getMessageReference());
+ EntityProviderException.INVALID_STATE, e.getMessageReference());
throw e;
}
}
@@ -193,7 +195,7 @@ public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
fail("Expected exception was not thrown");
} catch (EntityProviderException e) {
assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.INVALID_STATE, e.getMessageReference());
+ EntityProviderException.INVALID_STATE, e.getMessageReference());
throw e;
}
}
@@ -206,7 +208,7 @@ public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
fail("Expected exception was not thrown");
} catch (EntityProviderException e) {
assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
assertTrue(e.getMessage().contains("code"));
throw e;
}
@@ -220,7 +222,7 @@ public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
fail("Expected exception was not thrown");
} catch (EntityProviderException e) {
assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
assertTrue(e.getMessage().contains("message"));
throw e;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
index 8533e42..a8315bd 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/BasicContentNegotiationTest.java
@@ -197,7 +197,7 @@ public class BasicContentNegotiationTest extends AbstractContentNegotiationTest
final HttpResponse response = new DefaultHttpClient().execute(get);
final String contentType = response.getFirstHeader(HttpHeaders.CONTENT_TYPE).getValue();
- // assertEquals(expectedResponseContentType, contentType);
+ // assertEquals(expectedResponseContentType, contentType);
try {
assertEquals(ContentType.APPLICATION_XML, ContentType.create(contentType));
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
index 7345c84..6134fe8 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
@@ -62,8 +62,8 @@ public abstract class AbstractFitTest extends BaseTest {
return Arrays.asList(a);
}
- // public AbstractFitTest() {
- // }
+ // public AbstractFitTest() {
+ // }
protected URI getEndpoint() {
return server.getEndpoint();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/c8cdf378/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
index 87e57ca..3e2c097 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
@@ -154,22 +154,22 @@ public class TestServer {
return contextHandler;
}
- // private ServletContextHandler createODataContextHandler(final Class<? extends ODataServiceFactory> factoryClass)
- // throws InstantiationException, IllegalAccessException, ClassNotFoundException {
- // String odataServlet = "org.apache.olingo.odata2.core.servlet.ODataServlet";
- // final HttpServlet httpServlet = (HttpServlet) Class.forName(odataServlet).newInstance();
- // final ServletHolder odataServletHolder = new ServletHolder(httpServlet);
- // odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
+ // private ServletContextHandler createODataContextHandler(final Class<? extends ODataServiceFactory> factoryClass)
+ // throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ // String odataServlet = "org.apache.olingo.odata2.core.servlet.ODataServlet";
+ // final HttpServlet httpServlet = (HttpServlet) Class.forName(odataServlet).newInstance();
+ // final ServletHolder odataServletHolder = new ServletHolder(httpServlet);
+ // odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
//
- // if (pathSplit > 0) {
- // odataServletHolder.setInitParameter(ODataServiceFactory.PATH_SPLIT_LABEL, Integer.toString(pathSplit));
- // }
+ // if (pathSplit > 0) {
+ // odataServletHolder.setInitParameter(ODataServiceFactory.PATH_SPLIT_LABEL, Integer.toString(pathSplit));
+ // }
//
- // final ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
- // contextHandler.setContextPath("/abc");
- // contextHandler.addServlet(odataServletHolder, path + "/*");
- // return contextHandler;
- // }
+ // final ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ // contextHandler.setContextPath("/abc");
+ // contextHandler.addServlet(odataServletHolder, path + "/*");
+ // return contextHandler;
+ // }
public void startServer(final ODataService service) {
startServer(FitStaticServiceFactory.class);