Cloud SDK generator with oneOf fix (#186)

* Cloud SDK generator with oneOf fix

* Skip generation

* Formatting

* Beta

* 0.36.1

* Added generateApis option to false

* Added skip true

* Revert spec to 0.29.3

* Revert e2e test fixes

* Merge main

* Delete os generator files

* Revert spec changes

---------

Co-authored-by: SAP Cloud SDK Bot <[email protected]>
Co-authored-by: Matthias Kuhr <[email protected]>

Author: 3 people

core/pom.xml

@@ -157,6 +157,8 @@
             <groupId>com.sap.cloud.sdk.datamodel</groupId>
             <artifactId>openapi-generator-maven-plugin</artifactId>
             <configuration>
+              <skip>true</skip>
+              <!-- TODO: remove this once Cloud SDK 5.15.0 is released -->
               <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
               <apiMaturity>released</apiMaturity>
               <enableOneOfAnyOfGeneration>true</enableOneOfAnyOfGeneration>

core/src/main/java/com/sap/ai/sdk/core/client/model/BckndGenericSecretPatchBody.java

@@ -61,7 +61,6 @@ public BckndGenericSecretPatchBody data(@Nonnull final Map<String, String> data)
   @Nonnull
   public BckndGenericSecretPatchBody putdataItem(
       @Nonnull final String key, @Nonnull final String dataItem) {
-    this.data = new HashMap<>();
     this.data.put(key, dataItem);
     return this;
   }

core/src/main/java/com/sap/ai/sdk/core/client/model/BckndGenericSecretPostBody.java

@@ -100,7 +100,6 @@ public BckndGenericSecretPostBody data(@Nonnull final Map<String, String> data)
   @Nonnull
   public BckndGenericSecretPostBody putdataItem(
       @Nonnull final String key, @Nonnull final String dataItem) {
-    this.data = new HashMap<>();
     this.data.put(key, dataItem);
     return this;
   }

core/src/main/java/com/sap/ai/sdk/core/client/model/BckndResourceGetResponse.java

@@ -64,7 +64,6 @@ public BckndResourceGetResponse resourcePlans(
   public BckndResourceGetResponse putresourcePlansItem(
       @Nonnull final String key,
       @Nonnull final BckndResourceGetResourcePlansValue resourcePlansItem) {
-    this.resourcePlans = new HashMap<>();
     this.resourcePlans.put(key, resourcePlansItem);
     return this;
   }

orchestration/.openapi-generator-ignore

@@ -85,10 +85,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -140,72 +136,40 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.openapitools</groupId>
+            <groupId>com.sap.cloud.sdk.datamodel</groupId>
             <artifactId>openapi-generator-maven-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>
+              <!-- TODO: remove this once Cloud SDK 5.15.0 is released -->
+              <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
+              <apiMaturity>beta</apiMaturity>
+              <enableOneOfAnyOfGeneration>true</enableOneOfAnyOfGeneration>
+              <compileScope>COMPILE</compileScope>
+              <deleteOutputDirectory>true</deleteOutputDirectory>
+            </configuration>
             <executions>
               <execution>
+                <id>orchestration</id>
                 <goals>
                   <goal>generate</goal>
                 </goals>
                 <phase>generate-sources</phase>
                 <configuration>
-                  <!-- Specify the input OpenAPI spec file -->
                   <inputSpec>${project.basedir}/src/main/resources/spec/orchestration.yaml</inputSpec>
-                  <output>${project.basedir}</output>
-                  <!-- Specify the generator to use, e.g., java, spring, kotlin, etc. -->
-                  <generatorName>java</generatorName>
-                  <!-- Specify the package names for models, APIs, and invokers -->
+                  <apiPackage>com.sap.ai.sdk.orchestration.client</apiPackage>
+                  <generateApis>false</generateApis>
                   <modelPackage>com.sap.ai.sdk.orchestration.client.model</modelPackage>
-                  <apiPackage>com.sap.ai.sdk.orchestration.client.api</apiPackage>
-                  <invokerPackage>com.sap.ai.sdk.orchestration.client.invoker</invokerPackage>
-
-                  <!-- Global properties level; can be unpacked with 'generate' prefix-->
-                  <globalProperties>
-                    <apiDocs>false</apiDocs>
-                    <modelDocs>false</modelDocs>
-                    <modelTests>false</modelTests>
-                    <apiTests>false</apiTests>
-                    <minimalUpdate>true</minimalUpdate>
-                  </globalProperties>
-
-                  <!-- Generator Specific properties level; some can be unpacked-->
-                  <configOptions>
-                    <generateBuilders>true</generateBuilders>
-                    <failOnUnknownProperties>false</failOnUnknownProperties>
-                    <hideGenerationTimestamp>true</hideGenerationTimestamp>
-                    <disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
+                  <additionalProperties>
+                    <pojoBuilderMethodName>create</pojoBuilderMethodName>
+                    <pojoBuildMethodName/>
+                    <pojoConstructorVisibility>protected</pojoConstructorVisibility>
                     <enumUnknownDefaultCase>true</enumUnknownDefaultCase>
-                    <useBeanValidation>false</useBeanValidation>
                     <useOneOfInterfaces>true</useOneOfInterfaces>
-                    <additionalModelTypeAnnotations>@com.google.common.annotations.Beta</additionalModelTypeAnnotations>
-                  </configOptions>
-                  <generateModels>true</generateModels>
-                  <generateSupportingFiles>false</generateSupportingFiles>
-                  <generateApis>false</generateApis>
-                  <library>resttemplate</library>
-                  <!--<configHelp>true</configHelp>-->
+                  </additionalProperties>
                 </configuration>
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${project.basedir}/src/main/java/com/sap/ai/sdk/orchestration/client</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
-                </fileset>
-              </filesets>
-            </configuration>
-            <executions>
-              <execution>
-                <id>delete-orchestration-generated-client</id>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

orchestration/pom.xml

@@ -53,10 +53,10 @@ public AzureContentSafetyFilterConfig createConfig() {
       throw new IllegalArgumentException("At least one filter category must be set");
     }
 
-    return new AzureContentSafetyFilterConfig()
+    return AzureContentSafetyFilterConfig.create()
         .type(AzureContentSafetyFilterConfig.TypeEnum.AZURE_CONTENT_SAFETY)
         .config(
-            new AzureContentSafety()
+            AzureContentSafety.create()
                 .hate(hate != null ? hate.getAzureThreshold() : null)
                 .selfHarm(selfHarm != null ? selfHarm.getAzureThreshold() : null)
                 .sexual(sexual != null ? sexual.getAzureThreshold() : null)

orchestration/src/main/java/com/sap/ai/sdk/orchestration/AzureContentFilter.java

@@ -27,9 +27,9 @@ static CompletionPostRequest toCompletionPostRequest(
     // subsequent requests
     val configCopy = config.withTemplateConfig(template);
 
-    return new CompletionPostRequest()
+    return CompletionPostRequest.create()
         .orchestrationConfig(
-            new OrchestrationConfig().moduleConfigurations(toModuleConfigs(configCopy)))
+            OrchestrationConfig.create().moduleConfigurations(toModuleConfigs(configCopy)))
         .inputParams(prompt.getTemplateParameters())
         .messagesHistory(prompt.getMessagesHistory());
   }
@@ -51,7 +51,7 @@ static TemplatingModuleConfig toTemplateModuleConfig(
       throw new IllegalStateException(
           "A prompt is required. Pass at least one message or configure a template with messages or a template reference.");
     }
-    return new Template().template(messagesWithPrompt);
+    return Template.create().template(messagesWithPrompt);
   }
 
   @Nonnull
@@ -62,7 +62,7 @@ static ModuleConfigs toModuleConfigs(@Nonnull final OrchestrationModuleConfig co
 
     //noinspection DataFlowIssue the template is always non-null here
     val moduleConfig =
-        new ModuleConfigs()
+        ModuleConfigs.create()
             .llmModuleConfig(llmConfig)
             .templatingModuleConfig(config.getTemplateConfig());
 

orchestration/src/main/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformer.java

@@ -78,8 +78,8 @@ public DpiMasking withEntities(
   @Nonnull
   @Override
   public MaskingProviderConfig createConfig() {
-    val entitiesDTO = entities.stream().map(it -> new DPIEntityConfig().type(it)).toList();
-    return new DPIConfig()
+    val entitiesDTO = entities.stream().map(it -> DPIEntityConfig.create().type(it)).toList();
+    return DPIConfig.create()
         .type(SAP_DATA_PRIVACY_INTEGRATION)
         .method(maskingMethod)
         .entities(entitiesDTO);

orchestration/src/main/java/com/sap/ai/sdk/orchestration/DpiMasking.java

@@ -112,6 +112,6 @@ public class OrchestrationAiModel {
 
   @Nonnull
   LLMModuleConfig createConfig() {
-    return new LLMModuleConfig().modelName(name).modelParams(params).modelVersion(version);
+    return LLMModuleConfig.create().modelName(name).modelParams(params).modelVersion(version);
   }
 }