forked from loafle/openapi-generator-original
Compare commits
2 Commits
master
...
lowercase-
Author | SHA1 | Date | |
---|---|---|---|
|
13f04829c7 | ||
|
7184c2a689 |
@ -72,16 +72,6 @@ public class CamelCaseLambda implements Mustache.Lambda {
|
||||
String text = camelize(fragment.execute().replace(" ", "_"), option);
|
||||
if (generator != null) {
|
||||
text = generator.sanitizeName(text);
|
||||
if (generator.reservedWords().contains(text)) {
|
||||
// Escaping must be done *after* camelize, because generators may escape using characters removed by camelize function.
|
||||
text = generator.escapeReservedWord(text);
|
||||
}
|
||||
|
||||
if (escapeParam) {
|
||||
// NOTE: many generators call escapeReservedWord in toParamName, but we can't assume that's always the case.
|
||||
// Here, we'll have to accept that we may be duplicating some work.
|
||||
text = generator.toParamName(text);
|
||||
}
|
||||
}
|
||||
writer.write(text);
|
||||
}
|
||||
|
@ -40,10 +40,6 @@ public class CaseFormatLambda implements Mustache.Lambda {
|
||||
@Override
|
||||
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
|
||||
String text = initialFormat.converterTo(targetFormat).convert(fragment.execute());
|
||||
if (generator != null && generator.reservedWords().contains(text)) {
|
||||
text = generator.escapeReservedWord(text);
|
||||
}
|
||||
|
||||
if (text != null) {
|
||||
writer.write(text);
|
||||
}
|
||||
|
@ -53,9 +53,6 @@ public class LowercaseLambda implements Mustache.Lambda {
|
||||
@Override
|
||||
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
|
||||
String text = fragment.execute().toLowerCase(Locale.ROOT);
|
||||
if (generator != null && generator.reservedWords().contains(text)) {
|
||||
text = generator.escapeReservedWord(text);
|
||||
}
|
||||
writer.write(text);
|
||||
|
||||
}
|
||||
|
@ -52,7 +52,7 @@ public class CamelCaseLambdaTest extends LambdaTest {
|
||||
when(generator.escapeReservedWord("reservedWord")).thenReturn("escapedReservedWord");
|
||||
|
||||
// When & Then
|
||||
test("escapedReservedWord", "{{#camelcase}}reserved-word{{/camelcase}}", ctx);
|
||||
test("reservedWord", "{{#camelcase}}reserved-word{{/camelcase}}", ctx);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -66,7 +66,7 @@ public class CamelCaseLambdaTest extends LambdaTest {
|
||||
when(generator.toParamName("inputText")).thenReturn("inputTextAsParam");
|
||||
|
||||
// When & Then
|
||||
test("inputTextAsParam", "{{#camelcase}}Input_text{{/camelcase}}", ctx);
|
||||
test("inputText", "{{#camelcase}}Input_text{{/camelcase}}", ctx);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ public class LowercaseLambdaTest extends LambdaTest {
|
||||
when(generator.escapeReservedWord("reserved")).thenReturn("escaped-reserved");
|
||||
|
||||
// When & Then
|
||||
test("escaped-reserved", "{{#lowercase}}rEservEd{{/lowercase}}", ctx);
|
||||
test("reserved", "{{#lowercase}}rEservEd{{/lowercase}}", ctx);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -55,7 +55,7 @@ public class PascalCaseLambdaTest extends LambdaTest {
|
||||
when(generator.escapeReservedWord("ReservedWord")).thenReturn("escapedReservedWord");
|
||||
|
||||
// When & Then
|
||||
test("escapedReservedWord", "{{#pascalcase}}reserved-word{{/pascalcase}}", ctx);
|
||||
test("ReservedWord", "{{#pascalcase}}reserved-word{{/pascalcase}}", ctx);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -69,7 +69,7 @@ public class PascalCaseLambdaTest extends LambdaTest {
|
||||
when(generator.toParamName("InputText")).thenReturn("inputTextAsParam");
|
||||
|
||||
// When & Then
|
||||
test("inputTextAsParam", "{{#pascalcase}}Input_text{{/pascalcase}}", ctx);
|
||||
test("InputText", "{{#pascalcase}}Input_text{{/pascalcase}}", ctx);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user