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 05c520a org.apache.juneau.http tests.
05c520a is described below
commit 05c520a33ced062d25dc307cdb7d6a7bd4b59112
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jul 13 10:18:06 2020 -0400
org.apache.juneau.http tests.
---
.../java/org/apache/juneau/http/BasicHeader.java | 33 +------------------
.../org/apache/juneau/http/BasicHttpEntity.java | 38 +---------------------
.../org/apache/juneau/http/BasicHttpResource.java | 15 ---------
.../org/apache/juneau/http/BasicNameValuePair.java | 35 +-------------------
.../org/apache/juneau/http/SerializedHeader.java | 13 --------
.../apache/juneau/http/SerializedHttpEntity.java | 19 +++--------
.../juneau/http/SerializedNameValuePair.java | 13 --------
.../juneau/rest/client2/RestClient_Body_Test.java | 19 ++---------
.../rest/client2/RestClient_FormData_Test.java | 11 -------
.../rest/client2/RestClient_Headers_Test.java | 11 -------
.../juneau/rest/helper/BasicHttpResourceTest.java | 2 +-
.../java/org/apache/juneau/rest/RestRequest.java | 4 +--
12 files changed, 11 insertions(+), 202 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
index 0cddf89..b77104e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHeader.java
@@ -24,9 +24,7 @@ import org.apache.http.message.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
-import org.apache.juneau.svl.*;
/**
* Superclass of all headers defined in this package.
@@ -43,8 +41,6 @@ import org.apache.juneau.svl.*;
* Fluent setters.
* <li>
* Fluent assertions.
- * <li>
- * {@doc juneau-marshall.SimpleVariableLanguage.SvlVariables SVL
variables}.
* </ul>
*/
@BeanIgnore
@@ -56,7 +52,6 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
private final String name;
private final Object value;
private HeaderElement[] elements;
- private VarResolverSession varSession;
/**
* Convenience creator.
@@ -163,31 +158,6 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
this.value = value;
}
- /**
- * Allows SVL variables to be resolved when calling {@link #getValue()}.
- *
- * @param varResolver
- * The variable resolver to use for resolving SVL variables.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public BasicHeader resolving(VarResolver varResolver) {
- return resolving(varResolver == null ? null :
varResolver.createSession());
- }
-
- /**
- * Allows SVL variables to be resolved when calling {@link #getValue()}.
- *
- * @param varSession
- * The variable resolver session to use for resolving SVL
variables.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public BasicHeader resolving(VarResolverSession varSession) {
- this.varSession = varSession;
- return this;
- }
-
@Override /* Header */
public String getName() {
return name;
@@ -195,8 +165,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
@Override /* Header */
public String getValue() {
- String s = stringify(getRawValue());
- return varSession == null ? s : varSession.resolve(s);
+ return stringify(getRawValue());
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
index fa891d7..413398d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpEntity.java
@@ -19,7 +19,6 @@ import org.apache.http.*;
import org.apache.juneau.assertions.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.svl.*;
/**
* An extension of {@link org.apache.http.entity.BasicHttpEntity} with
additional features.
@@ -36,14 +35,11 @@ import org.apache.juneau.svl.*;
* Fluent setters.
* <li>
* Fluent assertions.
- * <li>
- * {@doc juneau-marshall.SimpleVariableLanguage.SvlVariables SVL
variables}.
* </ul>
*/
public class BasicHttpEntity extends org.apache.http.entity.BasicHttpEntity {
private Object content;
private boolean cache;
- private VarResolverSession varSession;
/**
* Creator.
@@ -253,31 +249,6 @@ public class BasicHttpEntity extends
org.apache.http.entity.BasicHttpEntity {
}
/**
- * Allows SVL variables to be resolved in the entity body.
- *
- * @param varResolver
- * The variable resolver to use for resolving SVL variables.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public BasicHttpEntity resolving(VarResolver varResolver) {
- return resolving(varResolver == null ? null :
varResolver.createSession());
- }
-
- /**
- * Allows SVL variables to be resolved in the entity body.
- *
- * @param varSession
- * The variable resolver session to use for resolving SVL
variables.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public BasicHttpEntity resolving(VarResolverSession varSession) {
- this.varSession = varSession;
- return this;
- }
-
- /**
* Converts the contents of this entity as a byte array.
*
* @return The contents of this entity as a byte array.
@@ -367,14 +338,7 @@ public class BasicHttpEntity extends
org.apache.http.entity.BasicHttpEntity {
tryCache();
Object o = getRawContent();
if (o != null) {
- if (varSession != null) {
- Writer osw = new OutputStreamWriter(os,
IOUtils.UTF8);
- String s = IOUtils.read(o);
- varSession.resolveTo(s, osw);
- osw.flush();
- } else {
- IOUtils.pipe(o, os);
- }
+ IOUtils.pipe(o, os);
}
os.flush();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
index fc6bc09..e101907 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicHttpResource.java
@@ -18,7 +18,6 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.svl.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.header.ContentType;
@@ -37,8 +36,6 @@ import org.apache.juneau.http.header.ContentType;
* Fluent setters.
* <li>
* Fluent assertions.
- * <li>
- * {@doc juneau-marshall.SimpleVariableLanguage.SvlVariables SVL
variables}.
* </ul>
*/
public class BasicHttpResource extends BasicHttpEntity implements HttpResource
{
@@ -284,17 +281,5 @@ public class BasicHttpResource extends BasicHttpEntity
implements HttpResource {
return this;
}
- @Override /* GENERATED - BasicHttpEntity */
- public BasicHttpResource resolving(VarResolver varResolver) {
- super.resolving(varResolver);
- return this;
- }
-
- @Override /* GENERATED - BasicHttpEntity */
- public BasicHttpResource resolving(VarResolverSession varSession) {
- super.resolving(varSession);
- return this;
- }
-
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
index 9fe9d86..4af8e15 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/BasicNameValuePair.java
@@ -21,9 +21,7 @@ import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
-import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
-import org.apache.juneau.svl.*;
/**
* Subclass of {@link NameValuePair} for serializing POJOs as URL-encoded form
post entries.
@@ -38,15 +36,12 @@ import org.apache.juneau.svl.*;
* Fluent setters.
* <li>
* Fluent assertions.
- * <li>
- * {@doc juneau-marshall.SimpleVariableLanguage.SvlVariables SVL
variables}.
* </ul>
*/
@BeanIgnore
public class BasicNameValuePair implements NameValuePair, Headerable {
private final String name;
private final Object value;
- private VarResolverSession varSession;
/**
* Convenience creator.
@@ -133,31 +128,6 @@ public class BasicNameValuePair implements NameValuePair,
Headerable {
}
/**
- * Allows SVL variables to be resolved when calling {@link #getValue()}.
- *
- * @param varResolver
- * The variable resolver to use for resolving SVL variables.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public BasicNameValuePair resolving(VarResolver varResolver) {
- return resolving(varResolver == null ? null :
varResolver.createSession());
- }
-
- /**
- * Allows SVL variables to be resolved when calling {@link #getValue()}.
- *
- * @param varSession
- * The variable resolver session to use for resolving SVL
variables.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public BasicNameValuePair resolving(VarResolverSession varSession) {
- this.varSession = varSession;
- return this;
- }
-
- /**
* Provides an object for performing assertions against the name of
this pair.
*
* @return An object for performing assertions against the name of this
pair.
@@ -187,10 +157,7 @@ public class BasicNameValuePair implements NameValuePair,
Headerable {
@Override /* NameValuePair */
public String getValue() {
- String s = stringify(unwrap(value));
- if (varSession != null)
- s = varSession.resolve(s);
- return s;
+ return stringify(unwrap(value));
}
@Override /* Object */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
index 92f96ba..d16d2eb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHeader.java
@@ -21,7 +21,6 @@ import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.svl.*;
import org.apache.juneau.urlencoding.*;
/**
@@ -173,17 +172,5 @@ public class SerializedHeader extends BasicHeader {
// <FluentSetters>
- @Override /* GENERATED - BasicHeader */
- public SerializedHeader resolving(VarResolver varResolver) {
- super.resolving(varResolver);
- return this;
- }
-
- @Override /* GENERATED - BasicHeader */
- public SerializedHeader resolving(VarResolverSession varSession) {
- super.resolving(varSession);
- return this;
- }
-
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
index 1dd4e7d..df12155 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedHttpEntity.java
@@ -23,8 +23,6 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.svl.*;
-import org.apache.juneau.utils.*;
/**
* HttpEntity for serializing POJOs as the body of HTTP requests.
@@ -87,7 +85,7 @@ public class SerializedHttpEntity extends BasicHttpEntity {
os = new NoCloseOutputStream(os);
Object o = getRawContent();
if (o instanceof InputStream || o instanceof Reader || o
instanceof File) {
- IOPipe.create(o, os).run();
+ super.writeTo(os);
} else {
try {
if (serializer == null) {
@@ -130,6 +128,9 @@ public class SerializedHttpEntity extends BasicHttpEntity {
@Override /* BasicHttpEntity */
public InputStream getContent() {
+ Object o = getRawContent();
+ if (o instanceof InputStream || o instanceof Reader || o
instanceof File)
+ return super.getContent();
if (cache == null) {
try (ByteArrayOutputStream baos = new
ByteArrayOutputStream()) {
writeTo(baos);
@@ -197,17 +198,5 @@ public class SerializedHttpEntity extends BasicHttpEntity {
return this;
}
- @Override /* GENERATED - BasicHttpEntity */
- public SerializedHttpEntity resolving(VarResolver varResolver) {
- super.resolving(varResolver);
- return this;
- }
-
- @Override /* GENERATED - BasicHttpEntity */
- public SerializedHttpEntity resolving(VarResolverSession varSession) {
- super.resolving(varSession);
- return this;
- }
-
// </FluentSetters>
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
index 19673f7..b54986a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/SerializedNameValuePair.java
@@ -21,7 +21,6 @@ import org.apache.juneau.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.svl.*;
import org.apache.juneau.urlencoding.*;
/**
@@ -202,17 +201,5 @@ public class SerializedNameValuePair extends
BasicNameValuePair implements Heade
// <FluentSetters>
- @Override /* GENERATED - BasicNameValuePair */
- public SerializedNameValuePair resolving(VarResolver varResolver) {
- super.resolving(varResolver);
- return this;
- }
-
- @Override /* GENERATED - BasicNameValuePair */
- public SerializedNameValuePair resolving(VarResolverSession varSession)
{
- super.resolving(varSession);
- return this;
- }
-
// </FluentSetters>
}
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
index 4df1507..6e2a004 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Body_Test.java
@@ -26,7 +26,6 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.svl.*;
import org.apache.juneau.testutils.pojos.*;
import org.junit.*;
@@ -104,13 +103,6 @@ public class RestClient_Body_Test {
BasicHttpResource x9 = httpResource(null);
client().build().post("/",x9).run().getBody().assertString().isEmpty();
-
- System.setProperty("Test", "bar");
- BasicHttpResource x10 =
httpResource("$S{Test}").resolving(VarResolver.DEFAULT);
-
client().build().post("/",x10).run().getBody().assertString().is("bar");
- BasicHttpResource x11 =
httpResource("$S{Test}").resolving((VarResolver)null);
-
client().build().post("/",x11).run().getBody().assertString().is("$S{Test}");
- System.clearProperty("Test");
}
@Test
@@ -157,13 +149,6 @@ public class RestClient_Body_Test {
BasicHttpEntity x9 = httpEntity(null);
client().build().post("/",x9).run().getBody().assertString().isEmpty();
- System.setProperty("Test", "bar");
- BasicHttpEntity x10 =
httpEntity("$S{Test}").resolving(VarResolver.DEFAULT);
-
client().build().post("/",x10).run().getBody().assertString().is("bar");
- BasicHttpEntity x11 =
httpEntity("$S{Test}").resolving((VarResolver)null);
-
client().build().post("/",x11).run().getBody().assertString().is("$S{Test}");
- System.clearProperty("Test");
-
BasicHttpEntity x12 = httpEntity("foo");
x12.assertString().is("foo");
x12.assertBytes().string().is("foo");
@@ -219,8 +204,8 @@ public class RestClient_Body_Test {
InputStream x7 = new ByteArrayInputStream("foo".getBytes()) {
@Override
- public int read(byte[] b) throws IOException {
- throw new IOException("bad");
+ public int read(byte[] b, int offset, int length) {
+ throw new RuntimeException("bad");
}
};
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
index eaf6047..36ffd9a 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
@@ -29,7 +29,6 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.svl.*;
import org.apache.juneau.testutils.*;
import org.apache.juneau.testutils.pojos.ABean;
import org.apache.juneau.uon.*;
@@ -218,16 +217,6 @@ public class RestClient_FormData_Test {
assertThrown(()->client().formData(SerializedNameValuePair.of("Foo","bar").serializer(new
A12())).build().get()).contains("bad");
}
- @Test
- public void a13_svlVars() throws Exception {
- System.setProperty("Test", "bar");
- NameValuePair x =
BasicNameValuePair.of("foo","$S{Test}").resolving(VarResolver.DEFAULT);
-
client().formData(x).build().post("/formData").run().assertBody().urlDecode().is("foo=bar");
- x =
BasicNameValuePair.of("foo","$S{Test}").resolving((VarResolver)null);
-
client().formData(x).build().post("/formData").run().assertBody().urlDecode().is("foo=$S{Test}");
- System.clearProperty("Test");
- }
-
//------------------------------------------------------------------------------------------------------------------
// Helper methods.
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
index 2e2114e..0c184b5 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
@@ -32,7 +32,6 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.mock2.*;
import org.apache.juneau.serializer.*;
-import org.apache.juneau.svl.*;
import org.apache.juneau.testutils.*;
import org.apache.juneau.uon.*;
import org.junit.*;
@@ -205,16 +204,6 @@ public class RestClient_Headers_Test {
assertThrown(()->checkFooClient().header(SerializedHeader.of("Foo","bar").serializer(new
A12())).build().get()).contains("bad");
}
- @Test
- public void a13_svlVars() throws Exception {
- System.setProperty("Test", "bar");
- Header x =
BasicHeader.of("Foo","$S{Test}").resolving(VarResolver.DEFAULT);
-
checkFooClient().header(x).build().get("/headers").run().assertBody().is("['bar']");
- x =
BasicHeader.of("Foo","$S{Test}").resolving((VarResolver)null);
-
checkFooClient().header(x).build().get("/headers").run().assertBody().is("['$S{Test}']");
- System.clearProperty("Test");
- }
-
//------------------------------------------------------------------------------------------------------------------
// Other tests
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/BasicHttpResourceTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/BasicHttpResourceTest.java
index b3aa6eb..5bf71f8 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/BasicHttpResourceTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/helper/BasicHttpResourceTest.java
@@ -45,7 +45,7 @@ public class BasicHttpResourceTest {
@RestMethod
public BasicHttpResource a04(RestRequest req) throws Exception {
- return
BasicHttpResource.of("$RQ{foo}").resolving(req.getVarResolverSession());
+ return
BasicHttpResource.of(()->req.getVarResolverSession().resolve("$RQ{foo}"));
}
@RestMethod
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index be6e86a..09d3a84 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -1450,10 +1450,8 @@ public final class RestRequest extends
HttpServletRequestWrapper {
String s = context.getClasspathResourceAsString(name,
getLocale());
if (s == null)
return null;
- BasicHttpResource b = BasicHttpResource.of(s)
+ BasicHttpResource b = BasicHttpResource.of(()->resolveVars ?
getVarResolverSession().resolve(s) : s)
.contentType(mediaType == null ? null :
ContentType.of(mediaType.toString()));
- if (resolveVars)
- b.resolving(getVarResolverSession());
if (cached)
b.cache();
return b;
