You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/02/20 21:39:46 UTC
[2/2] jena git commit: JENA-884 : Use URLEncodedUtils to encode as
partial query string.
JENA-884 : Use URLEncodedUtils to encode as partial query string.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bc4518c2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bc4518c2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bc4518c2
Branch: refs/heads/master
Commit: bc4518c2cb167be3fa2fcb0a328580b5760e8cdb
Parents: 3ea8534
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Feb 20 20:39:16 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Feb 20 20:39:16 2015 +0000
----------------------------------------------------------------------
.../hp/hpl/jena/sparql/engine/http/Params.java | 35 ++++++--------------
1 file changed, 11 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bc4518c2/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Params.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Params.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Params.java
index 8e88e55..686dc88 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Params.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Params.java
@@ -18,13 +18,11 @@
package com.hp.hpl.jena.sparql.engine.http;
-import java.util.ArrayList ;
-import java.util.HashMap ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.Map ;
+import java.nio.charset.StandardCharsets ;
+import java.util.* ;
-import com.hp.hpl.jena.sparql.util.Convert ;
+import org.apache.http.NameValuePair ;
+import org.apache.http.client.utils.URLEncodedUtils ;
/** A collection of parameters for protocol use. */
@@ -131,23 +129,10 @@ public class Params
}
return names ;
}
-
- public String httpString()
- {
- StringBuilder sbuff = new StringBuilder() ;
- boolean first = true ;
- for (Pair p : pairs())
- {
- if ( !first )
- sbuff.append('&') ;
- sbuff.append(p.getName()) ;
- sbuff.append('=') ;
- String x = p.getValue() ;
- x = Convert.encWWWForm(x) ;
- sbuff.append(x) ;
- first = false ;
- }
- return sbuff.toString() ;
+
+ /** Query string, without leading "?" */
+ public String httpString() {
+ return URLEncodedUtils.format(paramList, StandardCharsets.UTF_8) ;
}
private List<String> getMV(String name)
@@ -160,13 +145,15 @@ public class Params
MultiValueException(String msg) { super(msg) ; }
}
- public static class Pair
+ public static class Pair implements NameValuePair
{
String name ;
String value ;
Pair(String name, String value) { setName(name) ; setValue(value) ; }
+ @Override
public String getName() { return name ; }
+ @Override
public String getValue() { return value ; }
void setName(String name) { this.name = name ; }