Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/twilio/oai/DirectoryStructureService.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public void configure(final OpenAPI openAPI) {

updateAccountSidParam(operation);
if (ResourceCacheContext.get() == null || !ResourceCacheContext.get().isV1()
|| "twilio-csharp".equals(ResourceCacheContext.get().getAdditionalProperties().get(GENERATOR_NAME))) {
|| "twilio-csharp".equals(ResourceCacheContext.get().getAdditionalProperties().get(GENERATOR_NAME))
&& operation.getOperationId().toLowerCase().startsWith("list")) {
updatePaginationParams(operation);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
import com.twilio.oai.common.ApplicationConstants;
import com.twilio.oai.common.EnumConstants;
import com.twilio.oai.common.Utility;
import com.twilio.oai.java.cache.ResourceCacheContext;
import com.twilio.oai.resolver.IConventionMapper;
import com.twilio.oai.resolver.common.CodegenModelDataTypeResolver;

import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

Expand All @@ -18,11 +20,17 @@

// Overriding default behavior and adding "x-jsonConverter" to enum
public class CsharpCodegenModelDataTypeResolver extends CodegenModelDataTypeResolver {

HashMap<String, String> serializerForJson = new HashMap<>();
private CodegenModelResolver codegenModelResolver;

public CsharpCodegenModelDataTypeResolver(IConventionMapper mapper, Map<String, String> modelFormatMap) {
super(mapper, modelFormatMap);
// Populate serializerForJson with JSON converter mappings (mirrors "deserialize" section of csharp.json)
serializerForJson.put("date-time", "Converters.DateTimeConverter");
//serializerForJson.put("ienum", "StringEnumConverter");
serializerForJson.put("http-method", "HttpMethodConverter");
serializerForJson.put("phone-number", "PhoneNumberConverter");
serializerForJson.put("twiml", "TwimlConverter");
}

public void setCodegenModel(CodegenModelResolver codegenModelResolver) {
Expand All @@ -42,6 +50,10 @@ public CodegenProperty resolve(CodegenProperty property, ApiResourceBuilder apiR
mapper.deserialize()
.getString(property.dataFormat)
.ifPresent(dataType -> property.vendorExtensions.put("x-jsonConverter", dataType));
if (ResourceCacheContext.get().isV1()) {
Optional.ofNullable(serializerForJson.get(property.dataFormat))
.ifPresent(value -> property.vendorExtensions.put("x-jsonConverter", value));
}
}
return property;
}
Expand Down
Loading