This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new feef88d0d Break dependences from marshall to http packages.
feef88d0d is described below
commit feef88d0d8a20ab93a5d8eaf6d30aa5a10266584
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jun 26 12:48:14 2022 -0400
Break dependences from marshall to http packages.
---
.../src/main/java/org/apache/juneau/MediaRange.java | 4 ++--
.../src/main/java/org/apache/juneau/MediaType.java | 3 +--
.../src/main/java/org/apache/juneau/StringRange.java | 3 +--
.../java/org/apache/juneau/http/MediaRanges_Test.java | 16 ++++++++--------
.../java/org/apache/juneau/http/StringRange_Test.java | 4 ++--
.../juneau/http/header/BasicMediaTypeHeader_Test.java | 2 +-
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
index 19ab58bec..2789bc229 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
@@ -12,13 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.http.HttpParts.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import java.util.function.*;
import org.apache.http.*;
+import org.apache.http.message.*;
/**
@@ -56,7 +56,7 @@ public class MediaRange extends MediaType {
qValue = Float.parseFloat(p.getValue());
foundQ = true;
} else if (foundQ) {
- extensions.add(stringPart(p.getName(),
p.getValue()));
+ extensions.add(new
BasicNameValuePair(p.getName(), p.getValue()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
index 6bbc5663d..65055a0b1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
@@ -15,7 +15,6 @@ package org.apache.juneau;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
import java.util.*;
import java.util.function.*;
@@ -189,7 +188,7 @@ public class MediaType implements Comparable<MediaType> {
}
}
for (int i = 0; i < parameters.length; i++)
- parameters[i] = stringPart(parameters[i].getName(),
parameters[i].getValue());
+ parameters[i] = new
BasicNameValuePair(parameters[i].getName(), parameters[i].getValue());
this.parameters = parameters;
String x = mediaType.replace(' ', '+');
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
index 4b66aa882..657b6d8bc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
@@ -15,7 +15,6 @@ package org.apache.juneau;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
import java.util.*;
import java.util.function.*;
@@ -75,7 +74,7 @@ public class StringRange {
if (p.getName().equals("q")) {
qValue = Float.parseFloat(p.getValue());
} else {
- extensions.add(stringPart(p.getName(),
p.getValue()));
+ extensions.add(new
BasicNameValuePair(p.getName(), p.getValue()));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
index 893f01f11..307e6c2c1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/MediaRanges_Test.java
@@ -59,35 +59,35 @@ public class MediaRanges_Test {
x1 = of("text/json;a=1;q=0.9;b=2");
x2 = x1.getRange(0);
assertString(x2).is("text/json;a=1;q=0.9;b=2");
- assertObject(x2.getParameters()).asJson().is("['a=1']");
+
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'}]");
assertString(x2.getQValue()).is("0.9");
- assertObject(x2.getExtensions()).asJson().is("['b=2']");
+
assertObject(x2.getExtensions()).asJson().is("[{name:'b',value:'2'}]");
x1 = of("text/json;a=1;a=2;q=0.9;b=3;b=4");
x2 = x1.getRange(0);
assertString(x2).is("text/json;a=1;a=2;q=0.9;b=3;b=4");
- assertObject(x2.getParameters()).asJson().is("['a=1','a=2']");
+
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'},{name:'a',value:'2'}]");
assertString(x2.getQValue()).is("0.9");
- assertObject(x2.getExtensions()).asJson().is("['b=3','b=4']");
+
assertObject(x2.getExtensions()).asJson().is("[{name:'b',value:'3'},{name:'b',value:'4'}]");
x1 = of("text/json;a=1;a=2;q=1.0;b=3;b=4");
x2 = x1.getRange(0);
assertString(x2).is("text/json;a=1;a=2;q=1.0;b=3;b=4");
- assertObject(x2.getParameters()).asJson().is("['a=1','a=2']");
+
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'},{name:'a',value:'2'}]");
assertString(x2.getQValue()).is("1.0");
- assertObject(x2.getExtensions()).asJson().is("['b=3','b=4']");
+
assertObject(x2.getExtensions()).asJson().is("[{name:'b',value:'3'},{name:'b',value:'4'}]");
x1 = of("text/json;a=1");
x2 = x1.getRange(0);
assertString(x2).is("text/json;a=1");
- assertObject(x2.getParameters()).asJson().is("['a=1']");
+
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'}]");
assertString(x2.getQValue()).is("1.0");
assertObject(x2.getExtensions()).asJson().is("[]");
x1 = of("text/json;a=1;");
x2 = x1.getRange(0);
assertString(x2).is("text/json;a=1");
- assertObject(x2.getParameters()).asJson().is("['a=1']");
+
assertObject(x2.getParameters()).asJson().is("[{name:'a',value:'1'}]");
assertString(x2.getQValue()).is("1.0");
assertObject(x2.getExtensions()).asJson().is("[]");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
index 6be723de8..231a43086 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
@@ -26,7 +26,7 @@ public class StringRange_Test {
public void a01_basic() throws Exception {
StringRange x1 = of("foo;a=1;q=0.5;b=2");
assertString(x1.getQValue()).is("0.5");
- assertObject(x1.getExtensions()).asJson().is("['a=1','b=2']");
+
assertObject(x1.getExtensions()).asJson().is("[{name:'a',value:'1'},{name:'b',value:'2'}]");
StringRange x2 = of("foo;q=1.0");
assertString(x2.getQValue()).is("1.0");
@@ -34,7 +34,7 @@ public class StringRange_Test {
StringRange x3 = of("foo;a=1");
assertString(x3.getQValue()).is("1.0");
- assertObject(x3.getExtensions()).asJson().is("['a=1']");
+
assertObject(x3.getExtensions()).asJson().is("[{name:'a',value:'1'}]");
StringRange x4 = of("foo;a=1");
assertObject(x3).is(x4);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
index ff82aa552..ba6e57439 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
@@ -112,7 +112,7 @@ public class BasicMediaTypeHeader_Test {
@Test
public void a08_getParameters() throws Exception {
-
assertObject(contentType("text/foo;x=1;y=2").getParameters()).asJson().is("['x=1','y=2']");
+
assertObject(contentType("text/foo;x=1;y=2").getParameters()).asJson().is("[{name:'x',value:'1'},{name:'y',value:'2'}]");
assertObject(new
ContentType((String)null).getParameters()).asJson().is("[]");
}
