chore: update merge conflicts

kridai · kridai · commit a8ec87b72322 · 2025-11-24T16:26:15.000+05:30
diff --git a/examples/csharp/src/Twilio/Rest/FlexApi/V1/Credential/NewCredentialsOptions.cs b/examples/csharp/src/Twilio/Rest/FlexApi/V1/Credential/NewCredentialsOptions.cs
@@ -27,56 +27,56 @@ namespace Twilio.Rest.FlexApi.V1.Credential
     /// <summary> create </summary>
     public class CreateNewCredentialsOptions : IOptions<NewCredentialsResource>
     {
-        
-        
+
+
         public string TestString { get; }
 
-        
+
         public bool? TestBoolean { get; set; }
 
-        
+
         public int? TestInteger { get; set; }
 
-        
+
         public decimal? TestNumber { get; set; }
 
-        
-        public float TestNumberFloat { get; set; }
 
-        
-        public double TestNumberDouble { get; set; }
+        public float? TestNumberFloat { get; set; }
+
+
+        public double? TestNumberDouble { get; set; }
+
 
-        
         public decimal? TestNumberInt32 { get; set; }
 
-        
+
         public long? TestNumberInt64 { get; set; }
 
-        
+
         public object TestObject { get; set; }
 
-        
+
         public DateTime? TestDateTime { get; set; }
 
-        
+
         public DateTime? TestDate { get; set; }
 
-        
+
         public NewCredentialsResource.StatusEnum TestEnum { get; set; }
 
-        
+
         public List<object> TestObjectArray { get; set; }
 
-        
+
         public object TestAnyType { get; set; }
 
-        
+
         public List<object> TestAnyArray { get; set; }
 
-        ///<summary> A comma-separated list of the permissions you will request from the users of this ConnectApp.  Can include: `get-all` and `post-all`. </summary> 
+        ///<summary> A comma-separated list of the permissions you will request from the users of this ConnectApp.  Can include: `get-all` and `post-all`. </summary>
         public List<NewCredentialsResource.PermissionsEnum> Permissions { get; set; }
 
-        
+
         public string SomeA2PThing { get; set; }
 
 
@@ -90,7 +90,7 @@ public CreateNewCredentialsOptions(string testString)
             Permissions = new List<NewCredentialsResource.PermissionsEnum>();
         }
 
-        
+
         /// <summary> Generate the necessary parameters </summary>
         public List<KeyValuePair<string, string>> GetParams()
         {
@@ -167,7 +167,7 @@ public List<KeyValuePair<string, string>> GetParams()
             return p;
         }
 
-        
+
 
     }
 
diff --git a/examples/csharp/src/Twilio/Rest/FlexApi/V1/Credential/NewCredentialsResource.cs b/examples/csharp/src/Twilio/Rest/FlexApi/V1/Credential/NewCredentialsResource.cs
@@ -29,9 +29,9 @@ namespace Twilio.Rest.FlexApi.V1.Credential
 {
     public class NewCredentialsResource : Resource
     {
-    
 
-    
+
+
         public sealed class StatusEnum : StringEnum
         {
             private StatusEnum(string value) : base(value) {}
@@ -61,10 +61,10 @@ public static implicit operator PermissionsEnum(string value)
             public static readonly PermissionsEnum PostAll = new PermissionsEnum("post-all");
         }
 
-        
+
         private static Request BuildCreateRequest(CreateNewCredentialsOptions options, ITwilioRestClient client)
         {
-            
+
             string path = "/v1/Credentials/AWS";
 
 
@@ -126,11 +126,11 @@ public static NewCredentialsResource Create(
                                           string testString,
                                           int? testInteger = null,
                                           DateTime? testDate = null,
-                                          float testNumberFloat = null,
+                                          float? testNumberFloat = null,
                                           object testObject = null,
                                           bool? testBoolean = null,
                                           decimal? testNumber = null,
-                                          double testNumberDouble = null,
+                                          double? testNumberDouble = null,
                                           decimal? testNumberInt32 = null,
                                           long? testNumberInt64 = null,
                                           DateTime? testDateTime = null,
@@ -171,11 +171,11 @@ public static async System.Threading.Tasks.Task<NewCredentialsResource> CreateAs
                                                                                   string testString,
                                                                                   int? testInteger = null,
                                                                                   DateTime? testDate = null,
-                                                                                  float testNumberFloat = null,
+                                                                                  float? testNumberFloat = null,
                                                                                   object testObject = null,
                                                                                   bool? testBoolean = null,
                                                                                   decimal? testNumber = null,
-                                                                                  double testNumberDouble = null,
+                                                                                  double? testNumberDouble = null,
                                                                                   decimal? testNumberInt32 = null,
                                                                                   long? testNumberInt64 = null,
                                                                                   DateTime? testDateTime = null,
@@ -192,7 +192,7 @@ public static async System.Threading.Tasks.Task<NewCredentialsResource> CreateAs
         }
         #endif
 
-    
+
         /// <summary>
         /// Converts a JSON string into a NewCredentialsResource object
         /// </summary>
@@ -226,20 +226,20 @@ public static string ToJson(object model)
         }
     }
 
-    
-        ///<summary> The account_sid </summary> 
+
+        ///<summary> The account_sid </summary>
         [JsonProperty("account_sid")]
         public string AccountSid { get; private set; }
 
-        ///<summary> The sid </summary> 
+        ///<summary> The sid </summary>
         [JsonProperty("sid")]
         public string Sid { get; private set; }
 
-        ///<summary> The test_string </summary> 
+        ///<summary> The test_string </summary>
         [JsonProperty("test_string")]
         public string TestString { get; private set; }
 
-        ///<summary> The test_integer </summary> 
+        ///<summary> The test_integer </summary>
         [JsonProperty("test_integer")]
         public int? TestInteger { get; private set; }
 
diff --git a/src/main/java/com/twilio/oai/TwilioJavaGeneratorModern.java b/src/main/java/com/twilio/oai/TwilioJavaGeneratorModern.java
@@ -73,6 +73,7 @@ public void processOpenAPI(final OpenAPI openAPI) {
         }
         boolean isV1 = ApplicationConstants.isV1.test(apiStdVersion);
         ResourceCacheContext.get().setV1(isV1);
+
         String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);
         String version = twilioCodegen.getVersionFromOpenAPI(openAPI);
         twilioCodegen.setDomain(domain);
