Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Remove usePrefix and useSuffix properties #90

Merged
merged 6 commits into from
Jan 17, 2024
Merged

feat: Remove usePrefix and useSuffix properties #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8d3e79
feat: Remove usePrefix and useSuffix attributes
talyssoncastro Jan 11, 2024
48002d5
docs: Remove usePrefix and useSuffix from examples
talyssoncastro Jan 11, 2024
54903ef
test: Fix unit tests that use usePrefix and useSuffix properties
talyssoncastro Jan 11, 2024
59efe79
test: Fix unit tests that use usePrefix and useSuffix properties
talyssoncastro Jan 11, 2024
1346570
test: Keep unit tests with original behaviour for usePrefix and useSu…
talyssoncastro Jan 12, 2024
3b18913
test: Keep unit tests with original behaviour for usePrefix and useSu…
talyssoncastro Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions cli/src/test/java/com/avioconsulting/mule/cli/DeployerCommandLineTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,8 @@ muleDeploy {
environment 'DEV'
applicationName {
baseAppName 'the-app'
prefix 'AVI'
suffix 'xxx'
usePrefix false
useSuffix false
prefix ''
suffix ''
}
appVersion '1.2.3'
file '${builtFile}'
Expand Down Expand Up @@ -176,10 +174,8 @@ muleDeploy {
environment 'DEV'
applicationName {
baseAppName 'the-app'
prefix 'AVI'
suffix 'xxx'
usePrefix false
useSuffix false
prefix ''
suffix ''
}
appVersion '1.2.3'
file '${builtFile}'
Expand Down Expand Up @@ -238,8 +234,6 @@ muleDeploy {
baseAppName 'the-app'
prefix 'AVI'
suffix 'xxx'
usePrefix false
useSuffix false
}
appVersion '1.2.3'
file '${builtFile}'
Expand Down Expand Up @@ -292,8 +286,6 @@ muleDeploy {
baseAppName 'the-app'
prefix 'AVI'
suffix 'xxx'
usePrefix true
useSuffix false
}
appVersion '1.2.3'
workerSpecs {
Expand Down Expand Up @@ -391,8 +383,6 @@ muleDeploy {
baseAppName 'the-app'
prefix 'AVI'
suffix 'xxx'
usePrefix false
useSuffix false
}
appVersion '1.2.3'
file '${builtFile}'
Expand Down
4 changes: 0 additions & 4 deletions library/examples/allOptions.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ muleDeploy {
environment 'DEV'
applicationName {
baseAppName 'the-app'
usePrefix true
useSuffix true
prefix params.env
suffix params.env
}
Expand All @@ -96,8 +94,6 @@ muleDeploy {
environment 'DEV'
applicationName {
baseAppName 'the-app'
usePrefix true
useSuffix true
prefix params.env
suffix params.env
}
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/com/avioconsulting/mule/deployment/api/models/deployment/ApplicationName.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ class ApplicationName {
private static final String EMPTY_STRING=''
private static final MAX_SIZE_APPLICATION_NAME = 42

ApplicationName(String baseAppName, Boolean usePrefix, Boolean useSuffix, String prefix, String suffix) {
ApplicationName(String baseAppName, String prefix, String suffix) {
this.baseAppName = baseAppName
this.usePrefix = usePrefix
this.useSuffix = useSuffix
this.usePrefix = prefix != null && !prefix.isBlank()
this.useSuffix = suffix != null && !suffix.isBlank()
manikmagar marked this conversation as resolved.
Show resolved Hide resolved
this.prefix = prefix
this.suffix = suffix
// getNormalizedAppName()
Expand Down
2 changes: 1 addition & 1 deletion ...avioconsulting/mule/deployment/api/models/deployment/FileBasedAppDeploymentRequest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ abstract class FileBasedAppDeploymentRequest extends AppDeploymentRequest {

// Properties are not passed then extract the artifactId and version from the pom.xml
if(!applicationName) {
setAppName(new ApplicationName(this.parsedPomProperties.artifactId,false,false,null,null))
setAppName(new ApplicationName(this.parsedPomProperties.artifactId, null, null))
}
if(!appVersion) {
setAppVersion(parsedPomProperties.version)
Expand Down
4 changes: 1 addition & 3 deletions library/src/main/java/com/avioconsulting/mule/deployment/dsl/ApplicationNameContext.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import com.avioconsulting.mule.deployment.api.models.deployment.ApplicationName
class ApplicationNameContext extends BaseContext{

String baseAppName
Boolean usePrefix
Boolean useSuffix
String prefix
String suffix


ApplicationName createApplicationName(){
return new ApplicationName(baseAppName,usePrefix,useSuffix,prefix,suffix)
return new ApplicationName(baseAppName, prefix, suffix)
}

@Override
Expand Down
2 changes: 0 additions & 2 deletions library/src/main/resources/evaluate.gdsl.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ contributor([closureScopeContext]) {
call = enclosingCall('applicationName')
if (call) {
#stringParam('baseAppName')
#boolParam('usePrefix')
#boolParam('useSuffix')
#stringParam('prefix')
#stringParam('suffix')
#stringParam('normalizedAppName')
Expand Down
22 changes: 11 additions & 11 deletions library/src/test/java/com/avioconsulting/mule/deployment/DeployerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app',true,true,'client','DEV'),
new ApplicationName('new-app', 'client', 'DEV'),
'1.2.3',)
def apiSpec = new ApiSpecification('Hello API',
simpleRamlFiles)
Expand Down Expand Up @@ -216,7 +216,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app-mule3',true,true,'client','DEV'),
new ApplicationName('new-app-mule3', 'client', 'DEV'),
'1.2.3')
def apiSpec = new ApiSpecification('Hello API',
simpleRamlFiles,
Expand Down Expand Up @@ -297,7 +297,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app-mule4',true,true,'client','DEV'),
new ApplicationName('new-app-mule4', 'client', 'DEV'),
'1.2.3')
def apiSpec = new ApiSpecification('Hello API',
simpleRamlFiles,
Expand Down Expand Up @@ -334,7 +334,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app',true,true,'client','DEV'),
new ApplicationName('new-app', 'client', 'DEV'),
'1.2.3')
def apiSpec = new ApiSpecification('Hello API',
simpleRamlFiles)
Expand All @@ -360,7 +360,7 @@ class DeployerTest {
def request = new OnPremDeploymentRequest('DEV',
'clustera',
file,
new ApplicationName('new-app-mule3',false,false,null,null),
new ApplicationName('new-app-mule3', null, null),
'1.2.3')

// act
Expand Down Expand Up @@ -391,7 +391,7 @@ class DeployerTest {
def request = new OnPremDeploymentRequest('DEV',
'clustera',
file,
new ApplicationName('new-app-mule4',true,true,'client','DEV'),
new ApplicationName('new-app-mule4', 'client', 'DEV'),
'1.2.3')

// act
Expand Down Expand Up @@ -427,7 +427,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app',true,true,'client','DEV'),
new ApplicationName('new-app', 'client', 'DEV'),
'1.2.3')

// act
Expand Down Expand Up @@ -462,7 +462,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app',true,true,'client','DEV'),
new ApplicationName('new-app', 'client', 'DEV'),
'1.2.3')
def apiSpec = new ApiSpecification('Hello API',
simpleRamlFiles)
Expand Down Expand Up @@ -498,7 +498,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app',true,true,'client','DEV'),
new ApplicationName('new-app', 'client', 'DEV'),
'1.2.3')
def apiSpec = new ApiSpecification('Hello API',
simpleRamlFiles)
Expand Down Expand Up @@ -534,7 +534,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app',true,true,'client','DEV'),
new ApplicationName('new-app', 'client', 'DEV'),
'1.2.3')
def apiSpec = new ApiSpecification('Hello SOAP API',
'v1')
Expand Down Expand Up @@ -568,7 +568,7 @@ class DeployerTest {
'theKey',
'theClientId',
'theSecret',
new ApplicationName('new-app-mule4',true,true,'client','DEV'),
new ApplicationName('new-app-mule4', 'client', 'DEV'),
'1.2.3')
def apiSpec1 = new ApiSpecification('Hello API v1',
simpleRamlFiles)
Expand Down
14 changes: 7 additions & 7 deletions ...ry/src/test/java/com/avioconsulting/mule/deployment/api/models/ApplicationNameTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ApplicationNameTest {
// arrange

// act
def name = (new ApplicationName('avio-consulting', true, true, 'app-prefix', 'app-suffix')).normalizedAppName
def name = (new ApplicationName('avio-consulting', 'app-prefix', 'app-suffix')).normalizedAppName
// assert
assert name == 'app-prefix-avio-consulting-app-suffix'
}
Expand All @@ -24,7 +24,7 @@ class ApplicationNameTest {

// act
def exception = shouldFail {
(new ApplicationName('avio consulting', true, true, 'app-prefix', 'app-suffix')).normalizedAppName
(new ApplicationName('avio consulting', 'app-prefix', 'app-suffix')).normalizedAppName
}
// assert
MatcherAssert.assertThat('fail', exception.message.contains("Name must be alphanumeric with dashes allowed within"))
Expand All @@ -36,7 +36,7 @@ class ApplicationNameTest {

// act
def exception = shouldFail {
(new ApplicationName(null, false, false, null, null)).normalizedAppName
(new ApplicationName(null, null, null)).normalizedAppName
}
// assert
MatcherAssert.assertThat('fail', exception.message.contains("Name must be alphanumeric with dashes allowed within"))
Expand All @@ -48,7 +48,7 @@ class ApplicationNameTest {

// act
def exception = shouldFail {
(new ApplicationName('-avio-consulting', true, true, 'app-prefix', 'app-suffix')).normalizedAppName
(new ApplicationName('-avio-consulting', 'app-prefix', 'app-suffix')).normalizedAppName
}
// assert
MatcherAssert.assertThat('fail', exception.message.contains("Name must be alphanumeric with dashes allowed within"))
Expand All @@ -60,7 +60,7 @@ class ApplicationNameTest {

// act
def exception = shouldFail {
(new ApplicationName('avio-consulting-', true, true, 'app-prefix', 'app-suffix')).normalizedAppName
(new ApplicationName('avio-consulting-', 'app-prefix', 'app-suffix')).normalizedAppName
}
// assert
MatcherAssert.assertThat('fail', exception.message.contains("Name must be alphanumeric with dashes allowed within"))
Expand All @@ -72,7 +72,7 @@ class ApplicationNameTest {

// act
def exception = shouldFail {
(new ApplicationName('avio-consulting', true, true, 'app@prefix', 'app-suffix')).normalizedAppName
(new ApplicationName('avio-consulting', 'app@prefix', 'app-suffix')).normalizedAppName
}
// assert
MatcherAssert.assertThat('fail', exception.message.contains("Prefix must be alphanumeric with dashes allowed within"))
Expand All @@ -84,7 +84,7 @@ class ApplicationNameTest {

// act
def exception = shouldFail {
(new ApplicationName('avio-consulting', true, true, 'app-prefix', 'app$suffix')).normalizedAppName
(new ApplicationName('avio-consulting', 'app-prefix', 'app$suffix')).normalizedAppName
}
// assert
MatcherAssert.assertThat('fail', exception.message.contains("Suffix must be alphanumeric with dashes allowed within"))
Expand Down
Loading