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 efcc02d  Clean up builders.
efcc02d is described below

commit efcc02d24a7adeb60d7e4ec72299ed2a48eacd2a
Author: JamesBognar <[email protected]>
AuthorDate: Sun Aug 8 09:08:45 2021 -0400

    Clean up builders.
---
 .../org/apache/juneau/rest/annotation/RestDeleteAnnotation.java   | 8 ++++----
 .../java/org/apache/juneau/rest/annotation/RestGetAnnotation.java | 8 ++++----
 .../java/org/apache/juneau/rest/annotation/RestOpAnnotation.java  | 8 ++++----
 .../org/apache/juneau/rest/annotation/RestPostAnnotation.java     | 8 ++++----
 .../java/org/apache/juneau/rest/annotation/RestPutAnnotation.java | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index 0d87cd9..b65315b 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -437,9 +437,9 @@ public class RestDeleteAnnotation {
        }
 
        /**
-        * Applies {@link RestDelete} annotations to a {@link 
ContextPropertiesBuilder}.
+        * Applies {@link RestDelete} annotations to a {@link 
RestOperationContextBuilder}.
         */
-       public static class Apply extends 
ContextApplier<RestDelete,ContextPropertiesBuilder> {
+       public static class Apply extends 
ContextApplier<RestDelete,RestOperationContextBuilder> {
 
                /**
                 * Constructor.
@@ -447,11 +447,11 @@ public class RestDeleteAnnotation {
                 * @param vr The resolver for resolving values in annotations.
                 */
                public Apply(VarResolverSession vr) {
-                       super(RestDelete.class, ContextPropertiesBuilder.class, 
vr);
+                       super(RestDelete.class, 
RestOperationContextBuilder.class, vr);
                }
 
                @Override
-               public void apply(AnnotationInfo<RestDelete> ai, 
ContextPropertiesBuilder b) {
+               public void apply(AnnotationInfo<RestDelete> ai, 
RestOperationContextBuilder b) {
                        RestDelete a = ai.getAnnotation();
 
                        b.setIfNotEmpty(RESTOP_httpMethod, "delete");
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index 1c8e11d..3c56711 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -490,9 +490,9 @@ public class RestGetAnnotation {
        }
 
        /**
-        * Applies {@link RestGet} annotations to a {@link 
ContextPropertiesBuilder}.
+        * Applies {@link RestGet} annotations to a {@link 
RestOperationContextBuilder}.
         */
-       public static class Apply extends 
ContextApplier<RestGet,ContextPropertiesBuilder> {
+       public static class Apply extends 
ContextApplier<RestGet,RestOperationContextBuilder> {
 
                /**
                 * Constructor.
@@ -500,11 +500,11 @@ public class RestGetAnnotation {
                 * @param vr The resolver for resolving values in annotations.
                 */
                public Apply(VarResolverSession vr) {
-                       super(RestGet.class, ContextPropertiesBuilder.class, 
vr);
+                       super(RestGet.class, RestOperationContextBuilder.class, 
vr);
                }
 
                @Override
-               public void apply(AnnotationInfo<RestGet> ai, 
ContextPropertiesBuilder b) {
+               public void apply(AnnotationInfo<RestGet> ai, 
RestOperationContextBuilder b) {
                        RestGet a = ai.getAnnotation();
 
                        b.setIfNotEmpty(RESTOP_httpMethod, "get");
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 8f9684b..6303820 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -592,9 +592,9 @@ public class RestOpAnnotation {
        }
 
        /**
-        * Applies {@link RestOp} annotations to a {@link 
ContextPropertiesBuilder}.
+        * Applies {@link RestOp} annotations to a {@link 
RestOperationContextBuilder}.
         */
-       public static class Apply extends 
ContextApplier<RestOp,ContextPropertiesBuilder> {
+       public static class Apply extends 
ContextApplier<RestOp,RestOperationContextBuilder> {
 
                /**
                 * Constructor.
@@ -602,11 +602,11 @@ public class RestOpAnnotation {
                 * @param vr The resolver for resolving values in annotations.
                 */
                public Apply(VarResolverSession vr) {
-                       super(RestOp.class, ContextPropertiesBuilder.class, vr);
+                       super(RestOp.class, RestOperationContextBuilder.class, 
vr);
                }
 
                @Override
-               public void apply(AnnotationInfo<RestOp> ai, 
ContextPropertiesBuilder b) {
+               public void apply(AnnotationInfo<RestOp> ai, 
RestOperationContextBuilder b) {
                        RestOp a = ai.getAnnotation();
 
                        b.set(REST_serializers, 
merge(ConverterUtils.toType(b.peek(REST_serializers), Object[].class), 
a.serializers()));
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 39cfb64..5792137 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -575,9 +575,9 @@ public class RestPostAnnotation {
        }
 
        /**
-        * Applies {@link RestPost} annotations to a {@link 
ContextPropertiesBuilder}.
+        * Applies {@link RestPost} annotations to a {@link 
RestOperationContextBuilder}.
         */
-       public static class Apply extends 
ContextApplier<RestPost,ContextPropertiesBuilder> {
+       public static class Apply extends 
ContextApplier<RestPost,RestOperationContextBuilder> {
 
                /**
                 * Constructor.
@@ -585,11 +585,11 @@ public class RestPostAnnotation {
                 * @param vr The resolver for resolving values in annotations.
                 */
                public Apply(VarResolverSession vr) {
-                       super(RestPost.class, ContextPropertiesBuilder.class, 
vr);
+                       super(RestPost.class, 
RestOperationContextBuilder.class, vr);
                }
 
                @Override
-               public void apply(AnnotationInfo<RestPost> ai, 
ContextPropertiesBuilder b) {
+               public void apply(AnnotationInfo<RestPost> ai, 
RestOperationContextBuilder b) {
                        RestPost a = ai.getAnnotation();
 
                        b.setIfNotEmpty(RESTOP_httpMethod, "post");
diff --git 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index a10b6d6..479116c 100644
--- 
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++ 
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -575,9 +575,9 @@ public class RestPutAnnotation {
        }
 
        /**
-        * Applies {@link RestPut} annotations to a {@link 
ContextPropertiesBuilder}.
+        * Applies {@link RestPut} annotations to a {@link 
RestOperationContextBuilder}.
         */
-       public static class Apply extends 
ContextApplier<RestPut,ContextPropertiesBuilder> {
+       public static class Apply extends 
ContextApplier<RestPut,RestOperationContextBuilder> {
 
                /**
                 * Constructor.
@@ -585,11 +585,11 @@ public class RestPutAnnotation {
                 * @param vr The resolver for resolving values in annotations.
                 */
                public Apply(VarResolverSession vr) {
-                       super(RestPut.class, ContextPropertiesBuilder.class, 
vr);
+                       super(RestPut.class, RestOperationContextBuilder.class, 
vr);
                }
 
                @Override
-               public void apply(AnnotationInfo<RestPut> ai, 
ContextPropertiesBuilder b) {
+               public void apply(AnnotationInfo<RestPut> ai, 
RestOperationContextBuilder b) {
                        RestPut a = ai.getAnnotation();
 
                        b.setIfNotEmpty(RESTOP_httpMethod, "put");

Reply via email to