From 3c0dcad1d6126c0c8ac2c1f8018b46f6fe1d14a9 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 16 Jan 2018 17:19:47 +0100 Subject: [PATCH] Numbers are acceptable in the method name fixes gh-518 --- .../cloud/contract/verifier/util/NamesUtil.groovy | 5 ++--- .../cloud/contract/verifier/builder/MethodBuilderSpec.groovy | 5 +++-- .../cloud/contract/verifier/util/NamesUtilSpec.groovy | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/NamesUtil.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/NamesUtil.groovy index 7368e51821..4ac2498cbe 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/NamesUtil.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/NamesUtil.groovy @@ -116,8 +116,7 @@ class NamesUtil { * Converts illegal characters in method names to underscores */ static String convertIllegalMethodNameChars(String methodName) { - String result = methodName.replaceAll('^[^a-zA-Z_$]', '_') - result = result.replaceAll('[^a-zA-Z_$0-9]', '_') - return result + String result = methodName.replaceAll('^[^a-zA-Z_$0-9]', '_') + return result.replaceAll('[^a-zA-Z_$0-9]', '_') } } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilderSpec.groovy index f54214c6b3..cc46bb7c24 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBuilderSpec.groovy @@ -25,10 +25,11 @@ class MethodBuilderSpec extends Specification { } ContractMetadata metadata = new ContractMetadata(null, false, 0, null, contractDsl) when: - File stubFile = new File("5invalid-method:name.groovy") + File stubFile = new File("invalid-method:name.groovy") + String methodName = MethodBuilder.methodName(metadata, stubFile, contractDsl) then: - methodName.equals("_invalid_method_name") + methodName == "invalid_method_name" } } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy index bb3502ab0f..efbc74c4d9 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/NamesUtilSpec.groovy @@ -109,6 +109,6 @@ class NamesUtilSpec extends Specification { given: String string = '10a-b c.1.0.x+d1174$dd' expect: - NamesUtil.convertIllegalMethodNameChars(string) == '_0a_b_c_1_0_x_d1174$dd' + NamesUtil.convertIllegalMethodNameChars(string) == '10a_b_c_1_0_x_d1174$dd' } }