-
-
Notifications
You must be signed in to change notification settings - Fork 479
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: moved the expression parsing classes to the support module
- Loading branch information
Ronald Holshausen
committed
Jul 15, 2018
1 parent
6ff1d71
commit 9ab62c6
Showing
21 changed files
with
137 additions
and
160 deletions.
There are no files selected for viewing
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
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
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
4 changes: 2 additions & 2 deletions
4
pact-jvm-provider-junit/src/main/java/au/com/dius/pact/provider/junit/loader/PactBroker.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
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
4 changes: 2 additions & 2 deletions
4
pact-jvm-provider-junit/src/main/java/au/com/dius/pact/provider/junit/loader/PactLoader.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
64 changes: 0 additions & 64 deletions
64
...it/src/main/java/au/com/dius/pact/provider/junit/sysprops/PactRunnerExpressionParser.java
This file was deleted.
Oops, something went wrong.
61 changes: 0 additions & 61 deletions
61
...-junit/src/main/java/au/com/dius/pact/provider/junit/sysprops/SystemPropertyResolver.java
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
...-provider-junit/src/main/java/au/com/dius/pact/provider/junit/sysprops/ValueResolver.java
This file was deleted.
Oops, something went wrong.
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
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
4 changes: 2 additions & 2 deletions
4
...junit/src/test/kotlin/au/com/dius/pact/provider/junit/PactBrokerAnnotationDefaultsTest.kt
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
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
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
4 changes: 2 additions & 2 deletions
4
...ider-spring/src/main/kotlin/au/com/dius/pact/provider/spring/SpringEnvironmentResolver.kt
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
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,3 @@ | ||
| dependencies { | ||
| compile "org.apache.commons:commons-lang3:${project.commonsLang3Version}" | ||
| } |
50 changes: 50 additions & 0 deletions
50
...upport/src/main/kotlin/au/com/dius/pact/support/expressions/PactRunnerExpressionParser.kt
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,50 @@ | ||
| package au.com.dius.pact.support.expressions | ||
|
|
||
| import java.util.StringJoiner | ||
|
|
||
| object PactRunnerExpressionParser { | ||
|
|
||
| const val VALUES_SEPARATOR = "," | ||
| const val START_EXPRESSION = "\${" | ||
| const val END_EXPRESSION = '}' | ||
|
|
||
| @JvmOverloads | ||
| @JvmStatic | ||
| fun parseListExpression(value: String, valueResolver: ValueResolver = SystemPropertyResolver()): List<String> { | ||
| return replaceExpressions(value, valueResolver).split(VALUES_SEPARATOR).filter { it.isNotEmpty() } | ||
| } | ||
|
|
||
| @JvmOverloads | ||
| @JvmStatic | ||
| fun parseExpression(value: String, valueResolver: ValueResolver = SystemPropertyResolver()): String { | ||
| return if (value.contains(START_EXPRESSION)) { | ||
| replaceExpressions(value, valueResolver) | ||
| } else value | ||
| } | ||
|
|
||
| private fun replaceExpressions(value: String, valueResolver: ValueResolver): String { | ||
| val joiner = StringJoiner("") | ||
|
|
||
| var buffer = value | ||
| var position = buffer.indexOf(START_EXPRESSION) | ||
| while (position >= 0) { | ||
| if (position > 0) { | ||
| joiner.add(buffer.substring(0, position)) | ||
| } | ||
| val endPosition = buffer.indexOf(END_EXPRESSION, position) | ||
| if (endPosition < 0) { | ||
| throw RuntimeException("Missing closing brace in expression string \"$value]\"") | ||
| } | ||
| var expression = "" | ||
| if (endPosition - position > 2) { | ||
| expression = valueResolver.resolveValue(buffer.substring(position + 2, endPosition)) | ||
| } | ||
| joiner.add(expression) | ||
| buffer = buffer.substring(endPosition + 1) | ||
| position = buffer.indexOf(START_EXPRESSION) | ||
| } | ||
| joiner.add(buffer) | ||
|
|
||
| return joiner.toString() | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...vm-support/src/main/kotlin/au/com/dius/pact/support/expressions/SystemPropertyResolver.kt
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,53 @@ | ||
| package au.com.dius.pact.support.expressions | ||
|
|
||
| import org.apache.commons.lang3.StringUtils | ||
|
|
||
| class SystemPropertyResolver : ValueResolver { | ||
|
|
||
| override fun resolveValue(property: String): String { | ||
| val tuple = PropertyValueTuple(property).invoke() | ||
| var propertyValue: String? = System.getProperty(tuple.propertyName!!) | ||
| if (propertyValue == null) { | ||
| propertyValue = System.getenv(tuple.propertyName) | ||
| } | ||
| if (propertyValue == null) { | ||
| propertyValue = tuple.defaultValue | ||
| } | ||
| if (propertyValue == null) { | ||
| throw RuntimeException("Could not resolve property \"${tuple.propertyName}\" in the system properties or " + | ||
| "environment variables and no default value is supplied") | ||
| } | ||
| return propertyValue | ||
| } | ||
|
|
||
| override fun propertyDefined(property: String): Boolean { | ||
| var propertyValue: String? = System.getProperty(property) | ||
| if (propertyValue == null) { | ||
| propertyValue = System.getenv(property) | ||
| } | ||
| return propertyValue != null | ||
| } | ||
|
|
||
| class PropertyValueTuple(property: String) { | ||
| var propertyName: String? = null | ||
| private set | ||
| var defaultValue: String? = null | ||
| private set | ||
|
|
||
| init { | ||
| this.propertyName = property | ||
| this.defaultValue = null | ||
| } | ||
|
|
||
| operator fun invoke(): PropertyValueTuple { | ||
| if (propertyName!!.contains(":")) { | ||
| val kv = StringUtils.splitPreserveAllTokens(propertyName, ':') | ||
| propertyName = kv[0] | ||
| if (kv.size > 1) { | ||
| defaultValue = kv[1] | ||
| } | ||
| } | ||
| return this | ||
| } | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
pact-jvm-support/src/main/kotlin/au/com/dius/pact/support/expressions/ValueResolver.kt
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,6 @@ | ||
| package au.com.dius.pact.support.expressions | ||
|
|
||
| interface ValueResolver { | ||
| fun resolveValue(expression: String): String | ||
| fun propertyDefined(property: String): Boolean | ||
| } |
Oops, something went wrong.