You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:33:26 UTC
[04/59] [abbrv] Clean up of odata api
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
index 759e941..d3f7355 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -27,7 +27,7 @@ package org.apache.olingo.odata2.api.exception;
* <br>To support internationalization and translation of messages, this class
* and its sub classes contain a {@link MessageReference} object which can be
* mapped to a related key and message text in the resource bundles.
- *
+ *
*/
public abstract class ODataMessageException extends ODataException {
@@ -44,18 +44,18 @@ public abstract class ODataMessageException extends ODataException {
/**
* Creates {@link ODataMessageException} with given {@link MessageReference}.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
+ * of this {@link ODataMessageException}
*/
public ODataMessageException(final MessageReference messageReference) {
this(messageReference, null, null);
}
/**
- * Creates {@link ODataMessageException} with given {@link MessageReference}
- * and cause {@link Throwable} which caused this exception.
+ * Creates {@link ODataMessageException} with given {@link MessageReference} and cause {@link Throwable} which caused
+ * this exception.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param cause exception which caused this exception
+ * of this {@link ODataMessageException}
+ * @param cause exception which caused this exception
*/
public ODataMessageException(final MessageReference messageReference, final Throwable cause) {
this(messageReference, cause, null);
@@ -65,9 +65,9 @@ public abstract class ODataMessageException extends ODataException {
* Creates {@link ODataMessageException} with given {@link MessageReference},
* cause {@link Throwable} and error code.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param cause exception which caused this exception
- * @param errorCode a String with a unique code identifying this exception
+ * of this {@link ODataMessageException}
+ * @param cause exception which caused this exception
+ * @param errorCode a String with a unique code identifying this exception
*/
public ODataMessageException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
super(cause);
@@ -78,8 +78,8 @@ public abstract class ODataMessageException extends ODataException {
/**
* Creates {@link ODataMessageException} with given {@link MessageReference} and error code.
* @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param errorCode a String with a unique code identifying this exception
+ * of this {@link ODataMessageException}
+ * @param errorCode a String with a unique code identifying this exception
*/
public ODataMessageException(final MessageReference messageReference, final String errorCode) {
this(messageReference, null, errorCode);
@@ -87,11 +87,12 @@ public abstract class ODataMessageException extends ODataException {
/**
* Creates {@link MessageReference} objects more conveniently.
- * @param clazz exception class for message reference
+ * @param clazz exception class for message reference
* @param messageReferenceKey unique (in exception class) key for message reference
* @return created message-reference instance
*/
- protected static final MessageReference createMessageReference(final Class<? extends ODataMessageException> clazz, final String messageReferenceKey) {
+ protected static final MessageReference createMessageReference(final Class<? extends ODataMessageException> clazz,
+ final String messageReferenceKey) {
return MessageReference.create(clazz, messageReferenceKey);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
index d9250bf..e31b9b8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 405 (method not allowed).
- *
+ *
*/
public class ODataMethodNotAllowedException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference DISPATCH = createMessageReference(ODataMethodNotAllowedException.class, "DISPATCH");
+ public static final MessageReference DISPATCH = createMessageReference(ODataMethodNotAllowedException.class,
+ "DISPATCH");
public ODataMethodNotAllowedException(final MessageReference messageReference) {
super(messageReference, HttpStatusCodes.METHOD_NOT_ALLOWED);
@@ -42,7 +43,8 @@ public class ODataMethodNotAllowedException extends ODataHttpException {
super(messageReference, HttpStatusCodes.METHOD_NOT_ALLOWED, errorCode);
}
- public ODataMethodNotAllowedException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public ODataMethodNotAllowedException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, HttpStatusCodes.METHOD_NOT_ALLOWED, errorCode);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
index cca88ba..1832289 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,15 +22,17 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 406 not acceptable
- *
+ *
*/
public class ODataNotAcceptableException extends ODataHttpException {
private static final long serialVersionUID = 1L;
public static final MessageReference COMMON = createMessageReference(ODataNotAcceptableException.class, "COMMON");
- public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(ODataNotAcceptableException.class, "NOT_SUPPORTED_CONTENT_TYPE");
- public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(ODataNotAcceptableException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
+ public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(
+ ODataNotAcceptableException.class, "NOT_SUPPORTED_CONTENT_TYPE");
+ public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(
+ ODataNotAcceptableException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
public ODataNotAcceptableException(final MessageReference context) {
super(context, HttpStatusCodes.NOT_ACCEPTABLE);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
index 622c81e..b8fcdb3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 404 not found
- *
+ *
*/
public class ODataNotFoundException extends ODataHttpException {
@@ -43,7 +43,8 @@ public class ODataNotFoundException extends ODataHttpException {
super(messageReference, cause, HttpStatusCodes.NOT_FOUND);
}
- public ODataNotFoundException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
+ public ODataNotFoundException(final MessageReference messageReference, final Throwable cause,
+ final String errorCode) {
super(messageReference, cause, HttpStatusCodes.NOT_FOUND, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
index 798addf..3d802f4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,14 +22,15 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 501 (Not implemented).
- *
+ *
*/
public class ODataNotImplementedException extends ODataHttpException {
private static final long serialVersionUID = 1L;
public static final MessageReference COMMON = createMessageReference(ODataNotImplementedException.class, "COMMON");
- public static final MessageReference TUNNELING = createMessageReference(ODataNotImplementedException.class, "TUNNELING");
+ public static final MessageReference TUNNELING = createMessageReference(ODataNotImplementedException.class,
+ "TUNNELING");
public ODataNotImplementedException(final MessageReference context) {
super(context, HttpStatusCodes.NOT_IMPLEMENTED);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
index 4f40682..eed40d5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP Status 412 Precondition Failed.
- *
+ *
*/
public class ODataPreconditionFailedException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference COMMON = createMessageReference(ODataPreconditionFailedException.class, "COMMON");
+ public static final MessageReference COMMON =
+ createMessageReference(ODataPreconditionFailedException.class, "COMMON");
public ODataPreconditionFailedException(final MessageReference context) {
super(context, HttpStatusCodes.PRECONDITION_FAILED);
@@ -42,7 +43,8 @@ public class ODataPreconditionFailedException extends ODataHttpException {
super(context, HttpStatusCodes.PRECONDITION_FAILED, errorCode);
}
- public ODataPreconditionFailedException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataPreconditionFailedException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.PRECONDITION_FAILED, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
index c94c8db..5babcae 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 428 precondition required
- *
+ *
*/
public class ODataPreconditionRequiredException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference COMMON = createMessageReference(ODataPreconditionRequiredException.class, "COMMON");
+ public static final MessageReference COMMON = createMessageReference(ODataPreconditionRequiredException.class,
+ "COMMON");
public ODataPreconditionRequiredException(final MessageReference context) {
super(context, HttpStatusCodes.PRECONDITION_REQUIRED);
@@ -42,7 +43,8 @@ public class ODataPreconditionRequiredException extends ODataHttpException {
super(context, HttpStatusCodes.PRECONDITION_REQUIRED, errorCode);
}
- public ODataPreconditionRequiredException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataPreconditionRequiredException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.PRECONDITION_REQUIRED, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
index 9e8962b..64cd0ff 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,13 +22,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 503 service unavailable
- *
+ *
*/
public class ODataServiceUnavailableException extends ODataHttpException {
private static final long serialVersionUID = 1L;
- public static final MessageReference COMMON = createMessageReference(ODataServiceUnavailableException.class, "COMMON");
+ public static final MessageReference COMMON =
+ createMessageReference(ODataServiceUnavailableException.class, "COMMON");
public ODataServiceUnavailableException(final MessageReference context) {
super(context, HttpStatusCodes.SERVICE_UNAVAILABLE);
@@ -42,7 +43,8 @@ public class ODataServiceUnavailableException extends ODataHttpException {
super(context, HttpStatusCodes.SERVICE_UNAVAILABLE, errorCode);
}
- public ODataServiceUnavailableException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataServiceUnavailableException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.SERVICE_UNAVAILABLE, errorCode);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
index 64938aa..db9e326 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -22,18 +22,21 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
/**
* Exceptions of this class will result in a HTTP status 415 unsupported media type
- *
+ *
*/
public class ODataUnsupportedMediaTypeException extends ODataHttpException {
private static final long serialVersionUID = 1L;
/** NOT_SUPPORTED requires 1 content value ('media type') */
- public static final MessageReference NOT_SUPPORTED = createMessageReference(ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED");
+ public static final MessageReference NOT_SUPPORTED = createMessageReference(ODataUnsupportedMediaTypeException.class,
+ "NOT_SUPPORTED");
/** NOT_SUPPORTED_CONTENT_TYPE requires 1 content value ('media type') */
- public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_CONTENT_TYPE");
+ public static final MessageReference NOT_SUPPORTED_CONTENT_TYPE = createMessageReference(
+ ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_CONTENT_TYPE");
/** NOT_SUPPORTED_ACCEPT_HEADER requires 1 content value ('media type') */
- public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
+ public static final MessageReference NOT_SUPPORTED_ACCEPT_HEADER = createMessageReference(
+ ODataUnsupportedMediaTypeException.class, "NOT_SUPPORTED_ACCEPT_HEADER");
public ODataUnsupportedMediaTypeException(final MessageReference context) {
super(context, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE);
@@ -47,7 +50,8 @@ public class ODataUnsupportedMediaTypeException extends ODataHttpException {
super(context, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, errorCode);
}
- public ODataUnsupportedMediaTypeException(final MessageReference context, final Throwable cause, final String errorCode) {
+ public ODataUnsupportedMediaTypeException(final MessageReference context, final Throwable cause,
+ final String errorCode) {
super(context, cause, HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE, errorCode);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
index 61411ee..542a703 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/package-info.java
@@ -1,61 +1,73 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* Exception Classes used in the OData library as well as the implementing application
- * <p>APPLICATION DEVELOPERS: Please use {@link org.apache.olingo.odata2.api.exception.ODataApplicationException} for custom exceptions.
+ * <p>APPLICATION DEVELOPERS: Please use {@link org.apache.olingo.odata2.api.exception.ODataApplicationException} for
+ * custom exceptions.
*
* <p><b>Exception handling:</b>
- * <br>Inside the OData library an ExceptionMapper exists which can transform any exception into an OData error format.
+ * <br>Inside the OData library an ExceptionMapper exists which can transform any exception into an OData error format.
* The ExceptionMapper behaves after the following algorithm:
* <br>1. The cause of the exception will be determined by looking into the stack trace.
- * <br>1.1. If the cause is an ODataApplicationException meaning that somewhere in the stack an ODataApplicationException is found the
- * ExceptionMapper will take the following information from the ApplicationException and transform it into an OData error:
- * message text, Locale, Inner Error and Error Code. There will be no altering of information for the ODataApplicationException.
- * <br>1.2. If no ODataApplicationException is found in the stack the cause can be three different types of exceptions: ODataHttpException, ODataMessageException or an uncaught RuntimeException.
- * <br>The ExceptionMapper will process them in the following order: 1. ODataHttpException, 2. ODataMessageException, 3 Other Exceptions.
- * <br>1.2.1. ODataHttpExceptions will be transformed as follows: If an error code is set it will be displayed. The HTTP status code will be derived from the ODataHttpException. The message text and its language depend on the AcceptLanguageHeaders.
- * The first supported language which is found in the Headers will result in the language of the message and the response.
- * <br>1.2.1. ODataMessageException will be transformed as follows: If an error code is set it will be displayed. The HTTP status code will be 500.
- * The message text and its language depend on the AcceptLanguageHeaders. The first supported language which is found in the Headers will result in the language of the message and the response.
- * <br>1.2.1 Runtime Exceptions will be transformed as follows: No error code will be set. HTTP status will be 500. Message text will be taken from the exception and the language for the response will be English as default.
+ * <br>1.1. If the cause is an ODataApplicationException meaning that somewhere in the stack an
+ * ODataApplicationException is found the
+ * ExceptionMapper will take the following information from the ApplicationException and transform it into an OData
+ * error:
+ * message text, Locale, Inner Error and Error Code. There will be no altering of information for the
+ * ODataApplicationException.
+ * <br>1.2. If no ODataApplicationException is found in the stack the cause can be three different types of exceptions:
+ * ODataHttpException, ODataMessageException or an uncaught RuntimeException.
+ * <br>The ExceptionMapper will process them in the following order: 1. ODataHttpException, 2. ODataMessageException, 3
+ * Other Exceptions.
+ * <br>1.2.1. ODataHttpExceptions will be transformed as follows: If an error code is set it will be displayed. The HTTP
+ * status code will be derived from the ODataHttpException. The message text and its language depend on the
+ * AcceptLanguageHeaders.
+ * The first supported language which is found in the Headers will result in the language of the message and the
+ * response.
+ * <br>1.2.1. ODataMessageException will be transformed as follows: If an error code is set it will be displayed. The
+ * HTTP status code will be 500.
+ * The message text and its language depend on the AcceptLanguageHeaders. The first supported language which is found in
+ * the Headers will result in the language of the message and the response.
+ * <br>1.2.1 Runtime Exceptions will be transformed as follows: No error code will be set. HTTP status will be 500.
+ * Message text will be taken from the exception and the language for the response will be English as default.
* <p><b>Exception Hierarchy</b>
- * <br> {@link org.apache.olingo.odata2.api.exception.ODataException}
- * <br> *{@link org.apache.olingo.odata2.api.exception.ODataApplicationException}
- * <br> *{@link org.apache.olingo.odata2.api.exception.ODataMessageException}
- * <br> ** {@link org.apache.olingo.odata2.api.edm.EdmException}
- * <br> ** {@link org.apache.olingo.odata2.api.ep.EntityProviderException}
- * <br> ** {@link org.apache.olingo.odata2.api.uri.expression.ExceptionVisitExpression}
- * <br> ** {@link org.apache.olingo.odata2.api.exception.ODataHttpException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataConflictException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataForbiddenException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataMethodNotAllowedException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataNotAcceptableException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataNotImplementedException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataPreconditionFailedException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataPreconditionRequiredException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataServiceUnavailableException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataUnsupportedMediaTypeException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataNotFoundException}
- * <br> **** {@link org.apache.olingo.odata2.api.uri.UriNotMatchingException}
- * <br> *** {@link org.apache.olingo.odata2.api.exception.ODataBadRequestException}
- * <br> **** {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException}
- * <br> **** {@link org.apache.olingo.odata2.api.uri.UriSyntaxException}
+ * <br> {@link org.apache.olingo.odata2.api.exception.ODataException} <br> *
+ * {@link org.apache.olingo.odata2.api.exception.ODataApplicationException} <br> *
+ * {@link org.apache.olingo.odata2.api.exception.ODataMessageException} <br> **
+ * {@link org.apache.olingo.odata2.api.edm.EdmException} <br> **
+ * {@link org.apache.olingo.odata2.api.ep.EntityProviderException} <br> **
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExceptionVisitExpression} <br> **
+ * {@link org.apache.olingo.odata2.api.exception.ODataHttpException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataConflictException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataForbiddenException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataMethodNotAllowedException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataNotAcceptableException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataNotImplementedException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataPreconditionFailedException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataPreconditionRequiredException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataServiceUnavailableException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataUnsupportedMediaTypeException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataNotFoundException} <br> ****
+ * {@link org.apache.olingo.odata2.api.uri.UriNotMatchingException} <br> ***
+ * {@link org.apache.olingo.odata2.api.exception.ODataBadRequestException} <br> ****
+ * {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException} <br> ****
+ * {@link org.apache.olingo.odata2.api.uri.UriSyntaxException}
*/
package org.apache.olingo.odata2.api.exception;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
index 003ed5d..b5cb2bf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
@@ -1,39 +1,40 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
/**
* OData Library API
* <p>
- * OData Library is a protocol implementation of the OData V2.0 standard. For details of this standard
+ * OData Library is a protocol implementation of the OData V2.0 standard. For details of this standard
* see <a href="http://odata.org">odata.org</a>.
* <p>
- * This API is intended to implement an OData service. An OData service consists of a metadata provider
+ * This API is intended to implement an OData service. An OData service consists of a metadata provider
* implementation and an OData processor implementation.
* <p>
- * An OData service can be exposed by a web application. For the runntime one JAX-RS
- * implementation is needed and the core implementation library of this API. Apache CXF for example is
+ * An OData service can be exposed by a web application. For the runntime one JAX-RS
+ * implementation is needed and the core implementation library of this API. Apache CXF for example is
* one such JAX-RS implementation.
* <p>
- * Entry point to the service is a JAX-RS servlet. At this servlet init parameters for a <code>ODataServiceFactory</code>
- * is configured. The parameter <code>javax.ws.rs.Application</code> is a default by JAX-RS and has to be present always.
+ * Entry point to the service is a JAX-RS servlet. At this servlet init parameters for a
+ * <code>ODataServiceFactory</code>
+ * is configured. The parameter <code>javax.ws.rs.Application</code> is a default by JAX-RS and has to be present
+ * always.
* <p>
- * <pre>
- * {@code
+ * <pre> {@code
* <?xml version="1.0" encoding="UTF-8"?>
* <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
* xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
@@ -58,13 +59,12 @@
* <url-pattern>/MyService.svc/*</url-pattern>
* </servlet-mapping>
* </web-app>
- * }
- * </pre>
+ * } </pre>
* <p>
- * This factory produces the service, a metadata provider and the data processor. The provider, typically
- * a derivative of the class <code>EdmProvider</code> provides the metadata of the service. The processor implements a
- * variety of service interfaces, and provides the data of the service. The processor is typically
- * a derivative of the class <code>ODataSingleProcessor</code> which can be used together with the class
+ * This factory produces the service, a metadata provider and the data processor. The provider, typically
+ * a derivative of the class <code>EdmProvider</code> provides the metadata of the service. The processor implements a
+ * variety of service interfaces, and provides the data of the service. The processor is typically
+ * a derivative of the class <code>ODataSingleProcessor</code> which can be used together with the class
* <code>ODataSingleService</code>.
*/
package org.apache.olingo.odata2.api;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
index e4a417d..f809cb6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
/**
* Compilation of generic context objects.
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface ODataContext {
@@ -54,7 +54,7 @@ public interface ODataContext {
PathInfo getPathInfo() throws ODataException;
/**
- * If a request execution is part of batch processing then this method returns the context of the
+ * If a request execution is part of batch processing then this method returns the context of the
* outer batch request.
* @return a batch parent context or null
*/
@@ -138,10 +138,10 @@ public interface ODataContext {
/**
* Gets a list of languages that are acceptable for the response.
- * If no acceptable languages are specified, a read-only list containing
+ * If no acceptable languages are specified, a read-only list containing
* a single wildcard java.util.Locale instance (with language field set to "*") is returned.
* @return a read-only list of acceptable languages sorted according to their q-value,
- * with highest preference first.
+ * with highest preference first.
*/
List<Locale> getAcceptableLanguages();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
index 6552cdd..3236de6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -23,16 +23,18 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
/**
* This interface is called if an error occurred and is process inside the exception mapper.
- *
- *
+ *
+ *
*/
public interface ODataErrorCallback extends ODataCallback {
/**
- * This method can be used to handle an error differently than the exception mapper would.
+ * This method can be used to handle an error differently than the exception mapper would.
* <br>Any returned Response will be directly transported to the client.
* <br>Any thrown {@link ODataApplicationException} will be transformed into the OData error format.
- * <br>Any thrown runtime exception will result in an 500 Internal Server error with the Text: "Exception during error handling occurred!" No OData formatting will be applied.
- * <br>To serialize an error into the OData format the {@link org.apache.olingo.odata2.api.ep.EntityProvider} writeErrorDocument can be used.
+ * <br>Any thrown runtime exception will result in an 500 Internal Server error with the Text:
+ * "Exception during error handling occurred!" No OData formatting will be applied.
+ * <br>To serialize an error into the OData format the {@link org.apache.olingo.odata2.api.ep.EntityProvider}
+ * writeErrorDocument can be used.
* @param context of this error
* @return the response which will be propagated to the client
* @throws ODataApplicationException
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
index a36a24b..6ae011b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
* Error context information bean. Usually created and in error situations.
* @see org.apache.olingo.odata2.api.ep.EntityProvider EntityProvider
* @see ODataErrorCallback
- *
+ *
*/
public class ODataErrorContext {
@@ -70,7 +70,7 @@ public class ODataErrorContext {
this.exception = exception;
}
- /**
+ /**
* Get the content type which should be used to serialize an error response.
* @return a content type
*/
@@ -103,7 +103,7 @@ public class ODataErrorContext {
}
/**
- * Return OData error code that is returned in error response.
+ * Return OData error code that is returned in error response.
* @return an application defined error code
*/
public String getErrorCode() {
@@ -111,7 +111,7 @@ public class ODataErrorContext {
}
/**
- * Set OData error code that should be returned in error response.
+ * Set OData error code that should be returned in error response.
* @param errorCode an application defined error code
*/
public void setErrorCode(final String errorCode) {
@@ -134,7 +134,7 @@ public class ODataErrorContext {
this.message = message;
}
- /**
+ /**
* Return the locale of the translated message.
* @return a locale
*/
@@ -210,7 +210,8 @@ public class ODataErrorContext {
/**
* Get {@link PathInfo} object.
- * May be <code>NULL</code> if no path info was created/set till error occurred (but may be over written by application).
+ * May be <code>NULL</code> if no path info was created/set till error occurred (but may be over written by
+ * application).
*
* @return {@link PathInfo} or <code>NULL</code>.
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
index 4cefaf6..401891d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
* An <code>ODataProcessor</code> is the root interface for processor implementation.
* A processor handles OData requests like reading or writing entities. All possible
* actions are defined in the {@link org.apache.olingo.odata2.api.processor.feature} package.
- *
+ *
* @org.apache.olingo.odata2.DoNotImplement
*/
public interface ODataProcessor {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
index 1074226..7dfa43e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
index 8701051..345368e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -25,17 +25,14 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
/**
- * <p>An <code>ODataResponse</code> is usually created by an {@link ODataProcessor}
- * during request handling.</p>
- * <p>The handler can use a serializer to create an
+ * <p>An <code>ODataResponse</code> is usually created by an {@link ODataProcessor} during request handling.</p>
+ * <p>The handler can use a serializer to create an
* OData body (== response entity) and can set various response headers.
* A response can be created using the builder pattern:
- * <pre>
- * {@code
+ * <pre> {@code
* ODataResponse response = ODataResponse.entity("hello world").setStatus(HttpStatusCodes.OK).build();
- * }
- * </pre>
- *
+ * } </pre>
+ *
*/
public abstract class ODataResponse {
@@ -55,7 +52,8 @@ public abstract class ODataResponse {
public abstract Object getEntity();
/**
- * Close the underlying entity input stream (if such a stream is available) and release all with this repsonse associated resources.
+ * Close the underlying entity input stream (if such a stream is available) and release all with this repsonse
+ * associated resources.
*
* @throws IOException if something goes wrong during close of {@link ODataResponse}
*/
@@ -119,7 +117,7 @@ public abstract class ODataResponse {
}
/**
- * @param name HTTP header name
+ * @param name HTTP header name
* @param value associated value
* @return a builder object
*/
@@ -143,8 +141,8 @@ public abstract class ODataResponse {
}
/**
- * Implementation of the builder pattern to create instances of this type of object.
- *
+ * Implementation of the builder pattern to create instances of this type of object.
+ *
*/
public static abstract class ODataResponseBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
index 87ed4c3..3c0004c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -68,15 +68,19 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
/**
* <p>A default {@link ODataProcessor} that implements all processor features in a single class.</p>
* <p>It is recommended to derive from this class and it is required by the
- * {@link org.apache.olingo.odata2.api.ODataServiceFactory} to build an {@link org.apache.olingo.odata2.api.ODataService}.</p>
+ * {@link org.apache.olingo.odata2.api.ODataServiceFactory} to build an
+ * {@link org.apache.olingo.odata2.api.ODataService}.</p>
* <p>This abstract class provides a default behavior, returning the correct response
* for requests for the service or the metadata document, respectively, and throwing an
* {@link ODataNotImplementedException} for all other requests.
- * Sub classes have to override only methods they want to support.</p>
+ * Sub classes have to override only methods they want to support.</p>
+ *
*
- *
*/
-public abstract class ODataSingleProcessor implements MetadataProcessor, ServiceDocumentProcessor, EntityProcessor, EntitySetProcessor, EntityComplexPropertyProcessor, EntityLinkProcessor, EntityLinksProcessor, EntityMediaProcessor, EntitySimplePropertyProcessor, EntitySimplePropertyValueProcessor, FunctionImportProcessor, FunctionImportValueProcessor, BatchProcessor, CustomContentType {
+public abstract class ODataSingleProcessor implements MetadataProcessor, ServiceDocumentProcessor, EntityProcessor,
+ EntitySetProcessor, EntityComplexPropertyProcessor, EntityLinkProcessor, EntityLinksProcessor,
+ EntityMediaProcessor, EntitySimplePropertyProcessor, EntitySimplePropertyValueProcessor, FunctionImportProcessor,
+ FunctionImportValueProcessor, BatchProcessor, CustomContentType {
/**
* A request context object usually injected by the OData library.
@@ -103,16 +107,18 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see BatchProcessor
*/
@Override
- public ODataResponse executeBatch(final BatchHandler handler, final String contentType, final InputStream content) throws ODataException {
+ public ODataResponse executeBatch(final BatchHandler handler, final String contentType, final InputStream content)
+ throws ODataException {
throw new ODataNotImplementedException();
}
/**
- * @throws ODataNotImplementedException
+ * @throws ODataNotImplementedException
* @see BatchProcessor
*/
@Override
- public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests) throws ODataException {
+ public BatchResponsePart executeChangeSet(final BatchHandler handler, final List<ODataRequest> requests)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -120,7 +126,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see FunctionImportProcessor
*/
@Override
- public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -128,7 +135,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see FunctionImportValueProcessor
*/
@Override
- public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -136,7 +144,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyValueProcessor
*/
@Override
- public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimplePropertyValue(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -144,7 +153,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyValueProcessor
*/
@Override
- public ODataResponse updateEntitySimplePropertyValue(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimplePropertyValue(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -152,7 +162,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyValueProcessor
*/
@Override
- public ODataResponse deleteEntitySimplePropertyValue(final DeleteUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse deleteEntitySimplePropertyValue(final DeleteUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -160,7 +171,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyProcessor
*/
@Override
- public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySimpleProperty(final GetSimplePropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -168,7 +180,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySimplePropertyProcessor
*/
@Override
- public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntitySimpleProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -176,7 +189,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityMediaProcessor
*/
@Override
- public ODataResponse readEntityMedia(final GetMediaResourceUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityMedia(final GetMediaResourceUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -184,7 +198,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityMediaProcessor
*/
@Override
- public ODataResponse updateEntityMedia(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityMedia(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -200,7 +215,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinksProcessor
*/
@Override
- public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -208,7 +224,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinksProcessor
*/
@Override
- public ODataResponse countEntityLinks(final GetEntitySetLinksCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse countEntityLinks(final GetEntitySetLinksCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -216,7 +233,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse createEntityLink(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntityLink(final PostUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -224,7 +242,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -232,7 +251,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse existsEntityLink(final GetEntityLinkCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntityLink(final GetEntityLinkCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -240,7 +260,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityLinkProcessor
*/
@Override
- public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -256,7 +277,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityComplexPropertyProcessor
*/
@Override
- public ODataResponse readEntityComplexProperty(final GetComplexPropertyUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntityComplexProperty(final GetComplexPropertyUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -264,7 +286,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityComplexPropertyProcessor
*/
@Override
- public ODataResponse updateEntityComplexProperty(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntityComplexProperty(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -272,7 +295,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySetProcessor
*/
@Override
- public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readEntitySet(final GetEntitySetUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -280,7 +304,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySetProcessor
*/
@Override
- public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -288,7 +313,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntitySetProcessor
*/
@Override
- public ODataResponse createEntity(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse createEntity(final PostUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -304,7 +330,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityProcessor
*/
@Override
- public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType)
+ throws ODataException {
throw new ODataNotImplementedException();
}
@@ -312,7 +339,8 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see EntityProcessor
*/
@Override
- public ODataResponse updateEntity(final PutMergePatchUriInfo uriInfo, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
+ public ODataResponse updateEntity(final PutMergePatchUriInfo uriInfo, final InputStream content,
+ final String requestContentType, final boolean merge, final String contentType) throws ODataException {
throw new ODataNotImplementedException();
}
@@ -328,12 +356,14 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
* @see ServiceDocumentProcessor
*/
@Override
- public ODataResponse readServiceDocument(final GetServiceDocumentUriInfo uriInfo, final String contentType) throws ODataException {
+ public ODataResponse readServiceDocument(final GetServiceDocumentUriInfo uriInfo, final String contentType)
+ throws ODataException {
final Edm entityDataModel = getContext().getService().getEntityDataModel();
final String serviceRoot = getContext().getPathInfo().getServiceRoot().toASCIIString();
final ODataResponse response = EntityProvider.writeServiceDocument(contentType, entityDataModel, serviceRoot);
- final ODataResponseBuilder odataResponseBuilder = ODataResponse.fromResponse(response).header(ODataHttpHeaders.DATASERVICEVERSION, ODataServiceVersion.V10);
+ final ODataResponseBuilder odataResponseBuilder = ODataResponse.fromResponse(response).header(
+ ODataHttpHeaders.DATASERVICEVERSION, ODataServiceVersion.V10);
return odataResponseBuilder.build();
}
@@ -345,14 +375,17 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
public ODataResponse readMetadata(final GetMetadataUriInfo uriInfo, final String contentType) throws ODataException {
final EdmServiceMetadata edmServiceMetadata = getContext().getService().getEntityDataModel().getServiceMetadata();
- return ODataResponse.status(HttpStatusCodes.OK).header(ODataHttpHeaders.DATASERVICEVERSION, edmServiceMetadata.getDataServiceVersion()).entity(edmServiceMetadata.getMetadata()).build();
+ return ODataResponse.status(HttpStatusCodes.OK)
+ .header(ODataHttpHeaders.DATASERVICEVERSION, edmServiceMetadata.getDataServiceVersion())
+ .entity(edmServiceMetadata.getMetadata()).build();
}
/**
* @see CustomContentType
*/
@Override
- public List<String> getCustomContentTypes(final Class<? extends ODataProcessor> processorFeature) throws ODataException {
+ public List<String> getCustomContentTypes(final Class<? extends ODataProcessor> processorFeature)
+ throws ODataException {
return Collections.emptyList();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
index 3a1719f..610f45c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
@@ -1,18 +1,18 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
@@ -26,9 +26,9 @@ import org.apache.olingo.odata2.api.processor.ODataProcessor;
/**
* Data processor feature if processor supports custom content types. By default the OData library supports
* various types like Json (application/json), Atom (application/xml+atom) and XML (application/xml). But
- * the OData specification allows also other types like e.g. CSV or plain text.
+ * the OData specification allows also other types like e.g. CSV or plain text.
+ *
*
- *
*/
public interface CustomContentType extends ODataProcessorFeature {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/cf4caabf/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
index f694535..32d6e3c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
@@ -1,29 +1,29 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * 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
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
+ * KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata2.api.processor.feature;
/**
- * Marker interface for data processor features. A feature is like a call back where
+ * Marker interface for data processor features. A feature is like a call back where
* the OData library can request additional information from the processor to change
- * control over request handling.
+ * control over request handling.
+ *
*
- *
*/
public interface ODataProcessorFeature {