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 2014/07/15 14:17:02 UTC
git commit: [OLINGO-348] Move ODataApplication exception to server
Repository: olingo-odata4
Updated Branches:
refs/heads/master 4701d718d -> 8277130c7
[OLINGO-348] Move ODataApplication exception to server
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8277130c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8277130c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8277130c
Branch: refs/heads/master
Commit: 8277130c71e8331b1fcc0ee6d586747cd646cba8
Parents: 4701d71
Author: Christian Amend <ch...@apache.org>
Authored: Tue Jul 15 14:07:30 2014 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Jul 15 14:16:03 2014 +0200
----------------------------------------------------------------------
.../commons/api/ODataApplicationException.java | 37 -----------
.../api/ODataNotImplementedException.java | 33 ----------
.../server/api/ODataApplicationException.java | 68 ++++++++++++++++++++
.../server/api/ODataTranslatedException.java | 25 +++++++
.../expression/ExpressionVisitor.java | 2 +-
.../expression/VisitableExpression.java | 2 +-
.../uri/queryoption/expression/AliasImpl.java | 2 +-
.../uri/queryoption/expression/BinaryImpl.java | 2 +-
.../queryoption/expression/EnumerationImpl.java | 2 +-
.../queryoption/expression/LambdaRefImpl.java | 2 +-
.../uri/queryoption/expression/LiteralImpl.java | 2 +-
.../uri/queryoption/expression/MemberImpl.java | 2 +-
.../uri/queryoption/expression/MethodImpl.java | 2 +-
.../queryoption/expression/TypeLiteralImpl.java | 2 +-
.../uri/queryoption/expression/UnaryImpl.java | 2 +-
.../core/uri/antlr/TestFullResourcePath.java | 2 +-
.../queryoption/expression/ExpressionTest.java | 2 +-
.../core/uri/testutil/ExpandValidator.java | 2 +-
.../core/uri/testutil/FilterTreeToText.java | 2 +-
.../core/uri/testutil/FilterValidator.java | 2 +-
.../core/uri/testutil/ResourceValidator.java | 2 +-
21 files changed, 110 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
deleted file mode 100644
index a4a76e0..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.commons.api;
-
-public class ODataApplicationException extends Exception {
-
- private static final long serialVersionUID = 5358683245923127425L;
-
- public ODataApplicationException(final String msg) {
- super(msg);
- }
-
- public ODataApplicationException(final String msg, final Throwable cause) {
- super(msg, cause);
- }
-
- public ODataApplicationException(final Throwable cause) {
- super(cause);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
deleted file mode 100644
index de6fc5e..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.commons.api;
-
-public class ODataNotImplementedException extends ODataException {
-
- private static final long serialVersionUID = 3921772210762644762L;
-
- public ODataNotImplementedException(final String msg) {
- super(msg);
- }
-
- public ODataNotImplementedException() {
- super("Not implemented");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java
new file mode 100644
index 0000000..8816316
--- /dev/null
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.api;
+
+import java.util.Locale;
+
+public class ODataApplicationException extends Exception {
+
+ private static final long serialVersionUID = 5358683245923127425L;
+ private int statusCode = 500;
+ private Locale locale;
+ private String oDataErrorCode;
+
+ public ODataApplicationException(final String msg, int statusCode, Locale locale) {
+ super(msg);
+ this.statusCode = statusCode;
+ this.locale = locale;
+ }
+
+ public ODataApplicationException(final String msg, int statusCode, Locale locale, String oDataErrorCode) {
+ super(msg);
+ this.statusCode = statusCode;
+ this.locale = locale;
+ this.oDataErrorCode = oDataErrorCode;
+ }
+
+ public ODataApplicationException(final String msg, int statusCode, Locale locale, final Throwable cause) {
+ super(msg, cause);
+ this.statusCode = statusCode;
+ this.locale = locale;
+ }
+
+ public ODataApplicationException(final String msg, int statusCode, Locale locale, final Throwable cause,
+ String oDataErrorCode) {
+ super(msg, cause);
+ this.statusCode = statusCode;
+ this.locale = locale;
+ this.oDataErrorCode = oDataErrorCode;
+ }
+
+ public int getStatusCode() {
+ return statusCode;
+ }
+
+ public Locale getLocale() {
+ return locale;
+ }
+
+ public String getoDataErrorCode() {
+ return oDataErrorCode;
+ }
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
new file mode 100644
index 0000000..fabcca0
--- /dev/null
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataTranslatedException.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.api;
+
+public class ODataTranslatedException extends Exception{
+
+ private static final long serialVersionUID = -1210541002198287561L;
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java
index c2d76c0..83c146b 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java
@@ -20,9 +20,9 @@ package org.apache.olingo.server.api.uri.queryoption.expression;
import java.util.List;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmType;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfoResource;
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/VisitableExpression.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/VisitableExpression.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/VisitableExpression.java
index 9b450ac..1588dcf 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/VisitableExpression.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/VisitableExpression.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.server.api.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataApplicationException;
/**
* Marks an expression node a visitable by an expression visitor
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/AliasImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/AliasImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/AliasImpl.java
index 0c5770f..09af93f 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/AliasImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/AliasImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.Alias;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/BinaryImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/BinaryImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/BinaryImpl.java
index e583a53..a28f92c 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/BinaryImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/BinaryImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.Binary;
import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java
index b565973..8f7df3a 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java
@@ -21,8 +21,8 @@ package org.apache.olingo.server.core.uri.queryoption.expression;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.EdmEnumType;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.Enumeration;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LambdaRefImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LambdaRefImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LambdaRefImpl.java
index 3fff793..8198204 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LambdaRefImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LambdaRefImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
import org.apache.olingo.server.api.uri.queryoption.expression.LambdaRef;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LiteralImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LiteralImpl.java
index c9252df..d9db0d4 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LiteralImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/LiteralImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.EdmType;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
import org.apache.olingo.server.api.uri.queryoption.expression.Literal;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java
index 9aad698..8940bcf 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.EdmType;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfoResource;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java
index b3e283e..7104a9f 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java
@@ -21,7 +21,7 @@ package org.apache.olingo.server.core.uri.queryoption.expression;
import java.util.ArrayList;
import java.util.List;
-import org.apache.olingo.commons.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/TypeLiteralImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/TypeLiteralImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/TypeLiteralImpl.java
index 5bbe4b2..f5f6f06 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/TypeLiteralImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/TypeLiteralImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.EdmType;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
import org.apache.olingo.server.api.uri.queryoption.expression.TypeLiteral;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/UnaryImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/UnaryImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/UnaryImpl.java
index 854505c..796191f 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/UnaryImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/UnaryImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.olingo.server.core.uri.queryoption.expression;
-import org.apache.olingo.commons.api.ODataApplicationException;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException;
import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
index 4eb475e..47f118b 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java
@@ -21,9 +21,9 @@ package org.apache.olingo.server.core.uri.antlr;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.core.Encoder;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfoKind;
import org.apache.olingo.server.api.uri.UriResourceKind;
import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java
index de63b46..6f79060 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java
@@ -23,12 +23,12 @@ import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAction;
import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmFunction;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfoKind;
import org.apache.olingo.server.api.uri.UriInfoResource;
import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
index fde13c8..0d16c76 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
@@ -21,10 +21,10 @@ package org.apache.olingo.server.core.uri.testutil;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmType;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfoKind;
import org.apache.olingo.server.api.uri.queryoption.ExpandItem;
import org.apache.olingo.server.api.uri.queryoption.SelectItem;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
index 06056e0..6574ed7 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
@@ -20,9 +20,9 @@ package org.apache.olingo.server.core.uri.testutil;
import java.util.List;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmType;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfoResource;
import org.apache.olingo.server.api.uri.UriResource;
import org.apache.olingo.server.api.uri.UriResourceLambdaAll;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java
index ba7d3fe..cd5c4f8 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java
@@ -23,10 +23,10 @@ import static org.junit.Assert.fail;
import java.util.List;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmType;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfo;
import org.apache.olingo.server.api.uri.UriInfoKind;
import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8277130c/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
index dfb9a64..871c70d 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java
@@ -24,12 +24,12 @@ import static org.junit.Assert.fail;
import java.util.List;
-import org.apache.olingo.commons.api.ODataApplicationException;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmElement;
import org.apache.olingo.commons.api.edm.EdmType;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.http.HttpMethod;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriInfo;
import org.apache.olingo.server.api.uri.UriInfoKind;
import org.apache.olingo.server.api.uri.UriParameter;