use enumMapping instead of enumMappingId in resultType transformer (#…

…2850) * use enumMapping instead of enumMappingId in resultType transformer * fix openapi schema gen test for tds services * Revert "fix openapi schema gen test for tds services" This reverts commit 96f9487. * don't generate schemas for enumMapping
finos · May 14, 2024 · 6751e12 · 6751e12
1 parent 67172e4
commit 6751e12
Show file tree

Hide file tree

Showing 19 changed files with 162 additions and 101 deletions.
diff --git a/...-core/src/main/resources/core/pure/binding/protocols/pure/vX_X_X/extension/extension.pure b/...-core/src/main/resources/core/pure/binding/protocols/pure/vX_X_X/extension/extension.pure
@@ -21,11 +21,11 @@ function meta::protocols::pure::vX_X_X::external::shared::format::serializerExte
 {
    ^meta::protocols::pure::vX_X_X::extension::SerializerExtension_vX_X_X(
       transfers_executionPlan_transformNode =
-         {mapping:Mapping[1], extensions:Extension[*] |
+         {extensions:Extension[*] |
             [
-               d:meta::external::format::shared::executionPlan::ExternalFormatExternalizeExecutionNode[1] | transformExternalFormatExternalizeExecutionNode($d, $mapping, $extensions),
-               s:meta::external::format::shared::executionPlan::ExternalFormatInternalizeExecutionNode[1] | transformExternalFormatInternalizeExecutionNode($s, $mapping, $extensions),
-               t:meta::external::format::shared::executionPlan::ExternalFormatExternalizeTDSExecutionNode[1] | transformExternalFormatExternalizeTDSExecutionNode($t, $mapping, $extensions)
+               d:meta::external::format::shared::executionPlan::ExternalFormatExternalizeExecutionNode[1] | transformExternalFormatExternalizeExecutionNode($d, $extensions),
+               s:meta::external::format::shared::executionPlan::ExternalFormatInternalizeExecutionNode[1] | transformExternalFormatInternalizeExecutionNode($s, $extensions),
+               t:meta::external::format::shared::executionPlan::ExternalFormatExternalizeTDSExecutionNode[1] | transformExternalFormatExternalizeTDSExecutionNode($t, $extensions)
 
             ]
          }

diff --git a/...e/src/main/resources/core/pure/binding/protocols/pure/vX_X_X/transfers/executionPlan.pure b/...e/src/main/resources/core/pure/binding/protocols/pure/vX_X_X/transfers/executionPlan.pure
@@ -12,38 +12,39 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::*;
 import meta::protocols::pure::vX_X_X::metamodel::executionPlan::*;
 import meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::*;
 import meta::pure::mapping::*;
 import meta::pure::extension::*;
 
-function meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::transformExternalFormatExternalizeExecutionNode(node:meta::external::format::shared::executionPlan::ExternalFormatExternalizeExecutionNode[1], mapping:meta::pure::mapping::Mapping[1], extensions:Extension[*]): ExecutionNode[1]
+function meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::transformExternalFormatExternalizeExecutionNode(node:meta::external::format::shared::executionPlan::ExternalFormatExternalizeExecutionNode[1], extensions:Extension[*]): ExecutionNode[1]
 {
    ^meta::protocols::pure::vX_X_X::metamodel::external::shared::format::executionPlan::ExternalFormatExternalizeExecutionNode(
       _type             = 'externalFormatExternalize',
-      resultType        = $node.resultType->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::transformResultType($mapping, $extensions),
+      resultType        = $node.resultType->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::transformResultType($extensions),
       resultSizeRange   = $node.resultSizeRange->map(s| $s->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::domain::transformMultiplicity()),
       checked           = $node.checked,
       binding           = $node.binding->elementToPath(),
       contentType       = $node.binding.contentType
    );
 }
 
-function meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::transformExternalFormatExternalizeTDSExecutionNode(node:meta::external::format::shared::executionPlan::ExternalFormatExternalizeTDSExecutionNode[1], mapping:meta::pure::mapping::Mapping[1], extensions:Extension[*]): ExecutionNode[1]
+function meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::transformExternalFormatExternalizeTDSExecutionNode(node:meta::external::format::shared::executionPlan::ExternalFormatExternalizeTDSExecutionNode[1], extensions:Extension[*]): ExecutionNode[1]
 {
    ^meta::protocols::pure::vX_X_X::metamodel::external::shared::format::executionPlan::ExternalFormatExternalizeTDSExecutionNode(
       _type             = 'externalFormatExternalizeTDS',
-      resultType        = $node.resultType->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::transformResultType($mapping, $extensions),
+      resultType        = $node.resultType->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::transformResultType($extensions),
       resultSizeRange   = $node.resultSizeRange->map(s| $s->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::domain::transformMultiplicity()),
       contentType       = $node.contentType
    );
 }
 
-function meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::transformExternalFormatInternalizeExecutionNode(node:meta::external::format::shared::executionPlan::ExternalFormatInternalizeExecutionNode[1], mapping:meta::pure::mapping::Mapping[1], extensions:Extension[*]): ExecutionNode[1]
+function meta::protocols::pure::vX_X_X::transformation::fromPureGraph::external::shared::format::transformExternalFormatInternalizeExecutionNode(node:meta::external::format::shared::executionPlan::ExternalFormatInternalizeExecutionNode[1], extensions:Extension[*]): ExecutionNode[1]
 {
    ^meta::protocols::pure::vX_X_X::metamodel::external::shared::format::executionPlan::ExternalFormatInternalizeExecutionNode(
       _type             = 'externalFormatInternalize',
-      resultType        = $node.resultType->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::transformResultType($mapping, $extensions),
+      resultType        = $node.resultType->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::executionPlan::transformResultType($extensions),
       resultSizeRange   = $node.resultSizeRange->map(s| $s->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::domain::transformMultiplicity()),
       tree              = $node.tree->map(t| $t->meta::protocols::pure::vX_X_X::transformation::fromPureGraph::valueSpecification::transformGraphFetchTree([], ^Map<String,List<Any>>(), $extensions))->cast(@meta::protocols::pure::vX_X_X::metamodel::valueSpecification::raw::RootGraphFetchTree),
       binding           = $node.binding->elementToPath(),

diff --git a/...-code-compiled-core/src/main/resources/core/pure/protocol/vX_X_X/extension/extension.pure b/...-code-compiled-core/src/main/resources/core/pure/protocol/vX_X_X/extension/extension.pure
@@ -37,10 +37,10 @@ Class meta::protocols::pure::vX_X_X::extension::SerializerExtension_vX_X_X exten
 
    transfers_valueSpecification_transformAny : Function<{String[*],Map<String,List<Any>>[1], Multiplicity[1], FunctionExpression[0..1], Boolean[1], meta::pure::extension::Extension[*]->Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::valueSpecification::ValueSpecification[1]}>[*]}>[0..1];
 
-   transfers_executionPlan_transformNode : Function<{Mapping[1], meta::pure::extension::Extension[*] -> Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::executionPlan::ExecutionNode[1]}>[*]}>[0..1];
+   transfers_executionPlan_transformNode : Function<{meta::pure::extension::Extension[*] -> Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::executionPlan::ExecutionNode[1]}>[*]}>[0..1];
    transfers_executionPlan_transformNode_GraphFetchM2MExecutionNode : Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::store::Store[1]}>[*];
    transfers_executionPlan_transformNode_StoreStreamReadingExecutionNode : Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::store::Store[1]}>[*];
-   transfers_executionPlan_transformResultType : Function<{Mapping[1], meta::pure::extension::Extension[*] -> Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::executionPlan::ResultType[1]}>[*]}>[0..1];
+   transfers_executionPlan_transformResultType : Function<{meta::pure::extension::Extension[*] -> Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::executionPlan::ResultType[1]}>[*]}>[0..1];
    transfers_executionPlan_transformSetImplementation : Pair<Function<{PropertyMapping[1]->Boolean[1]}>, Function<{PropertyMapping[1]->Map<String,List<String>>[1]}>>[0..1];
 
    transfers_store_transformStore : Function<{Nil[1]->meta::protocols::pure::vX_X_X::metamodel::store::Store[1]}>[*];