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 8adc426 RestClient tests
8adc426 is described below
commit 8adc426b01904a976b4d32dd6799e158fe0862a5
Author: JamesBognar <[email protected]>
AuthorDate: Thu Jun 11 10:02:50 2020 -0400
RestClient tests
---
.../apache/juneau/assertions/FluentAssertion.java | 11 ++++++---
.../juneau/assertions/FluentDateAssertion.java | 4 ++--
.../juneau/assertions/FluentIntegerAssertion.java | 4 ++--
.../juneau/assertions/FluentLongAssertion.java | 4 ++--
.../juneau/assertions/FluentStringAssertion.java | 4 ++--
.../org/apache/juneau/internal/FluentSetters.java | 5 ++++
.../main/ConfigurablePropertyCodeGenerator.java | 15 ++++++++++--
.../apache/juneau/rest/client2/RestClientTest.java | 5 ++--
.../juneau/rest/client2/RestClientBuilder.java | 28 +---------------------
.../juneau/rest/mock2/MockRestClientBuilder.java | 18 --------------
.../org/apache/juneau/rest/RestContextBuilder.java | 1 +
11 files changed, 39 insertions(+), 60 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index cb13360..c436681 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
+import static org.apache.juneau.internal.StringUtils.*;
+
import org.apache.juneau.*;
import org.apache.juneau.internal.*;
@@ -24,6 +26,7 @@ public abstract class FluentAssertion<R> {
private final R returns;
private String msg;
+ private Object[] msgArgs;
private boolean stdout, stderr;
/**
@@ -51,11 +54,13 @@ public abstract class FluentAssertion<R> {
* String can contain <js>"{msg}"</js> to represent the original
message.
*
* @param msg The assertion failure message.
+ * @param args Optional message arguments.
* @return This object (for method chaining).
*/
@FluentSetter
- public FluentAssertion<R> msg(String msg) {
+ public FluentAssertion<R> msg(String msg, Object...args) {
this.msg = msg;
+ this.msgArgs = args;
return this;
}
@@ -89,10 +94,10 @@ public abstract class FluentAssertion<R> {
* @return A new {@link BasicAssertionError}.
*/
protected BasicAssertionError error(String msg, Object...args) {
- msg = StringUtils.format(msg, args);
+ msg = format(msg, args);
if (this.msg != null) {
if (this.msg.contains("{msg}"))
- msg = this.msg.replace("{msg}", msg);
+ msg = format(this.msg.replace("{msg}", msg),
msgArgs);
else
msg = this.msg;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index 27cf562..86540fd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -207,8 +207,8 @@ public class FluentDateAssertion<R> extends
FluentAssertion<R> {
// <FluentSetters>
@Override /* GENERATED - FluentAssertion */
- public FluentDateAssertion<R> msg(String msg) {
- super.msg(msg);
+ public FluentDateAssertion<R> msg(String msg, Object...args) {
+ super.msg(msg, args);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index f87facc..f1a5b9b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -329,8 +329,8 @@ public class FluentIntegerAssertion<R> extends
FluentAssertion<R> {
// <FluentSetters>
@Override /* GENERATED - FluentAssertion */
- public FluentIntegerAssertion<R> msg(String msg) {
- super.msg(msg);
+ public FluentIntegerAssertion<R> msg(String msg, Object...args) {
+ super.msg(msg, args);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index 5a80917..c5f35b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -329,8 +329,8 @@ public class FluentLongAssertion<R> extends
FluentAssertion<R> {
// <FluentSetters>
@Override /* GENERATED - FluentAssertion */
- public FluentLongAssertion<R> msg(String msg) {
- super.msg(msg);
+ public FluentLongAssertion<R> msg(String msg, Object...args) {
+ super.msg(msg, args);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 01a847b..2b13f4f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -380,8 +380,8 @@ public class FluentStringAssertion<R> extends
FluentAssertion<R> {
// <FluentSetters>
@Override /* GENERATED - FluentAssertion */
- public FluentStringAssertion<R> msg(String msg) {
- super.msg(msg);
+ public FluentStringAssertion<R> msg(String msg, Object...args) {
+ super.msg(msg, args);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FluentSetters.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FluentSetters.java
index cdbf2ed..97d57b5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FluentSetters.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FluentSetters.java
@@ -29,4 +29,9 @@ public @interface FluentSetters {
* Overrides the return type on the child methods.
*/
String returns() default "";
+
+ /**
+ * Specifies method signatures to ignore.
+ */
+ String[] ignore() default {};
}
diff --git
a/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
b/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
index fcf84d7..8824960 100644
---
a/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
+++
b/juneau-releng/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
@@ -18,6 +18,7 @@ import java.util.stream.*;
import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.collections.*;
import org.apache.juneau.config.*;
import org.apache.juneau.config.store.*;
import org.apache.juneau.csv.*;
@@ -212,9 +213,13 @@ public class ConfigurablePropertyCodeGenerator {
StringBuilder sb = new StringBuilder();
ClassInfo ci = ClassInfo.of(c);
String cName = ci.getSimpleName();
- for (FluentSetters fs :
ci.getAnnotations(FluentSetters.class))
+ Set<String> ignore = ASet.of();
+ for (FluentSetters fs :
ci.getAnnotations(FluentSetters.class)) {
if (! fs.returns().isEmpty())
cName = fs.returns();
+ for (String i : fs.ignore())
+ ignore.add(i);
+ }
for (ClassInfo pc :
ClassInfo.of(c).getParentsParentFirst()) {
Class<?> pcc = pc.inner();
@@ -227,11 +232,17 @@ public class ConfigurablePropertyCodeGenerator {
if
(m.getAnnotation(Deprecated.class) != null)
continue;
+ String mSig = new
StringBuilder(m.getName()).append("(").append(getArgs(m)).append(")").toString();
+
+ // Don't render ignored
methods.
+ if
(ignore.contains(m.getName()) || ignore.contains(mSig))
+ continue;
+
StringBuilder sigLine =
new StringBuilder();
sigLine.append("\n\tpublic ");
if
(m.getTypeParameters().length > 0)
sigLine.append("<").append(Arrays.asList(m.getTypeParameters()).stream().map(x
-> x.getName()).collect(Collectors.joining(", "))).append("> ");
-
sigLine.append(cName).append("
").append(m.getName()).append("(").append(getArgs(m)).append(") ");
+
sigLine.append(cName).append(" ").append(mSig).append(" ");
if (
m.getExceptionTypes().length > 0)
sigLine.append("throws
").append(Arrays.asList(m.getExceptionTypes()).stream().map(x ->
x.getSimpleName()).collect(Collectors.joining(", ")));
sigLine.append("{");
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
index c4280c2..a9b4312 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClientTest.java
@@ -589,9 +589,10 @@ public class RestClientTest {
// .header("Check", "Content-Type")
// .accept("application/json+simple")
// .build()
-// .formPost("/checkHeader", body)
+// .formPost("/checkHeader", bodies.get(i))
// .run()
-//
.assertBody().matchesSimple("['application/x-www-form-urlencoded*']");
+// .assertBody()
+// .msg("Body {0} failed",
i).matchesSimple("['application/x-www-form-urlencoded*']");
//
// MockRestClient
// .create(A.class)
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
index 479718b..5c334ed 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
@@ -91,6 +91,7 @@ import org.apache.juneau.xml.*;
* <li class='link'>{@doc juneau-rest-client}
* </ul>
*/
+@FluentSetters(ignore={"beanMapPutReturnsOldValue","example","exampleJson"})
public class RestClientBuilder extends BeanContextBuilder {
private HttpClientBuilder httpClientBuilder;
@@ -4793,15 +4794,6 @@ public class RestClientBuilder extends
BeanContextBuilder {
return this;
}
- /**
- * This method has no effect on this class.
- */
- @Override /* GENERATED - BeanContextBuilder */
- public RestClientBuilder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
@Override /* GENERATED - BeanContextBuilder */
public RestClientBuilder beanMethodVisibility(Visibility value) {
super.beanMethodVisibility(value);
@@ -4940,24 +4932,6 @@ public class RestClientBuilder extends
BeanContextBuilder {
return this;
}
- /**
- * This method has no effect on this class.
- */
- @Override /* GENERATED - BeanContextBuilder */
- public <T> RestClientBuilder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- /**
- * This method has no effect on this class.
- */
- @Override /* GENERATED - BeanContextBuilder */
- public <T> RestClientBuilder exampleJson(Class<T> pojoClass, String
json) {
- super.exampleJson(pojoClass, json);
- return this;
- }
-
@Override /* GENERATED - BeanContextBuilder */
public RestClientBuilder fluentSetters() {
super.fluentSetters();
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
index 261bb53..6c6d1d6 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
@@ -292,12 +292,6 @@ public class MockRestClientBuilder extends
RestClientBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public MockRestClientBuilder beanMapPutReturnsOldValue() {
- super.beanMapPutReturnsOldValue();
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
public MockRestClientBuilder beanMethodVisibility(Visibility value) {
super.beanMethodVisibility(value);
return this;
@@ -436,18 +430,6 @@ public class MockRestClientBuilder extends
RestClientBuilder {
}
@Override /* GENERATED - BeanContextBuilder */
- public <T> MockRestClientBuilder example(Class<T> pojoClass, T o) {
- super.example(pojoClass, o);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
- public <T> MockRestClientBuilder exampleJson(Class<T> pojoClass, String
json) {
- super.exampleJson(pojoClass, json);
- return this;
- }
-
- @Override /* GENERATED - BeanContextBuilder */
public MockRestClientBuilder fluentSetters() {
super.fluentSetters();
return this;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index df95999..50bd68f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -89,6 +89,7 @@ import org.apache.juneau.utils.*;
* <li class='link'>{@doc juneau-rest-server.RestContext}
* </ul>
*/
+@FluentSetters(ignore={"set"})
public class RestContextBuilder extends BeanContextBuilder implements
ServletConfig {
final ServletConfig inner;
