GIS-1621 - Make the importoptions class CPS compliant by not calling methods from the constructor
This commit is contained in:
parent
0d53bf9f58
commit
48dabad8f8
1 changed files with 9 additions and 16 deletions
|
|
@ -27,16 +27,15 @@ class ImportOptions {
|
|||
boolean nested = false,
|
||||
appendtoparentmeta = true) {
|
||||
this.script = script
|
||||
setsource(source)
|
||||
setincrementversionnumber(incrementversionnumber)
|
||||
setfilter(filter)
|
||||
setexcludes(excludes)
|
||||
setfingerprint(fingerprint)
|
||||
setnested(nested)
|
||||
setappendtoparentmeta(appendtoparentmeta)
|
||||
this.source = source.trim()
|
||||
this.incrementversionnumber = incrementversionnumber
|
||||
this.filter = filter.trim()
|
||||
this.excludes = excludes.trim()
|
||||
this.fingerprint = fingerprint
|
||||
this.nested = nested
|
||||
this.appendtoparentmeta = appendtoparentmeta
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setsource(String source) {
|
||||
source = source.trim()
|
||||
switch (source) {
|
||||
|
|
@ -52,32 +51,26 @@ class ImportOptions {
|
|||
}
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setincrementversionnumber(boolean incrementversionnumber) {
|
||||
this.incrementversionnumber = incrementversionnumber
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setfilter(String filter) {
|
||||
this.filter = filter.trim()
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setexcludes(String excludes) {
|
||||
this.excludes = excludes.trim()
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setfingerprint(boolean fingerprint) {
|
||||
this.fingerprint = fingerprint
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setnested(boolean nested) {
|
||||
this.nested = nested
|
||||
}
|
||||
|
||||
@NonCPS
|
||||
void setappendtoparentmeta(boolean appendtoparentmeta) {
|
||||
this.appendtoparentmeta = appendtoparentmeta
|
||||
}
|
||||
|
|
@ -234,7 +227,7 @@ def artifactimport(meta,
|
|||
String excludes = '',
|
||||
boolean fingerprint = false,
|
||||
boolean nested = false) {
|
||||
importoptions = getNewImportOptions(this)
|
||||
def importoptions = getNewImportOptions(this)
|
||||
|
||||
importoptions.source(source, jenkinsjob, buildnumberorselector, repo, revision)
|
||||
importoptions.setincrementversionnumber(incrementversionnumber)
|
||||
|
|
@ -255,7 +248,7 @@ def artifactimport(meta,
|
|||
String filter = '**',
|
||||
String excludes = '',
|
||||
boolean fingerprint = false) {
|
||||
importoptions = getNewImportOptions(this)
|
||||
def importoptions = getNewImportOptions(this)
|
||||
|
||||
importoptions.source(jenkinsjob, specific(buildnumber.toString()))
|
||||
importoptions.setincrementversionnumber(incrementversionnumber)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue