[Fix serverlessworkflow#490] Fixing schema generation

Author: fjtirado

api/src/main/resources/schema/workflow.yaml

@@ -1325,47 +1325,25 @@ $defs:
               $ref: '#/$defs/eventFilter'
         required: [ all ]
       - title: AnyEventConsumptionStrategy
-        oneOf:
-          - properties:
-              any:
-                type: array
-                title: AnyEventConsumptionStrategyConfiguration
-                description: A list containing any of the events to consume.
-                items:
-                  $ref: '#/$defs/eventFilter'
-                minItems: 1
-              until:
-                oneOf:
-                  - type: string
-                    title: AnyEventUntilCondition
-                    description: A runtime expression condition evaluated after consuming an event and which determines whether or not to continue listening.
-                  - allOf:
-                      - $ref: '#/$defs/eventConsumptionStrategy'
-                        title: AnyEventUntilConsumed
-                        description: The strategy that defines the event(s) to consume to stop listening.
-                      - properties:
-                          until: false
-            required: [ any ]
-          - properties:
-              any:
-                type: array
-                title: AnyEventConsumptionStrategyConfiguration
-                description: A list containing any of the events to consume.
-                items:
-                  $ref: '#/$defs/eventFilter'
-                maxItems: 0
-              until:
-                oneOf:
-                  - type: string
-                    title: AnyEventUntilCondition
-                    description: A runtime expression condition evaluated after consuming an event and which determines whether or not to continue listening.
-                  - allOf:
-                      - $ref: '#/$defs/eventConsumptionStrategy'
-                        title: AnyEventUntilConsumed
-                        description: The strategy that defines the event(s) to consume to stop listening.
-                      - properties:
-                          until: false
-            required: [ any, until ]
+        properties:
+          any:
+              type: array
+              title: AnyEventConsumptionStrategyConfiguration
+              description: A list containing any of the events to consume.
+              items:
+                $ref: '#/$defs/eventFilter'
+          until:
+            oneOf:
+              - type: string
+                title: AnyEventUntilCondition
+                description: A runtime expression condition evaluated after consuming an event and which determines whether or not to continue listening.
+              - allOf:
+                  - $ref: '#/$defs/eventConsumptionStrategy'
+                    description: The strategy that defines the event(s) to consume to stop listening.
+                  - properties:
+                      until: false
+                title: AnyEventUntilConsumed
+        required: [ any ]  
       - title: OneEventConsumptionStrategy
         properties:
           one:

custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java

@@ -60,6 +60,7 @@ class AllAnyOneOfSchemaRule extends SchemaRule {
   }
 
   private static final String REF = "$ref";
+  private static final String TITLE = "title";
   private static final String PATTERN = "pattern";
 
   private enum Format {
@@ -154,6 +155,16 @@ public JType apply(
         && allOfTypes.isEmpty()
         && refType.isPresent()) {
       javaType = refType.get();
+    } else if (!schemaNode.has("properties")
+        && oneOfTypes.isEmpty()
+        && allOfTypes.size() == 1
+        && refType.isEmpty()) {
+      javaType = allOfTypes.get(0).getType();
+    } else if (!schemaNode.has("properties")
+        && oneOfTypes.size() == 1
+        && allOfTypes.isEmpty()
+        && refType.isEmpty()) {
+      javaType = oneOfTypes.get(0).getType();
     } else {
       JPackage container = generatableType.getPackage();
       javaType = ruleFactory.getTypeRule().apply(nodeName, schemaNode, parent, container, schema);
@@ -469,6 +480,9 @@ private void unionType(
       Collection<JTypeWrapper> types) {
     if (schemaNode.has(prefix)) {
       ArrayNode array = (ArrayNode) schemaNode.get(prefix);
+      if (schemaNode.has(TITLE)) {
+        nodeName = schemaNode.get(TITLE).asText();
+      }
       int i = 0;
       for (JsonNode oneOf : array) {
         if (!ignoreNode(oneOf)) {
@@ -491,6 +505,23 @@ private void unionType(
   }
 
   private static boolean ignoreNode(JsonNode node) {
+    return allRequired(node) || allRemoveProperties(node);
+  }
+
+  private static boolean allRemoveProperties(JsonNode node) {
+    if (node.size() == 1 && node.has("properties")) {
+      JsonNode propsNode = node.get("properties");
+      for (JsonNode propNode : propsNode) {
+        if (!propNode.isBoolean() || propNode.asBoolean()) {
+          return false;
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+
+  private static boolean allRequired(JsonNode node) {
     return node.size() == 1 && node.has("required");
   }
 
@@ -514,7 +545,7 @@ private Optional<JType> refType(
           schema.isGenerated()
               ? schema.getJavaType()
               : apply(
-                  nameFromRef(ref, nodeName),
+                  nameFromRef(ref, nodeName, schemaNode),
                   schema.getContent(),
                   parent,
                   generatableType,
@@ -556,7 +587,10 @@ private String pattern(JsonNode node) {
     return format != null ? format.pattern() : getFromNode(node, PATTERN);
   }
 
-  private String nameFromRef(String ref, String nodeName) {
+  private String nameFromRef(String ref, String nodeName, JsonNode schemaNode) {
+    if (schemaNode.has(TITLE)) {
+      return schemaNode.get(TITLE).asText();
+    }
     if ("#".equals(ref)) {
       return nodeName;
     }

custom-generator/src/main/java/io/serverlessworkflow/generator/RefNameHelper.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.generator;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.sun.codemodel.JClassAlreadyExistsException;
+import com.sun.codemodel.JDefinedClass;
+import com.sun.codemodel.JPackage;
+import org.jsonschema2pojo.GenerationConfig;
+import org.jsonschema2pojo.util.NameHelper;
+
+public class RefNameHelper extends NameHelper {
+
+  public RefNameHelper(GenerationConfig generationConfig) {
+    super(generationConfig);
+  }
+
+  @Override
+  public String getUniqueClassName(String nodeName, JsonNode node, JPackage _package) {
+    String className = getClassName(nodeName, node, _package);
+    try {
+      JDefinedClass _class = _package._class(className);
+      _package.remove(_class);
+      return className;
+    } catch (JClassAlreadyExistsException ex) {
+      return super.getUniqueClassName(nodeName, null, _package);
+    }
+  }
+}

custom-generator/src/main/java/io/serverlessworkflow/generator/UnreferencedFactory.java

@@ -18,10 +18,25 @@
 import com.sun.codemodel.JClassContainer;
 import com.sun.codemodel.JDefinedClass;
 import com.sun.codemodel.JType;
+import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.rules.Rule;
 import org.jsonschema2pojo.rules.RuleFactory;
+import org.jsonschema2pojo.util.NameHelper;
 
 public class UnreferencedFactory extends RuleFactory {
+
+  private NameHelper refNameHelper;
+
+  public UnreferencedFactory() {
+    this.refNameHelper = new RefNameHelper(getGenerationConfig());
+  }
+
+  @Override
+  public void setGenerationConfig(final GenerationConfig generationConfig) {
+    super.setGenerationConfig(generationConfig);
+    this.refNameHelper = new RefNameHelper(generationConfig);
+  }
+
   @Override
   public Rule<JClassContainer, JType> getSchemaRule() {
     return new AllAnyOneOfSchemaRule(this);
@@ -36,4 +51,9 @@ public Rule<JClassContainer, JType> getTypeRule() {
   public Rule<JDefinedClass, JDefinedClass> getAdditionalPropertiesRule() {
     return new UnevaluatedPropertiesRule(this);
   }
+
+  @Override
+  public NameHelper getNameHelper() {
+    return refNameHelper;
+  }
 }

impl/core/src/main/java/io/serverlessworkflow/impl/ExpressionHolder.java

@@ -0,0 +1,7 @@
+package io.serverlessworkflow.impl;
+
+import java.util.function.BiFunction;
+
+public interface ExpressionHolder<T> extends BiFunction<WorkflowContext, TaskContext, T>{
+
+}

impl/core/src/main/java/io/serverlessworkflow/impl/LongFilter.java

@@ -18,4 +18,4 @@
 import java.util.function.BiFunction;
 
 @FunctionalInterface
-public interface LongFilter extends BiFunction<WorkflowContext, TaskContext, Long> {}
+public interface LongFilter extends ExpressionHolder<Long> {}

impl/core/src/main/java/io/serverlessworkflow/impl/StringFilter.java

@@ -15,7 +15,5 @@
  */
 package io.serverlessworkflow.impl;
 
-import java.util.function.BiFunction;
-
 @FunctionalInterface
-public interface StringFilter extends BiFunction<WorkflowContext, TaskContext, String> {}
+public interface StringFilter extends ExpressionHolder<String> {}

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java

@@ -18,6 +18,8 @@
 import com.github.f4b6a3.ulid.UlidCreator;
 import io.serverlessworkflow.api.types.Document;
 import io.serverlessworkflow.api.types.Workflow;
+import io.serverlessworkflow.impl.events.DefaultEventConsumer;
+import io.serverlessworkflow.impl.events.EventConsumer;
 import io.serverlessworkflow.impl.executors.DefaultTaskExecutorFactory;
 import io.serverlessworkflow.impl.executors.TaskExecutorFactory;
 import io.serverlessworkflow.impl.expressions.ExpressionFactory;
@@ -47,7 +49,7 @@ public class WorkflowApplication implements AutoCloseable {
   private final WorkflowPositionFactory positionFactory;
   private final ExecutorServiceFactory executorFactory;
   private final RuntimeDescriptorFactory runtimeDescriptorFactory;
-  private final EventConsumer<?> eventConsumer;
+  private final EventConsumer<?, ?> eventConsumer;
 
   private ExecutorService executorService;
 
@@ -102,7 +104,7 @@ public static class Builder {
     private WorkflowPositionFactory positionFactory = () -> new QueueWorkflowPosition();
     private WorkflowIdFactory idFactory = () -> UlidCreator.getMonotonicUlid().toString();
     private ExecutorServiceFactory executorFactory = () -> Executors.newCachedThreadPool();
-    private EventConsumer<?> eventConsumer = DefaultEventConsumer.get();
+    private EventConsumer<?, ?> eventConsumer = DefaultEventConsumer.get();
     private RuntimeDescriptorFactory descriptorFactory =
         () -> new RuntimeDescriptor("reference impl", "1.0.0_alpha", Collections.emptyMap());
 
@@ -156,7 +158,7 @@ public Builder withDescriptorFactory(RuntimeDescriptorFactory factory) {
       return this;
     }
 
-    public Builder withEventConsumer(EventConsumer<?> eventConsumer) {
+    public Builder withEventConsumer(EventConsumer<?, ?> eventConsumer) {
       this.eventConsumer = eventConsumer;
       return this;
     }

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java

@@ -24,6 +24,7 @@
 import io.serverlessworkflow.api.types.SchemaExternal;
 import io.serverlessworkflow.api.types.SchemaInline;
 import io.serverlessworkflow.api.types.SchemaUnion;
+import io.serverlessworkflow.api.types.UriTemplate;
 import io.serverlessworkflow.impl.expressions.Expression;
 import io.serverlessworkflow.impl.expressions.ExpressionFactory;
 import io.serverlessworkflow.impl.expressions.ExpressionUtils;
@@ -35,8 +36,11 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.net.URI;
+import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 public class WorkflowUtils {
 
@@ -80,6 +84,21 @@ public static Optional<WorkflowFilter> buildWorkflowFilter(
         ? Optional.of(buildWorkflowFilter(exprFactory, as.getString(), as.getObject()))
         : Optional.empty();
   }
+  
+  public static <T> ExpressionHolder<T> buildExpressionHolder (ExpressionFactory exprFactory,  String expression, T literal, Function<JsonNode,T> converter) {
+	  return expression != null
+		        ? buildExpressionHolder(buildWorkflowFilter(exprFactory, expression),converter)
+		        : buildExpressionHolder(literal);
+  }
+  
+  private static <T> ExpressionHolder<T> buildExpressionHolder (WorkflowFilter filter, Function<JsonNode,T> converter) {
+	  return (w, t) -> converter.apply(filter.apply(w, t, t.input()));
+  }
+
+  
+  private static <T> ExpressionHolder<T> buildExpressionHolder (T literal) {
+	  return (w, t) -> literal;
+  }
 
   public static Optional<WorkflowFilter> buildWorkflowFilter(
       ExpressionFactory exprFactory, ExportAs as) {
@@ -95,19 +114,21 @@ public static StringFilter buildStringFilter(
         : toString(literal);
   }
 
+
   public static StringFilter buildStringFilter(ExpressionFactory exprFactory, String str) {
     return ExpressionUtils.isExpr(str)
         ? toString(buildWorkflowFilter(exprFactory, str))
         : toString(str);
   }
-
+ 
   private static StringFilter toString(WorkflowFilter filter) {
     return (w, t) -> filter.apply(w, t, t.input()).asText();
   }
 
   private static StringFilter toString(String literal) {
     return (w, t) -> literal;
   }
+  
 
   private static WorkflowFilter buildWorkflowFilter(
       ExpressionFactory exprFactory, String str, Object object) {
@@ -148,4 +169,9 @@ public static WorkflowFilter buildWorkflowFilter(ExpressionFactory exprFactory,
   public static Optional<WorkflowFilter> optionalFilter(ExpressionFactory exprFactory, String str) {
     return str != null ? Optional.of(buildWorkflowFilter(exprFactory, str)) : Optional.empty();
   }
+  
+  public static String toString (UriTemplate template) {
+	   URI uri = template.getLiteralUri();
+	   return uri != null ? uri.toString() : template.getLiteralUriTemplate();
+  }
 }