feat: [OData V4] TypeDefinition Support (#644)

Author: MatKuhr

datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/EdmUtils.java

@@ -20,17 +20,12 @@ static Multiplicity convertMultiplicity( final EdmTyped edmTyped )
 
     static TypeKind convertTypeKind( final EdmTypeKind typeKind )
     {
-        switch( typeKind ) {
-            case PRIMITIVE:
-                return TypeKind.PRIMITIVE;
-            case COMPLEX:
-                return TypeKind.COMPLEX;
-            case ENTITY:
-                return TypeKind.ENTITY;
-            case ENUM:
-                return TypeKind.ENUM;
-            default:
-                throw new ODataGeneratorException("Encountered unknown type kind: " + typeKind);
-        }
+        return switch( typeKind ) {
+            case PRIMITIVE, DEFINITION -> TypeKind.PRIMITIVE;
+            case COMPLEX -> TypeKind.COMPLEX;
+            case ENTITY -> TypeKind.ENTITY;
+            case ENUM -> TypeKind.ENUM;
+            default -> throw new ODataGeneratorException("Encountered unknown type kind: " + typeKind);
+        };
     }
 }

datamodel/odata-v4/odata-v4-generator/src/test/resources/oDataGeneratorIntegrationTest/actionsAndFunctionsTest/input/actionsAndFunctions.edmx

@@ -64,6 +64,12 @@
             <Function Name="FunctionWithNewResultType">
                 <ReturnType Type="API_ACTIONS_FUNCTIONS_TEST_CASE.NewComplexResult"/>
             </Function>
+            <TypeDefinition Name="MyStringTypeDef" UnderlyingType="Edm.String"/>
+            <TypeDefinition Name="MyNumberTypeDef" UnderlyingType="Edm.Int32"/>
+            <Function Name="FunctionWithTypeDef">
+                <Parameter Name="FunctionParameter" Type="API_ACTIONS_FUNCTIONS_TEST_CASE.MyStringTypeDef"/>
+                <ReturnType Type="API_ACTIONS_FUNCTIONS_TEST_CASE.MyNumberTypeDef"/>
+            </Function>
             <EntityContainer Name="API_ACTIONS_FUNCTIONS_TEST_CASE_Entities" IsDefaultEntityContainer="true">
                 <EntitySet Name="SimplePersons" EntityType="API_ACTIONS_FUNCTIONS_TEST_CASE.SimplePerson"/>
                 <FunctionImport Name="GetPersonWithMostFriends"
@@ -72,6 +78,8 @@
                                 Function="API_ACTIONS_FUNCTIONS_TEST_CASE.FunctionWithUnassociatedEntityParameter"/>
                 <FunctionImport Name="FunctionWithNewResultType"
                                 Function="API_ACTIONS_FUNCTIONS_TEST_CASE.FunctionWithNewResultType"/>
+                <FunctionImport Name="FunctionWithTypeDef"
+                                Function="API_ACTIONS_FUNCTIONS_TEST_CASE.FunctionWithTypeDef"/>
                 <ActionImport Name="UnboundAction"
                               Action="API_ACTIONS_FUNCTIONS_TEST_CASE.UnboundAction"/>
                 <ActionImport Name="NoArgAction"

datamodel/odata-v4/odata-v4-generator/src/test/resources/oDataGeneratorIntegrationTest/actionsAndFunctionsTest/output/testcomparison/services/ActionsAndFunctionsService.java

@@ -5,6 +5,7 @@
 package testcomparison.services;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.sap.cloud.sdk.datamodel.odatav4.core.BatchRequestBuilder;
 import com.sap.cloud.sdk.datamodel.odatav4.core.CountRequestBuilder;
 import com.sap.cloud.sdk.datamodel.odatav4.core.CreateRequestBuilder;
@@ -139,6 +140,19 @@ DeleteRequestBuilder<SimplePerson> deleteSimplePerson(
     @Nonnull
     SingleValueFunctionRequestBuilder<NewComplexResult> functionWithNewResultType();
 
+    /**
+     * <p>Creates a request builder for the <b>FunctionWithTypeDef</b> OData function.</p>
+     * 
+     * @param functionParameter
+     *     Constraints: Nullable<p>Original parameter name from the Odata EDM: <b>FunctionParameter</b></p>
+     * @return
+     *     A request builder object that will execute the <b>FunctionWithTypeDef</b> OData function with the provided parameters. To perform execution, call the {@link com.sap.cloud.sdk.datamodel.odatav4.core.SingleValueFunctionRequestBuilder#execute execute} method on the request builder object.
+     */
+    @Nonnull
+    SingleValueFunctionRequestBuilder<Integer> functionWithTypeDef(
+        @Nullable
+        final String functionParameter);
+
     /**
      * <p>Creates a request builder for the <b>NoArgAction</b> OData action.</p>
      * 

datamodel/odata-v4/odata-v4-generator/src/test/resources/oDataGeneratorIntegrationTest/actionsAndFunctionsTest/output/testcomparison/services/DefaultActionsAndFunctionsService.java

@@ -5,8 +5,10 @@
 package testcomparison.services;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import com.sap.cloud.sdk.datamodel.odatav4.core.BatchRequestBuilder;
 import com.sap.cloud.sdk.datamodel.odatav4.core.CountRequestBuilder;
 import com.sap.cloud.sdk.datamodel.odatav4.core.CreateRequestBuilder;
@@ -125,6 +127,16 @@ public SingleValueFunctionRequestBuilder<NewComplexResult> functionWithNewResult
         return new SingleValueFunctionRequestBuilder<NewComplexResult>(servicePath, "FunctionWithNewResultType", NewComplexResult.class);
     }
 
+    @Override
+    @Nonnull
+    public SingleValueFunctionRequestBuilder<Integer> functionWithTypeDef(
+        @Nullable
+        final String functionParameter) {
+        final LinkedHashMap<String, Object> parameters = new LinkedHashMap<String, Object>();
+        parameters.put("FunctionParameter", functionParameter);
+        return new SingleValueFunctionRequestBuilder<Integer>(servicePath, "FunctionWithTypeDef", parameters, Integer.class);
+    }
+
     @Override
     @Nonnull
     public SingleValueActionRequestBuilder<Void> noArgAction() {

release_notes.md

@@ -12,7 +12,7 @@
 
 ### ✨ New Functionality
 
-- 
+- Add support for `TypeDefinition` entries in OData V4 EDMX files.
 
 ### 📈 Improvements