olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [31/52] [abbrv] git commit: [OLINGO-200] ODataError was missing...
Date Tue, 01 Apr 2014 09:00:43 GMT
[OLINGO-200] ODataError was missing...


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/fa7a9ab8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/fa7a9ab8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/fa7a9ab8

Branch: refs/heads/olingo-206-validator
Commit: fa7a9ab80ef23f24628f0b702970d134baf3513f
Parents: 0b4b86c
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Mon Mar 24 08:54:09 2014 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Mon Mar 24 08:54:09 2014 +0100

----------------------------------------------------------------------
 .../ODataClientErrorException.java              |  2 +-
 .../olingo/client/api/data/ODataError.java      | 67 --------------------
 .../client/api/op/CommonODataDeserializer.java  |  2 +-
 .../olingo/client/api/op/CommonODataReader.java |  2 +-
 .../communication/request/ODataRequestImpl.java |  2 +-
 .../olingo/client/core/data/JSONErrorImpl.java  |  2 +-
 .../olingo/client/core/data/XMLErrorImpl.java   |  2 +-
 .../core/op/AbstractODataDeserializer.java      |  2 +-
 .../client/core/op/AbstractODataReader.java     |  2 +-
 .../apache/olingo/client/core/v3/ErrorTest.java |  2 +-
 .../olingo/commons/api/domain/ODataError.java   | 67 ++++++++++++++++++++
 11 files changed, 76 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
index e25fd62..85ae888 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.StatusLine;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 
 /**
  * Represents a client error in OData.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java
b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java
deleted file mode 100644
index eab263b..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java
+++ /dev/null
@@ -1,67 +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.client.api.data;
-
-/**
- * OData error.
- */
-public interface ODataError {
-
-  /**
-   * Gets error code.
-   *
-   * @return error code.
-   */
-  String getCode();
-
-  /**
-   * Gets error message language.
-   *
-   * @return error message language.
-   */
-  String getMessageLang();
-
-  /**
-   * Gets error message.
-   *
-   * @return error message.
-   */
-  String getMessageValue();
-
-  /**
-   * Gets inner error message.
-   *
-   * @return inner error message.
-   */
-  String getInnerErrorMessage();
-
-  /**
-   * Gets inner error type.
-   *
-   * @return inner error type.
-   */
-  String getInnerErrorType();
-
-  /**
-   * Gets inner error stack-trace.
-   *
-   * @return inner error stack-trace
-   */
-  String getInnerErrorStacktrace();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java
b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java
index 0c0428c..6828b44 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java
@@ -21,7 +21,7 @@ package org.apache.olingo.client.api.op;
 import java.io.InputStream;
 import java.io.Serializable;
 import org.apache.olingo.client.api.data.Entry;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.client.api.data.Feed;
 import org.apache.olingo.client.api.data.Property;
 import org.apache.olingo.client.api.data.ServiceDocument;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java
b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java
index 3f28f62..829c5a7 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.api.op;
 
 import java.io.InputStream;
 import java.io.Serializable;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataEntitySet;
 import org.apache.olingo.commons.api.domain.ODataProperty;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java
index 44f7c45..b77b1b7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java
@@ -50,7 +50,7 @@ import org.apache.olingo.client.api.http.HttpClientException;
 import org.apache.olingo.client.api.http.HttpMethod;
 import org.apache.olingo.client.core.data.JSONErrorImpl;
 import org.apache.olingo.client.core.data.XMLErrorImpl;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.client.core.communication.header.ODataHeadersImpl;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java
index 583f438..5305695 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java
@@ -20,7 +20,7 @@ package org.apache.olingo.client.core.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 
 /**
  * This class represents an OData error returned as JSON.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java
index c5128f5..9e5b3c8 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
 import java.util.Map;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 
 /**
  * This class represents an OData error returned as JSON.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java
index 2b4385e..0f2ad2b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java
@@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op;
 import java.io.InputStream;
 import org.apache.olingo.client.api.CommonODataClient;
 import org.apache.olingo.client.api.data.Entry;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.client.api.data.Feed;
 import org.apache.olingo.client.api.data.Property;
 import org.apache.olingo.commons.api.format.ODataFormat;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java
b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java
index b0869cf..abc1070 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java
@@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op;
 import java.io.InputStream;
 import org.apache.commons.io.IOUtils;
 import org.apache.olingo.client.api.CommonODataClient;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.client.api.data.Property;
 import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataEntitySet;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java
b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java
index 57f3516..0b10d51 100644
--- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java
+++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import org.apache.olingo.client.api.v3.ODataClient;
-import org.apache.olingo.client.api.data.ODataError;
+import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.commons.api.format.ODataPubFormat;
 import org.apache.olingo.client.core.AbstractTest;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fa7a9ab8/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java
b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java
new file mode 100644
index 0000000..2993964
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java
@@ -0,0 +1,67 @@
+/*
+ * 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.domain;
+
+/**
+ * OData error.
+ */
+public interface ODataError {
+
+  /**
+   * Gets error code.
+   *
+   * @return error code.
+   */
+  String getCode();
+
+  /**
+   * Gets error message language.
+   *
+   * @return error message language.
+   */
+  String getMessageLang();
+
+  /**
+   * Gets error message.
+   *
+   * @return error message.
+   */
+  String getMessageValue();
+
+  /**
+   * Gets inner error message.
+   *
+   * @return inner error message.
+   */
+  String getInnerErrorMessage();
+
+  /**
+   * Gets inner error type.
+   *
+   * @return inner error type.
+   */
+  String getInnerErrorType();
+
+  /**
+   * Gets inner error stack-trace.
+   *
+   * @return inner error stack-trace
+   */
+  String getInnerErrorStacktrace();
+}


Mime
View raw message