diff --git a/src/main/java/com/twilio/oai/TwilioPythonGenerator.java b/src/main/java/com/twilio/oai/TwilioPythonGenerator.java
@@ -1,3 +1,7 @@
+package com.twilio.oai;
+
+import com.twilio.oai.api.ApiResources;
+import com.twilio.oai.api.PythonApiResourceBuilder;
 import com.twilio.oai.common.EnumConstants;
 import com.twilio.oai.common.Utility;
 import com.twilio.oai.resolver.IConventionMapper;
diff --git a/src/main/java/com/twilio/oai/java/feature/Inequality.java b/src/main/java/com/twilio/oai/java/feature/Inequality.java
@@ -72,6 +72,7 @@ private void addVendorExtension(Map<String, List<CodegenParameter>> groupedItems
             }
         }
     }
+
     // Input: DateCreated, DateCreated>, DateCreated<
     // Output: DateCreated, DateCreated, DateCreated
     private String getBaseName(CodegenParameter codegenParameter) {
diff --git a/src/main/java/com/twilio/oai/java/format/JavaUpdateDefaultMapping.java b/src/main/java/com/twilio/oai/java/format/JavaUpdateDefaultMapping.java
@@ -9,6 +9,7 @@
 
 public class JavaUpdateDefaultMapping {
     HashSet<String> customFormatWithProperties = new HashSet<>();
+
     /*
         If a property in the OpenAPI specification is defined as
         date_generated:
diff --git a/src/test/java/com/twilio/oai/TwilioGeneratorTest.java b/src/test/java/com/twilio/oai/TwilioGeneratorTest.java
@@ -48,7 +48,7 @@ public static void setUp() {
 
     @Test
     public void launchGenerator() {
-        final String pathname = "examples/spec/twilio_flex_v1.yaml";
+        final String pathname = "examples/spec/twilio_api_v2010.yaml";
         File filesList[] ;
         File directoryPath = new File(pathname);
         if (directoryPath.isDirectory()) {

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public void processOpenAPI(final OpenAPI openAPI) {`
`73`	`73`	`}`
`74`	`74`	`boolean isV1 = ApplicationConstants.isV1.test(apiStdVersion);`
`75`	`75`	`ResourceCacheContext.get().setV1(isV1);`
	`76`	`+`
`76`	`77`	`String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);`
`77`	`78`	`String version = twilioCodegen.getVersionFromOpenAPI(openAPI);`
`78`	`79`	`twilioCodegen.setDomain(domain);`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ private void addVendorExtension(Map<String, List<CodegenParameter>> groupedItems`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
	`75`	`+`
`75`	`76`	`// Input: DateCreated, DateCreated>, DateCreated<`
`76`	`77`	`// Output: DateCreated, DateCreated, DateCreated`
`77`	`78`	`private String getBaseName(CodegenParameter codegenParameter) {`