Fix policyBuilder

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java

@@ -24,6 +24,7 @@
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.listen;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.toOne;
 import static io.serverlessworkflow.fluent.spec.dsl.DSL.auth;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.use;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -263,7 +264,7 @@ void get_convenience_creates_http_get() {
   void get_named_with_authentication_uses_auth_policy() {
     Workflow wf =
         FuncWorkflowBuilder.workflow("http-get-auth")
-            .tasks(get("fetchUsers", "http://service/api/users", auth("user-service-auth")))
+            .tasks(get("fetchUsers", "http://service/api/users", use("user-service-auth")))
             .build();
 
     List<TaskItem> items = wf.getDo();

fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/ReferenceableAuthenticationPolicyBuilder.java

@@ -21,51 +21,44 @@
 import java.util.function.Consumer;
 
 public class ReferenceableAuthenticationPolicyBuilder {
-  final AuthenticationPolicyUnion authenticationPolicy;
-  final AuthenticationPolicyReference authenticationPolicyReference;
+  private AuthenticationPolicyUnion authenticationPolicy;
+  private AuthenticationPolicyReference authenticationPolicyReference;
 
-  public ReferenceableAuthenticationPolicyBuilder() {
-    this.authenticationPolicy = new AuthenticationPolicyUnion();
-    this.authenticationPolicyReference = new AuthenticationPolicyReference();
-  }
+  public ReferenceableAuthenticationPolicyBuilder() {}
 
   public ReferenceableAuthenticationPolicyBuilder basic(
       Consumer<BasicAuthenticationPolicyBuilder> basicConsumer) {
-    final BasicAuthenticationPolicyBuilder basicAuthenticationPolicyBuilder =
-        new BasicAuthenticationPolicyBuilder();
-    basicConsumer.accept(basicAuthenticationPolicyBuilder);
-    this.authenticationPolicy.setBasicAuthenticationPolicy(
-        basicAuthenticationPolicyBuilder.build());
+    final BasicAuthenticationPolicyBuilder builder = new BasicAuthenticationPolicyBuilder();
+    basicConsumer.accept(builder);
+    this.authenticationPolicy =
+        new AuthenticationPolicyUnion().withBasicAuthenticationPolicy(builder.build());
     return this;
   }
 
   public ReferenceableAuthenticationPolicyBuilder bearer(
       Consumer<BearerAuthenticationPolicyBuilder> bearerConsumer) {
-    final BearerAuthenticationPolicyBuilder bearerAuthenticationPolicyBuilder =
-        new BearerAuthenticationPolicyBuilder();
-    bearerConsumer.accept(bearerAuthenticationPolicyBuilder);
-    this.authenticationPolicy.setBearerAuthenticationPolicy(
-        bearerAuthenticationPolicyBuilder.build());
+    final BearerAuthenticationPolicyBuilder builder = new BearerAuthenticationPolicyBuilder();
+    bearerConsumer.accept(builder);
+    this.authenticationPolicy =
+        new AuthenticationPolicyUnion().withBearerAuthenticationPolicy(builder.build());
     return this;
   }
 
   public ReferenceableAuthenticationPolicyBuilder digest(
       Consumer<DigestAuthenticationPolicyBuilder> digestConsumer) {
-    final DigestAuthenticationPolicyBuilder digestAuthenticationPolicyBuilder =
-        new DigestAuthenticationPolicyBuilder();
-    digestConsumer.accept(digestAuthenticationPolicyBuilder);
-    this.authenticationPolicy.setDigestAuthenticationPolicy(
-        digestAuthenticationPolicyBuilder.build());
+    final DigestAuthenticationPolicyBuilder builder = new DigestAuthenticationPolicyBuilder();
+    digestConsumer.accept(builder);
+    this.authenticationPolicy =
+        new AuthenticationPolicyUnion().withDigestAuthenticationPolicy(builder.build());
     return this;
   }
 
   public ReferenceableAuthenticationPolicyBuilder oauth2(
       Consumer<OAuth2AuthenticationPolicyBuilder> oauth2Consumer) {
-    final OAuth2AuthenticationPolicyBuilder oauth2AuthenticationPolicyBuilder =
-        new OAuth2AuthenticationPolicyBuilder();
-    oauth2Consumer.accept(oauth2AuthenticationPolicyBuilder);
-    this.authenticationPolicy.setOAuth2AuthenticationPolicy(
-        oauth2AuthenticationPolicyBuilder.build());
+    final OAuth2AuthenticationPolicyBuilder builder = new OAuth2AuthenticationPolicyBuilder();
+    oauth2Consumer.accept(builder);
+    this.authenticationPolicy =
+        new AuthenticationPolicyUnion().withOAuth2AuthenticationPolicy(builder.build());
     return this;
   }
 
@@ -74,12 +67,13 @@ public ReferenceableAuthenticationPolicyBuilder openIDConnect(
     final OpenIdConnectAuthenticationPolicyBuilder builder =
         new OpenIdConnectAuthenticationPolicyBuilder();
     openIdConnectConsumer.accept(builder);
-    this.authenticationPolicy.setOpenIdConnectAuthenticationPolicy(builder.build());
+    this.authenticationPolicy =
+        new AuthenticationPolicyUnion().withOpenIdConnectAuthenticationPolicy(builder.build());
     return this;
   }
 
   public ReferenceableAuthenticationPolicyBuilder use(String use) {
-    this.authenticationPolicyReference.setUse(use);
+    this.authenticationPolicyReference = new AuthenticationPolicyReference().withUse(use);
     return this;
   }
 

fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/dsl/DSL.java

@@ -319,7 +319,7 @@ public static Consumer<TryTaskBuilder.CatchErrorsBuilder> errorFilter(
    * @param authName the name of a reusable authentication policy
    * @return an {@link AuthenticationConfigurer} that sets {@code use(authName)}
    */
-  public static AuthenticationConfigurer auth(String authName) {
+  public static AuthenticationConfigurer use(String authName) {
     return a -> a.use(authName);
   }
 

fluent/spec/src/main/java/io/serverlessworkflow/fluent/spec/spi/CallHttpTaskFluent.java

@@ -19,6 +19,7 @@
 import io.serverlessworkflow.api.types.CallHTTP;
 import io.serverlessworkflow.api.types.Endpoint;
 import io.serverlessworkflow.api.types.EndpointConfiguration;
+import io.serverlessworkflow.api.types.EndpointUri;
 import io.serverlessworkflow.api.types.HTTPArguments;
 import io.serverlessworkflow.api.types.HTTPHeaders;
 import io.serverlessworkflow.api.types.HTTPQuery;
@@ -59,14 +60,17 @@ default SELF endpoint(URI endpoint) {
   default SELF endpoint(URI endpoint, Consumer<ReferenceableAuthenticationPolicyBuilder> auth) {
     final ReferenceableAuthenticationPolicyBuilder policy =
         new ReferenceableAuthenticationPolicyBuilder();
+    final UriTemplate uriTemplate = new UriTemplate().withLiteralUri(endpoint);
     auth.accept(policy);
     ((CallHTTP) this.self().getTask())
         .getWith()
         .setEndpoint(
             new Endpoint()
                 .withEndpointConfiguration(
-                    new EndpointConfiguration().withAuthentication(policy.build()))
-                .withUriTemplate(new UriTemplate().withLiteralUri(endpoint)));
+                    new EndpointConfiguration()
+                        .withUri(new EndpointUri().withLiteralEndpointURI(uriTemplate))
+                        .withAuthentication(policy.build()))
+                .withUriTemplate(uriTemplate));
     return self();
   }