You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/08/14 13:57:24 UTC
[1/2] olingo-odata4 git commit: [OLINGO-659] Changed RAT-check to
install phase
Repository: olingo-odata4
Updated Branches:
refs/heads/master 179c46396 -> 198452538
[OLINGO-659] Changed RAT-check to install phase
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a739034f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a739034f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a739034f
Branch: refs/heads/master
Commit: a739034f2f0828dfacf5e81c7f702ab7d06f2f52
Parents: 179c463
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Aug 14 13:48:35 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Aug 14 13:49:52 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a739034f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3071781..9b720a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,7 +563,7 @@
<executions>
<execution>
<id>rat-check</id>
- <phase>test</phase>
+ <phase>install</phase>
<goals>
<goal>check</goal>
</goals>
[2/2] olingo-odata4 git commit: [OLINGO-659] Replaced Collection with
List
Posted by mi...@apache.org.
[OLINGO-659] Replaced Collection with List
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/19845253
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/19845253
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/19845253
Branch: refs/heads/master
Commit: 1984525384ca783bb2a0ce0ef86877fd1404795c
Parents: a739034
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Aug 14 13:49:29 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Aug 14 13:50:46 2015 +0200
----------------------------------------------------------------------
.../apache/olingo/commons/api/http/HttpHeader.java | 7 ++++---
.../olingo/commons/api/http/HttpHeaders.java | 17 +++++++++++++++++
.../org/apache/olingo/server/api/ODataRequest.java | 14 ++------------
.../apache/olingo/server/api/ODataResponse.java | 7 +------
4 files changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19845253/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java
index 6d047e2..340c895 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java
@@ -21,6 +21,7 @@ package org.apache.olingo.commons.api.http;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Locale;
/**
@@ -183,7 +184,7 @@ public class HttpHeader {
public static final String ODATA_ENTITY_ID = "OData-EntityID";
private final String name;
- private final Collection<String> values;
+ private final List<String> values;
/**
* Create header for given name
@@ -216,8 +217,8 @@ public class HttpHeader {
* Get all values for this header
* @return all header values
*/
- public Collection<String> getValues() {
- return Collections.unmodifiableCollection(values);
+ public List<String> getValues() {
+ return Collections.unmodifiableList(values);
}
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19845253/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java
index 59c07c2..fb1da7f 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeaders.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -104,6 +106,21 @@ public class HttpHeaders {
return Collections.unmodifiableCollection(headers.values());
}
+
+ /**
+ * Get all headers with the according values.
+ *
+ * @return an unmodifiable Map of header names/values
+ */
+ public Map<String, List<String>> getHeaderToValues() {
+ Map<String, List<String>> result = new HashMap<String, List<String>>();
+ Collection<HttpHeader> allHeaders = headers.values();
+ for (HttpHeader header : allHeaders) {
+ result.put(header.getName(), header.getValues());
+ }
+ return Collections.unmodifiableMap(result);
+ }
+
/**
* Get all header names.
*
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19845253/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java
index 4f364e1..669e069 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java
@@ -20,9 +20,6 @@ package org.apache.olingo.server.api;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -124,14 +121,7 @@ public class ODataRequest {
* @return an unmodifiable Map of header names/values
*/
public Map<String, List<String>> getAllHeaders() {
- Collection<HttpHeader> allHeader = headers.getHeaders();
- Map<String, List<String>> result = new HashMap<String, List<String>>();
-
- for (HttpHeader httpHeader : allHeader) {
- result.put(httpHeader.getName(), new ArrayList<String>(httpHeader.getValues()));
- }
-
- return Collections.unmodifiableMap(result);
+ return headers.getHeaderToValues();
}
@@ -241,7 +231,7 @@ public class ODataRequest {
/**
* Sets the HTTP protocol used
- * @param protocol
+ * @param 2protocol
* @see #getProtocol()
*/
public void setProtocol(String protocol) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19845253/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java
index 367ce16..c0e0825 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java
@@ -97,12 +97,7 @@ public class ODataResponse {
* @return an unmodifiable Map of header names/values
*/
public Map<String, List<String>> getAllHeaders() {
- Map<String, List<String>> result = new HashMap<String, List<String>>();
- Collection<HttpHeader> allHeaders = headers.getHeaders();
- for (HttpHeader header : allHeaders) {
- result.put(header.getName(), new ArrayList<String>(header.getValues()));
- }
- return Collections.unmodifiableMap(result);
+ return headers.getHeaderToValues();
}
/**