-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added a new mustache lambda to trim whitespace in fragments
- Loading branch information
Showing
2 changed files
with
108 additions
and
0 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
...ator/src/main/java/org/openapitools/codegen/templating/mustache/TrimWhitespaceLambda.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) | ||
* Copyright 2018 SmartBear Software | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.openapitools.codegen.templating.mustache; | ||
|
||
import java.io.IOException; | ||
import java.io.Writer; | ||
|
||
import com.samskivert.mustache.Mustache; | ||
import com.samskivert.mustache.Template.Fragment; | ||
|
||
/** | ||
* Replaces duplicate whitespace characters in a fragment with single space. | ||
* | ||
* Register: | ||
* <pre> | ||
* additionalProperties.put("lambdaTrimWhitespace", new TrimWhitespaceLambda()); | ||
* </pre> | ||
* | ||
* Use: | ||
* <pre> | ||
* {{#lambdaTrimWhitespace}}{{name}}{{/lambdaTrimWhitespace}} | ||
* </pre> | ||
*/ | ||
public class TrimWhitespaceLambda implements Mustache.Lambda { | ||
private static final String SINGLE_SPACE = " "; | ||
|
||
private static final String WHITESPACE_REGEX = "\\s+"; | ||
|
||
@Override | ||
public void execute(Fragment fragment, Writer writer) throws IOException { | ||
writer.write(fragment.execute().replaceAll(WHITESPACE_REGEX, SINGLE_SPACE)); | ||
} | ||
|
||
} |
59 changes: 59 additions & 0 deletions
59
.../src/test/java/org/openapitools/codegen/templating/mustache/TrimWhitespaceLambdaTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) | ||
* Copyright 2018 SmartBear Software | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.openapitools.codegen.templating.mustache; | ||
|
||
import static org.mockito.Mockito.when; | ||
import static org.testng.Assert.assertEquals; | ||
|
||
import java.io.IOException; | ||
import java.io.StringWriter; | ||
|
||
import org.mockito.Mock; | ||
import org.mockito.Mockito; | ||
import org.mockito.MockitoAnnotations; | ||
import org.testng.annotations.AfterMethod; | ||
import org.testng.annotations.BeforeMethod; | ||
import org.testng.annotations.Test; | ||
|
||
import com.samskivert.mustache.Template.Fragment; | ||
|
||
public class TrimWhitespaceLambdaTest { | ||
|
||
@Mock | ||
private Fragment fragment; | ||
|
||
@BeforeMethod | ||
public void init() { | ||
MockitoAnnotations.initMocks(this); | ||
} | ||
|
||
@AfterMethod | ||
public void reset() { | ||
Mockito.reset(fragment); | ||
} | ||
|
||
@Test | ||
public void testTrimWhitespace() throws IOException { | ||
when(fragment.execute()).thenReturn("\t a b\t\tc \t"); | ||
|
||
StringWriter output = new StringWriter(); | ||
new TrimWhitespaceLambda().execute(fragment, output); | ||
assertEquals(output.toString(), " a b c "); | ||
} | ||
|
||
} |