You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/07/21 12:41:03 UTC
git commit: [OLINGO-366] fixes EdmStreamTypeImpl package
Repository: olingo-odata4
Updated Branches:
refs/heads/master 3b0f97ca9 -> df7cba690
[OLINGO-366] fixes EdmStreamTypeImpl package
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/df7cba69
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/df7cba69
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/df7cba69
Branch: refs/heads/master
Commit: df7cba69090967d17e0822694043279f3084a4bf
Parents: 3b0f97c
Author: fmartelli <fa...@gmail.com>
Authored: Mon Jul 21 12:40:49 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Mon Jul 21 12:40:49 2014 +0200
----------------------------------------------------------------------
.../olingo/ext/proxy/api/EdmStreamTypeImpl.java | 33 ------------------
.../ext/proxy/commons/EdmStreamTypeImpl.java | 36 ++++++++++++++++++++
.../proxy/commons/EntityInvocationHandler.java | 1 -
.../fit/proxy/v3/MediaEntityTestITCase.java | 2 +-
.../fit/proxy/v4/APIBasicDesignTestITCase.java | 2 +-
5 files changed, 38 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/df7cba69/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EdmStreamTypeImpl.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EdmStreamTypeImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EdmStreamTypeImpl.java
deleted file mode 100644
index dd18565..0000000
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/EdmStreamTypeImpl.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.ext.proxy.api;
-
-public class EdmStreamTypeImpl implements EdmStreamType {
-
- private final EdmStreamValue value;
-
- public EdmStreamTypeImpl(final EdmStreamValue value) {
- this.value = value;
- }
-
- @Override
- public EdmStreamValue load() {
- return value;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/df7cba69/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeImpl.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeImpl.java
new file mode 100644
index 0000000..f139a11
--- /dev/null
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeImpl.java
@@ -0,0 +1,36 @@
+/*
+ * 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.ext.proxy.commons;
+
+import org.apache.olingo.ext.proxy.api.EdmStreamType;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
+
+public class EdmStreamTypeImpl implements EdmStreamType {
+
+ private final EdmStreamValue value;
+
+ public EdmStreamTypeImpl(final EdmStreamValue value) {
+ this.value = value;
+ }
+
+ @Override
+ public EdmStreamValue load() {
+ return value;
+ }
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/df7cba69/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
index 27128b6..fdcf6eb 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
@@ -62,7 +62,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import org.apache.olingo.ext.proxy.api.EdmStreamType;
-import org.apache.olingo.ext.proxy.api.EdmStreamTypeImpl;
import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
import org.apache.olingo.ext.proxy.utils.ClassUtils;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/df7cba69/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
index 5958616..500e64d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.olingo.ext.proxy.api.EdmStreamTypeImpl;
+import org.apache.olingo.ext.proxy.commons.EdmStreamTypeImpl;
import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import static org.apache.olingo.fit.proxy.v3.AbstractTestITCase.service;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/df7cba69/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
index 2074368..cbfe9cc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
@@ -36,7 +36,7 @@ import java.util.TimeZone;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.ext.proxy.api.EdmStreamTypeImpl;
+import org.apache.olingo.ext.proxy.commons.EdmStreamTypeImpl;
import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService;
import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail;