Skip to content

Commit

Permalink
[JENKINS-43507] Pick up new releases
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephenc
stephenc committed Jul 5, 2017
1 parent fe99a79 commit d7c3ece
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 42 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -30,7 +30,7 @@
<concurrency>1C</concurrency> <concurrency>1C</concurrency>
<findbugs.failOnError>false</findbugs.failOnError> <findbugs.failOnError>false</findbugs.failOnError>
<workflow.version>1.14.2</workflow.version> <workflow.version>1.14.2</workflow.version>
<scm-api-plugin.version>2.2.0-alpha-1</scm-api-plugin.version> <scm-api-plugin.version>2.2.0-beta-1</scm-api-plugin.version>
</properties> </properties>


<build> <build>
Expand Down
43 changes: 11 additions & 32 deletions src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java
View file
Expand Up @@ -96,6 +96,7 @@
import jenkins.scm.api.metadata.PrimaryInstanceMetadataAction; import jenkins.scm.api.metadata.PrimaryInstanceMetadataAction;
import jenkins.scm.api.trait.SCMSourceRequest; import jenkins.scm.api.trait.SCMSourceRequest;
import jenkins.scm.api.trait.SCMSourceTrait; import jenkins.scm.api.trait.SCMSourceTrait;
import jenkins.scm.api.trait.SCMTrait;
import jenkins.scm.impl.trait.WildcardSCMHeadFilterTrait; import jenkins.scm.impl.trait.WildcardSCMHeadFilterTrait;
import jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait; import jenkins.scm.impl.trait.WildcardSCMSourceFilterTrait;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -185,12 +186,8 @@ public AbstractGitSCMSource(String id) {
@Restricted(NoExternalUse.class) @Restricted(NoExternalUse.class)
@RestrictedSince("3.4.0") @RestrictedSince("3.4.0")
public String getIncludes() { public String getIncludes() {
for (SCMSourceTrait trait: getTraits()) { WildcardSCMHeadFilterTrait trait = SCMTrait.find(getTraits(), WildcardSCMHeadFilterTrait.class);
if (trait instanceof WildcardSCMHeadFilterTrait) { return trait != null ? trait.getIncludes() : "*";
return ((WildcardSCMHeadFilterTrait) trait).getIncludes();
}
}
return "*";
} }


/** /**
Expand All @@ -201,12 +198,8 @@ public String getIncludes() {
@Restricted(NoExternalUse.class) @Restricted(NoExternalUse.class)
@RestrictedSince("3.4.0") @RestrictedSince("3.4.0")
public String getExcludes() { public String getExcludes() {
for (SCMSourceTrait trait : getTraits()) { WildcardSCMHeadFilterTrait trait = SCMTrait.find(getTraits(), WildcardSCMHeadFilterTrait.class);
if (trait instanceof WildcardSCMHeadFilterTrait) { return trait != null ? trait.getExcludes() : "";
return ((WildcardSCMHeadFilterTrait) trait).getExcludes();
}
}
return "";
} }


/** /**
Expand All @@ -220,13 +213,8 @@ public String getExcludes() {
@Restricted(NoExternalUse.class) @Restricted(NoExternalUse.class)
@RestrictedSince("3.4.0") @RestrictedSince("3.4.0")
public GitRepositoryBrowser getBrowser() { public GitRepositoryBrowser getBrowser() {
for (SCMSourceTrait trait : getTraits()) { GitBrowserSCMSourceTrait trait = SCMTrait.find(getTraits(), GitBrowserSCMSourceTrait.class);
if (trait instanceof GitBrowserSCMSourceTrait) { return trait != null ? trait.getBrowser() : null;
return ((GitBrowserSCMSourceTrait) trait).getBrowser();
}
}
// Always return null by default
return null;
} }


/** /**
Expand All @@ -240,13 +228,8 @@ public GitRepositoryBrowser getBrowser() {
@Restricted(NoExternalUse.class) @Restricted(NoExternalUse.class)
@RestrictedSince("3.4.0") @RestrictedSince("3.4.0")
public String getGitTool() { public String getGitTool() {
for (SCMSourceTrait trait : getTraits()) { GitToolSCMSourceTrait trait = SCMTrait.find(getTraits(), GitToolSCMSourceTrait.class);
if (trait instanceof GitToolSCMSourceTrait) { return trait != null ? trait.getGitTool() : null;
return ((GitToolSCMSourceTrait) trait).getGitTool();
}
}
// Always return null by default
return null;
} }


/** /**
Expand Down Expand Up @@ -289,12 +272,8 @@ public List<SCMSourceTrait> getTraits() {
@Restricted(NoExternalUse.class) @Restricted(NoExternalUse.class)
@RestrictedSince("3.4.0") @RestrictedSince("3.4.0")
public String getRemoteName() { public String getRemoteName() {
for (SCMSourceTrait t : getTraits()) { RemoteNameSCMSourceTrait trait = SCMTrait.find(getTraits(), RemoteNameSCMSourceTrait.class);
if (t instanceof RemoteNameSCMSourceTrait) { return trait != null ? trait.getRemoteName() : DEFAULT_REMOTE_NAME;
return ((RemoteNameSCMSourceTrait) t).getRemoteName();
}
}
return DEFAULT_REMOTE_NAME;
} }


/** /**
Expand Down
22 changes: 13 additions & 9 deletions src/main/java/jenkins/plugins/git/GitSCMSource.java
View file
Expand Up @@ -83,6 +83,7 @@
import jenkins.scm.api.trait.SCMHeadPrefilter; import jenkins.scm.api.trait.SCMHeadPrefilter;
import jenkins.scm.api.trait.SCMSourceTrait; import jenkins.scm.api.trait.SCMSourceTrait;
import jenkins.scm.api.trait.SCMSourceTraitDescriptor; import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
import jenkins.scm.api.trait.SCMTrait;
import jenkins.scm.impl.form.NamedArrayList; import jenkins.scm.impl.form.NamedArrayList;
import jenkins.scm.impl.trait.Discovery; import jenkins.scm.impl.trait.Discovery;
import jenkins.scm.impl.trait.Selection; import jenkins.scm.impl.trait.Selection;
Expand Down Expand Up @@ -162,7 +163,7 @@ public void setCredentialsId(@CheckForNull String credentialsId) {


@DataBoundSetter @DataBoundSetter
public void setTraits(List<SCMSourceTrait> traits) { public void setTraits(List<SCMSourceTrait> traits) {
this.traits = traits == null ? new ArrayList<SCMSourceTrait>() : new ArrayList<SCMSourceTrait>(traits); this.traits = SCMTrait.asSetList(traits);
} }


@Deprecated @Deprecated
Expand All @@ -172,7 +173,7 @@ public GitSCMSource(String id, String remote, String credentialsId, String remot
super(id); super(id);
this.remote = remote; this.remote = remote;
this.credentialsId = credentialsId; this.credentialsId = credentialsId;
this.traits = new ArrayList<>(); List<SCMSourceTrait> traits = new ArrayList<>();
this.traits.add(new BranchDiscoveryTrait()); this.traits.add(new BranchDiscoveryTrait());
if (!DEFAULT_INCLUDES.equals(includes) || !DEFAULT_EXCLUDES.equals(excludes)) { if (!DEFAULT_INCLUDES.equals(includes) || !DEFAULT_EXCLUDES.equals(excludes)) {
traits.add(new WildcardSCMHeadFilterTrait(includes, excludes)); traits.add(new WildcardSCMHeadFilterTrait(includes, excludes));
Expand All @@ -187,6 +188,7 @@ public GitSCMSource(String id, String remote, String credentialsId, String remot
if (trait != null) { if (trait != null) {
traits.add(trait); traits.add(trait);
} }
setTraits(traits);
} }


@Deprecated @Deprecated
Expand All @@ -198,7 +200,7 @@ public GitSCMSource(String id, String remote, String credentialsId, String inclu


private Object readResolve() throws ObjectStreamException { private Object readResolve() throws ObjectStreamException {
if (traits == null) { if (traits == null) {
traits = new ArrayList<>(); List<SCMSourceTrait> traits = new ArrayList<>();
traits.add(new BranchDiscoveryTrait()); traits.add(new BranchDiscoveryTrait());
if ((includes != null && !DEFAULT_INCLUDES.equals(includes)) if ((includes != null && !DEFAULT_INCLUDES.equals(includes))
|| (excludes != null && !DEFAULT_EXCLUDES.equals(excludes))) { || (excludes != null && !DEFAULT_EXCLUDES.equals(excludes))) {
Expand Down Expand Up @@ -244,6 +246,7 @@ private Object readResolve() throws ObjectStreamException {
if (trait != null) { if (trait != null) {
traits.add(trait); traits.add(trait);
} }
setTraits(traits);
} }
return this; return this;
} }
Expand Down Expand Up @@ -279,19 +282,15 @@ private RefSpecsSCMSourceTrait asRefSpecsSCMSourceTrait(String rawRefSpecs, Stri
@Restricted(DoNotUse.class) @Restricted(DoNotUse.class)
@RestrictedSince("3.4.0") @RestrictedSince("3.4.0")
public boolean isIgnoreOnPushNotifications() { public boolean isIgnoreOnPushNotifications() {
for (SCMSourceTrait trait : traits) { return SCMTrait.find(traits, IgnoreOnPushNotificationTrait.class) != null;
if (trait instanceof IgnoreOnPushNotificationTrait) {
return true;
}
}
return false;
} }




// For Stapler only // For Stapler only
@Restricted(DoNotUse.class) @Restricted(DoNotUse.class)
@DataBoundSetter @DataBoundSetter
public void setBrowser(GitRepositoryBrowser browser) { public void setBrowser(GitRepositoryBrowser browser) {
List<SCMSourceTrait> traits = new ArrayList<>(this.traits);
for (Iterator<SCMSourceTrait> iterator = traits.iterator(); iterator.hasNext(); ) { for (Iterator<SCMSourceTrait> iterator = traits.iterator(); iterator.hasNext(); ) {
if (iterator.next() instanceof GitBrowserSCMSourceTrait) { if (iterator.next() instanceof GitBrowserSCMSourceTrait) {
iterator.remove(); iterator.remove();
Expand All @@ -300,12 +299,14 @@ public void setBrowser(GitRepositoryBrowser browser) {
if (browser != null) { if (browser != null) {
traits.add(new GitBrowserSCMSourceTrait(browser)); traits.add(new GitBrowserSCMSourceTrait(browser));
} }
setTraits(traits);
} }


// For Stapler only // For Stapler only
@Restricted(DoNotUse.class) @Restricted(DoNotUse.class)
@DataBoundSetter @DataBoundSetter
public void setGitTool(String gitTool) { public void setGitTool(String gitTool) {
List<SCMSourceTrait> traits = new ArrayList<>(this.traits);
gitTool = Util.fixEmptyAndTrim(gitTool); gitTool = Util.fixEmptyAndTrim(gitTool);
for (Iterator<SCMSourceTrait> iterator = traits.iterator(); iterator.hasNext(); ) { for (Iterator<SCMSourceTrait> iterator = traits.iterator(); iterator.hasNext(); ) {
if (iterator.next() instanceof GitToolSCMSourceTrait) { if (iterator.next() instanceof GitToolSCMSourceTrait) {
Expand All @@ -315,13 +316,15 @@ public void setGitTool(String gitTool) {
if (gitTool != null) { if (gitTool != null) {
traits.add(new GitToolSCMSourceTrait(gitTool)); traits.add(new GitToolSCMSourceTrait(gitTool));
} }
setTraits(traits);
} }


// For Stapler only // For Stapler only
@Restricted(DoNotUse.class) @Restricted(DoNotUse.class)
@DataBoundSetter @DataBoundSetter
@Deprecated @Deprecated
public void setExtensions(@CheckForNull List<GitSCMExtension> extensions) { public void setExtensions(@CheckForNull List<GitSCMExtension> extensions) {
List<SCMSourceTrait> traits = new ArrayList<>(this.traits);
for (Iterator<SCMSourceTrait> iterator = traits.iterator(); iterator.hasNext(); ) { for (Iterator<SCMSourceTrait> iterator = traits.iterator(); iterator.hasNext(); ) {
if (iterator.next() instanceof GitSCMExtensionTrait) { if (iterator.next() instanceof GitSCMExtensionTrait) {
iterator.remove(); iterator.remove();
Expand Down Expand Up @@ -349,6 +352,7 @@ public void setExtensions(@CheckForNull List<GitSCMExtension> extensions) {
+ "make sense for a GitSCMSource)", extension.getClass().getName()); + "make sense for a GitSCMSource)", extension.getClass().getName());
} }
} }
setTraits(traits);
} }


@Override @Override
Expand Down

0 comments on commit d7c3ece

Please sign in to comment.