Skip to content

Commit 77a74a5

Browse files
committed
Update implementation
1 parent e5014e8 commit 77a74a5

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

datamodel/openapi/openapi-generator/src/main/java/com/sap/cloud/sdk/datamodel/openapi/generator/GenerationConfigurationConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ private static void setGlobalSettings( @Nonnull final GenerationConfiguration co
111111
GlobalSettings.setProperty(CodegenConstants.HIDE_GENERATION_TIMESTAMP, Boolean.TRUE.toString());
112112
}
113113

114-
private static String getAllowedIds( @Nonnull final GenerationConfiguration config, @Nonnull final String property )
114+
static String getAllowedIds( @Nonnull final GenerationConfiguration config, @Nonnull final String property )
115115
{
116116
final var allowIds = config.getAdditionalProperties().get(property);
117117
if( allowIds == null || allowIds.isBlank() ) {
118118
return "";
119119
}
120-
return String.join(",", allowIds.trim().split("\\s+"));
120+
return String.join(",", allowIds.trim().split("\\W+"));
121121
}
122122

123123
private static OpenAPI parseOpenApiSpec( @Nonnull final String inputSpecFile )

datamodel/openapi/openapi-generator/src/test/java/com/sap/cloud/sdk/datamodel/openapi/generator/GenerationConfigurationConverterTest.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.junit.jupiter.api.Test;
1111
import org.junit.jupiter.api.io.TempDir;
1212

13+
import com.google.common.collect.ImmutableMap;
1314
import com.sap.cloud.sdk.datamodel.openapi.generator.model.GenerationConfiguration;
1415

1516
class GenerationConfigurationConverterTest
@@ -35,6 +36,37 @@ void testCopyrightHeaderResolution()
3536
assertThat(resultNoHeader).isNull();
3637
}
3738

39+
@Test
40+
void testGetAllowedIds()
41+
{
42+
// assertion definition: given input -> expected output
43+
final var assertions =
44+
ImmutableMap
45+
.<String, String> builder()
46+
.put("", "") // empty
47+
.put("\n", "") // newline
48+
.put("Foo", "Foo") // single
49+
.put("Foo,Bar", "Foo,Bar") // list
50+
.put("Foo;Bar", "Foo,Bar") // custom separator
51+
.put("Foo Bar", "Foo,Bar") // space separator
52+
.put("Foo \n Bar", "Foo,Bar") // new-line separator
53+
.build();
54+
55+
// feed the assertion input arguments into the config
56+
var configBuilder = GenerationConfiguration.builder();
57+
int i = 0;
58+
for( String input : assertions.keySet() ) {
59+
configBuilder.additionalProperty("property" + (i++), input);
60+
}
61+
var config = configBuilder.build();
62+
63+
// run the test
64+
int j = 0;
65+
for( String output : assertions.values() ) {
66+
assertThat(GenerationConfigurationConverter.getAllowedIds(config, "property" + (j++))).isEqualTo(output);
67+
}
68+
}
69+
3870
private GenerationConfiguration.GenerationConfigurationBuilder createBasicConfig()
3971
{
4072
return GenerationConfiguration

0 commit comments

Comments
 (0)