Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: read version from path instead of filename #555

Merged
merged 5 commits into from
Feb 8, 2024
Merged

chore: read version from path instead of filename #555

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8425e1
chore: read version from path instead of filename
sbansla Feb 4, 2024
0442081
corrected version
sbansla Feb 5, 2024
0c68858
chore: isEnum method corrected
sbansla Feb 7, 2024
95cb092
chore: enum correction
sbansla Feb 7, 2024
4c31a57
chore: updated test files
sbansla Feb 8, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/com/twilio/oai/DirectoryStructureService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public List<CodegenOperation> processOperations(final OperationsMap results) {
.collect(Collectors.toList());
additionalProperties.put(VERSION_RESOURCES, versionResources);

if (additionalProperties.get(API_VERSION).equals("v2010")) {
if (((String)additionalProperties.get(API_VERSION)).equalsIgnoreCase("v2010")) {
final String name = "Account";
versionResources.add(new DependentResource.DependentResourceBuilder()
.type(name + "Context")
Expand Down
35 changes: 32 additions & 3 deletions src/main/java/com/twilio/oai/TwilioCodegenAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import java.net.URL;
import java.nio.file.Paths;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;

import com.fasterxml.jackson.core.type.TypeReference;
Expand Down Expand Up @@ -66,6 +68,20 @@ public void processOpts() {
e.printStackTrace();
}
}

public String getVersionFromOpenAPI(final OpenAPI openAPI) {
String version = "";
for (String path : openAPI.getPaths().keySet()) {
Pattern pattern = Pattern.compile("/(\\d{4}-\\d{2}-\\d{2}|v\\d+)");
Matcher matcher = pattern.matcher(path);
if (matcher.find()) {
version = matcher.group(1);
version = version.equals("2010-04-01") ? "v2010": version;
break;
}
}
return version;
}

public void setDomain(final String domain) {
final String domainPackage = domain.replaceAll("[-.]", "");
Expand All @@ -74,25 +90,36 @@ public void setDomain(final String domain) {
codegen.additionalProperties().put("domainName", StringHelper.camelize(domain));
codegen.additionalProperties().put("domainPackage", domainPackage);
}

public void setVersion(final String version) {
codegen.additionalProperties().put("clientVersion", version);
codegen.additionalProperties().put(DirectoryStructureService.API_VERSION, version);
codegen.additionalProperties().put("apiVersionClass", StringHelper.toFirstLetterCaps(version));
}

public void setOutputDir(final String domain, final String version) {
codegen.setOutputDir(originalOutputDir + File.separator + domain + File.separator + version);
final String domainPackage = domain.replaceAll("[-.]", "");
final String versionPackage = version.replaceAll("[-.]", "");
codegen.setOutputDir(originalOutputDir + File.separator + domainPackage + File.separator + versionPackage);
}

public String toParamName(final String name) {
return name.replace("<", "Before").replace(">", "After");
}

public String getDomainFromOpenAPI(final OpenAPI openAPI) {
String domain = "";
//fetch domain from server url present in openAPI
if (openAPI.getServers() != null ) {
Optional<String> url = openAPI.getServers().stream().findFirst().map(Server::getUrl);
if (url.isPresent() && !url.get().equals(DEFAULT_URL)){
return url.get().replaceAll(SERVER_PATTERN, "${domain}");
domain = url.get().replaceAll(SERVER_PATTERN, "${domain}");
setDomain(domain);
return domain;
}
}
//fetch domain from server url present in openAPI.paths
return openAPI
domain = openAPI
.getPaths()
.values()
.stream()
Expand All @@ -103,6 +130,8 @@ public String getDomainFromOpenAPI(final OpenAPI openAPI) {
.map(Server::getUrl)
.map(url -> url.replaceAll(SERVER_PATTERN, "${domain}"))
.orElseThrow();
setDomain(domain);
return domain;
}

public Map<String, Boolean> getToggles(String value) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/twilio/oai/TwilioCsharpGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,10 @@ public void processOpts() {

@Override
public void processOpenAPI(final OpenAPI openAPI) {
final String domain = StringHelper.camelize(twilioCodegen.getDomainFromOpenAPI(openAPI));
final String version = (String) additionalProperties.get("apiVersionClass");
String domain = StringHelper.camelize(twilioCodegen.getDomainFromOpenAPI(openAPI));
String version = StringHelper.camelize(twilioCodegen.getVersionFromOpenAPI(openAPI));
twilioCodegen.setDomain(domain);
twilioCodegen.setVersion(version);
twilioCodegen.setOutputDir(domain, version);

directoryStructureService.configure(openAPI);
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/twilio/oai/TwilioJavaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ public void processOpts() {

@Override
public void processOpenAPI(final OpenAPI openAPI) {
final String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);
String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);
String version = twilioCodegen.getVersionFromOpenAPI(openAPI);
twilioCodegen.setDomain(domain);
twilioCodegen.setVersion(version);
twilioCodegen.setOutputDir(domain, version);
directoryStructureService.configure(openAPI);
}

Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/twilio/oai/TwilioNodeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ public void processOpts() {

@Override
public void processOpenAPI(final OpenAPI openAPI) {
final String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);
twilioCodegen.setDomain(StringHelper.camelize(domain, true));
String domain = StringHelper.camelize(twilioCodegen.getDomainFromOpenAPI(openAPI), true);
String version = StringHelper.camelize(twilioCodegen.getVersionFromOpenAPI(openAPI), true);
twilioCodegen.setDomain(domain);
twilioCodegen.setVersion(version);
twilioCodegen.setOutputDir(domain, version);

openAPI.getPaths().forEach(resourceTree::addResource);
resourceTree.getResources().forEach(resource -> resource.updateFamily(resourceTree));
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/twilio/oai/TwilioPhpGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ public void processOpts() {

@Override
public void processOpenAPI(final OpenAPI openAPI) {
final String domain = StringHelper.camelize(twilioCodegen.getDomainFromOpenAPI(openAPI));
final String version = StringHelper.camelize((String) additionalProperties.get("apiVersionClass"));
String domain = StringHelper.camelize(twilioCodegen.getDomainFromOpenAPI(openAPI));
String version = StringHelper.camelize(twilioCodegen.getVersionFromOpenAPI(openAPI));
twilioCodegen.setDomain(domain);
twilioCodegen.setVersion(version);
twilioCodegen.setOutputDir(domain, version);
setSrcBasePath("");

Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/twilio/oai/TwilioPythonGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ public void processOpts() {

@Override
public void processOpenAPI(final OpenAPI openAPI) {
final String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);
twilioCodegen.setDomain(StringHelper.toSnakeCase(domain));
String domain = StringHelper.toSnakeCase(twilioCodegen.getDomainFromOpenAPI(openAPI));
String version = StringHelper.toSnakeCase(twilioCodegen.getVersionFromOpenAPI(openAPI));
twilioCodegen.setDomain(domain);
twilioCodegen.setVersion(version);
twilioCodegen.setOutputDir(domain, version);

openAPI.getPaths().forEach(resourceTree::addResource);
resourceTree.getResources().forEach(resource -> resource.updateFamily(resourceTree));
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/twilio/oai/TwilioRubyGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ public TwilioRubyGenerator() {

@Override
public void processOpenAPI(final OpenAPI openAPI) {
final String domain = twilioCodegen.getDomainFromOpenAPI(openAPI);
twilioCodegen.setDomain(StringHelper.toSnakeCase(domain));

String domain = StringHelper.toSnakeCase(twilioCodegen.getDomainFromOpenAPI(openAPI));
String version = StringHelper.toSnakeCase(twilioCodegen.getVersionFromOpenAPI(openAPI));
twilioCodegen.setDomain(domain);
twilioCodegen.setVersion(version);
twilioCodegen.setOutputDir(domain, version);

openAPI.getPaths().forEach(resourceTree::addResource);
resourceTree.getResources().forEach(resource -> resource.updateFamily(resourceTree));
setGemName("");
Expand Down
Loading