You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/03/07 10:09:14 UTC
[25/57] [abbrv] git commit: [OLINGO-169] Finalizing package renaming
[OLINGO-169] Finalizing package renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/eb886d6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/eb886d6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/eb886d6a
Branch: refs/heads/master
Commit: eb886d6a5bd9279e5f4da947a481c803cba2b354
Parents: df906e4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 25 13:36:23 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 25 13:36:23 2014 +0100
----------------------------------------------------------------------
.../odata4/client/core/ODataV3Client.java | 6 +-
.../odata4/client/core/ODataV4Client.java | 6 +-
.../data/impl/v3/ODataDeserializerImpl.java | 63 --------------------
.../core/data/impl/v3/ODataReaderImpl.java | 45 --------------
.../core/data/impl/v3/ODataSerializerImpl.java | 32 ----------
.../data/impl/v4/ODataDeserializerImpl.java | 63 --------------------
.../core/data/impl/v4/ODataReaderImpl.java | 44 --------------
.../core/data/impl/v4/ODataSerializerImpl.java | 32 ----------
.../core/op/impl/v3/ODataDeserializerImpl.java | 62 +++++++++++++++++++
.../client/core/op/impl/v3/ODataReaderImpl.java | 44 ++++++++++++++
.../core/op/impl/v3/ODataSerializerImpl.java | 32 ++++++++++
.../core/op/impl/v4/ODataDeserializerImpl.java | 63 ++++++++++++++++++++
.../client/core/op/impl/v4/ODataReaderImpl.java | 44 ++++++++++++++
.../core/op/impl/v4/ODataSerializerImpl.java | 32 ++++++++++
14 files changed, 283 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
index 08a941d..4555c8c 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
@@ -18,9 +18,9 @@
*/
package org.apache.olingo.odata4.client.core;
-import org.apache.olingo.odata4.client.core.data.impl.v3.ODataDeserializerImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v3.ODataReaderImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v3.ODataSerializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v3.ODataDeserializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v3.ODataReaderImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v3.ODataSerializerImpl;
import org.apache.olingo.odata4.commons.api.edm.constants.ODataServiceVersion;
public class ODataV3Client extends AbstractODataClient {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
index 55d4adf..6fdc8b0 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
@@ -18,9 +18,9 @@
*/
package org.apache.olingo.odata4.client.core;
-import org.apache.olingo.odata4.client.core.data.impl.v4.ODataDeserializerImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v4.ODataReaderImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v4.ODataSerializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v4.ODataDeserializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v4.ODataReaderImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v4.ODataSerializerImpl;
import org.apache.olingo.odata4.commons.api.edm.constants.ODataServiceVersion;
public class ODataV4Client extends AbstractODataClient {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java
deleted file mode 100644
index a00eba7..0000000
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java
+++ /dev/null
@@ -1,63 +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.odata4.client.core.data.impl.v3;
-
-import java.io.InputStream;
-import org.apache.olingo.odata4.client.api.ODataClient;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractODataDeserializer;
-import org.apache.olingo.odata4.client.core.edm.v3.EdmxImpl;
-
-public class ODataDeserializerImpl extends AbstractODataDeserializer {
-
- private static final long serialVersionUID = -8221085862548914611L;
-
- public ODataDeserializerImpl(final ODataClient client) {
- super(client);
- }
-
- @Override
- public EdmxImpl toMetadata(final InputStream input) {
- try {
- return getXmlMapper().readValue(input, EdmxImpl.class);
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse as Edmx document", e);
- }
- }
-
-// @Override
-// public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
-// try {
-// return format == ODataFormat.XML
-// ? getXmlMapper().readValue(input, XMLServiceDocument.class)
-// : getObjectMapper().readValue(input, JSONServiceDocument.class);
-// } catch (IOException e) {
-// throw new IllegalArgumentException("Could not parse Service Document", e);
-// }
-// }
-//
-// @Override
-// protected JSONEntry toJSONEntry(final InputStream input) {
-// try {
-// return getObjectMapper().readValue(input, JSONEntry.class);
-// } catch (IOException e) {
-// throw new IllegalArgumentException("While deserializing JSON entry", e);
-// }
-// }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java
deleted file mode 100644
index 180a8a0..0000000
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.core.data.impl.v3;
-
-import java.io.InputStream;
-import org.apache.olingo.odata4.client.api.edm.EdmMetadata;
-import org.apache.olingo.odata4.client.core.ODataV3Client;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractODataReader;
-import org.apache.olingo.odata4.client.core.edm.v3.EdmMetadataImpl;
-
-public class ODataReaderImpl extends AbstractODataReader {
-
- private static final long serialVersionUID = -2481293269536406956L;
-
- public ODataReaderImpl(final ODataV3Client client) {
- super(client);
- }
-
- @Override
- public EdmMetadataImpl readMetadata(final InputStream input) {
- return new EdmMetadataImpl(client, input);
- }
-
-// @Override
-// public ODataServiceDocument readServiceDocument(final InputStream input, final ODataFormat format) {
-// return ((ODataV3Client) client).getBinder().getODataServiceDocument(
-// ((ODataV3Client) client).getDeserializer().toServiceDocument(input, format));
-// }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java
deleted file mode 100644
index 32111be..0000000
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java
+++ /dev/null
@@ -1,32 +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.odata4.client.core.data.impl.v3;
-
-import org.apache.olingo.odata4.client.api.ODataClient;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractODataSerializer;
-
-public class ODataSerializerImpl extends AbstractODataSerializer {
-
- private static final long serialVersionUID = -8861908250297989806L;
-
- public ODataSerializerImpl(final ODataClient client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java
deleted file mode 100644
index 2f3682c..0000000
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java
+++ /dev/null
@@ -1,63 +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.odata4.client.core.data.impl.v4;
-
-import java.io.InputStream;
-import org.apache.olingo.odata4.client.api.ODataClient;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractODataDeserializer;
-import org.apache.olingo.odata4.client.core.edm.v4.EdmxImpl;
-
-public class ODataDeserializerImpl extends AbstractODataDeserializer {
-
- private static final long serialVersionUID = 8593081342440470415L;
-
- public ODataDeserializerImpl(final ODataClient client) {
- super(client);
- }
-
- @Override
- public EdmxImpl toMetadata(final InputStream input) {
- try {
- return getXmlMapper().readValue(input, EdmxImpl.class);
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse as Edmx document", e);
- }
- }
-
-// @Override
-// public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
-// try {
-// return format == ODataFormat.XML
-// ? getXmlMapper().readValue(input, XMLServiceDocument.class)
-// : null;
-//// : getObjectMapper().readValue(input, JSONServiceDocument.class);
-// } catch (IOException e) {
-// throw new IllegalArgumentException("Could not parse Service Document", e);
-// }
-// }
-//
-// @Override
-// protected JSONEntry toJSONEntry(final InputStream input) {
-// try {
-// return getObjectMapper().readValue(input, JSONEntry.class);
-// } catch (IOException e) {
-// throw new IllegalArgumentException("While deserializing JSON entry", e);
-// }
-// }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java
deleted file mode 100644
index 05989c8..0000000
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java
+++ /dev/null
@@ -1,44 +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.odata4.client.core.data.impl.v4;
-
-import java.io.InputStream;
-import org.apache.olingo.odata4.client.core.ODataV4Client;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractODataReader;
-import org.apache.olingo.odata4.client.core.edm.v4.EdmMetadataImpl;
-
-public class ODataReaderImpl extends AbstractODataReader {
-
- private static final long serialVersionUID = -2481293269536406956L;
-
- public ODataReaderImpl(final ODataV4Client client) {
- super(client);
- }
-
- @Override
- public EdmMetadataImpl readMetadata(final InputStream input) {
- return new EdmMetadataImpl(client, input);
- }
-
-// @Override
-// public ODataServiceDocument readServiceDocument(final InputStream input, final ODataFormat format) {
-// return ((ODataV4Client) client).getBinder().getODataServiceDocument(
-// ((ODataV4Client) client).getDeserializer().toServiceDocument(input, format));
-// }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java
deleted file mode 100644
index c58e0fb..0000000
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java
+++ /dev/null
@@ -1,32 +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.odata4.client.core.data.impl.v4;
-
-import org.apache.olingo.odata4.client.api.ODataClient;
-import org.apache.olingo.odata4.client.core.op.impl.AbstractODataSerializer;
-
-public class ODataSerializerImpl extends AbstractODataSerializer {
-
- private static final long serialVersionUID = 7587265188399685309L;
-
- public ODataSerializerImpl(final ODataClient client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java
new file mode 100644
index 0000000..f47cd83
--- /dev/null
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java
@@ -0,0 +1,62 @@
+/*
+ * 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.odata4.client.core.op.impl.v3;
+
+import java.io.InputStream;
+import org.apache.olingo.odata4.client.api.ODataClient;
+import org.apache.olingo.odata4.client.core.op.impl.AbstractODataDeserializer;
+import org.apache.olingo.odata4.client.core.edm.v3.EdmxImpl;
+
+public class ODataDeserializerImpl extends AbstractODataDeserializer {
+
+ private static final long serialVersionUID = -8221085862548914611L;
+
+ public ODataDeserializerImpl(final ODataClient client) {
+ super(client);
+ }
+
+ @Override
+ public EdmxImpl toMetadata(final InputStream input) {
+ try {
+ return getXmlMapper().readValue(input, EdmxImpl.class);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Could not parse as Edmx document", e);
+ }
+ }
+
+// @Override
+// public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
+// try {
+// return format == ODataFormat.XML
+// ? getXmlMapper().readValue(input, XMLServiceDocument.class)
+// : getObjectMapper().readValue(input, JSONServiceDocument.class);
+// } catch (IOException e) {
+// throw new IllegalArgumentException("Could not parse Service Document", e);
+// }
+// }
+//
+// @Override
+// protected JSONEntry toJSONEntry(final InputStream input) {
+// try {
+// return getObjectMapper().readValue(input, JSONEntry.class);
+// } catch (IOException e) {
+// throw new IllegalArgumentException("While deserializing JSON entry", e);
+// }
+// }
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java
new file mode 100644
index 0000000..83f0494
--- /dev/null
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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.odata4.client.core.op.impl.v3;
+
+import java.io.InputStream;
+import org.apache.olingo.odata4.client.core.ODataV3Client;
+import org.apache.olingo.odata4.client.core.op.impl.AbstractODataReader;
+import org.apache.olingo.odata4.client.core.edm.v3.EdmMetadataImpl;
+
+public class ODataReaderImpl extends AbstractODataReader {
+
+ private static final long serialVersionUID = -2481293269536406956L;
+
+ public ODataReaderImpl(final ODataV3Client client) {
+ super(client);
+ }
+
+ @Override
+ public EdmMetadataImpl readMetadata(final InputStream input) {
+ return new EdmMetadataImpl(client, input);
+ }
+
+// @Override
+// public ODataServiceDocument readServiceDocument(final InputStream input, final ODataFormat format) {
+// return ((ODataV3Client) client).getBinder().getODataServiceDocument(
+// ((ODataV3Client) client).getDeserializer().toServiceDocument(input, format));
+// }
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java
new file mode 100644
index 0000000..2fbdddc
--- /dev/null
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.odata4.client.core.op.impl.v3;
+
+import org.apache.olingo.odata4.client.api.ODataClient;
+import org.apache.olingo.odata4.client.core.op.impl.AbstractODataSerializer;
+
+public class ODataSerializerImpl extends AbstractODataSerializer {
+
+ private static final long serialVersionUID = -8861908250297989806L;
+
+ public ODataSerializerImpl(final ODataClient client) {
+ super(client);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java
new file mode 100644
index 0000000..d67adc2
--- /dev/null
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java
@@ -0,0 +1,63 @@
+/*
+ * 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.odata4.client.core.op.impl.v4;
+
+import java.io.InputStream;
+import org.apache.olingo.odata4.client.api.ODataClient;
+import org.apache.olingo.odata4.client.core.op.impl.AbstractODataDeserializer;
+import org.apache.olingo.odata4.client.core.edm.v4.EdmxImpl;
+
+public class ODataDeserializerImpl extends AbstractODataDeserializer {
+
+ private static final long serialVersionUID = 8593081342440470415L;
+
+ public ODataDeserializerImpl(final ODataClient client) {
+ super(client);
+ }
+
+ @Override
+ public EdmxImpl toMetadata(final InputStream input) {
+ try {
+ return getXmlMapper().readValue(input, EdmxImpl.class);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Could not parse as Edmx document", e);
+ }
+ }
+
+// @Override
+// public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
+// try {
+// return format == ODataFormat.XML
+// ? getXmlMapper().readValue(input, XMLServiceDocument.class)
+// : null;
+//// : getObjectMapper().readValue(input, JSONServiceDocument.class);
+// } catch (IOException e) {
+// throw new IllegalArgumentException("Could not parse Service Document", e);
+// }
+// }
+//
+// @Override
+// protected JSONEntry toJSONEntry(final InputStream input) {
+// try {
+// return getObjectMapper().readValue(input, JSONEntry.class);
+// } catch (IOException e) {
+// throw new IllegalArgumentException("While deserializing JSON entry", e);
+// }
+// }
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java
new file mode 100644
index 0000000..11b7112
--- /dev/null
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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.odata4.client.core.op.impl.v4;
+
+import java.io.InputStream;
+import org.apache.olingo.odata4.client.core.ODataV4Client;
+import org.apache.olingo.odata4.client.core.op.impl.AbstractODataReader;
+import org.apache.olingo.odata4.client.core.edm.v4.EdmMetadataImpl;
+
+public class ODataReaderImpl extends AbstractODataReader {
+
+ private static final long serialVersionUID = -2481293269536406956L;
+
+ public ODataReaderImpl(final ODataV4Client client) {
+ super(client);
+ }
+
+ @Override
+ public EdmMetadataImpl readMetadata(final InputStream input) {
+ return new EdmMetadataImpl(client, input);
+ }
+
+// @Override
+// public ODataServiceDocument readServiceDocument(final InputStream input, final ODataFormat format) {
+// return ((ODataV4Client) client).getBinder().getODataServiceDocument(
+// ((ODataV4Client) client).getDeserializer().toServiceDocument(input, format));
+// }
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/eb886d6a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java
new file mode 100644
index 0000000..a5a24c8
--- /dev/null
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java
@@ -0,0 +1,32 @@
+/*
+ * 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.odata4.client.core.op.impl.v4;
+
+import org.apache.olingo.odata4.client.api.ODataClient;
+import org.apache.olingo.odata4.client.core.op.impl.AbstractODataSerializer;
+
+public class ODataSerializerImpl extends AbstractODataSerializer {
+
+ private static final long serialVersionUID = 7587265188399685309L;
+
+ public ODataSerializerImpl(final ODataClient client) {
+ super(client);
+ }
+
+}