mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
[HUDSON-2298] Rolling back a part of rev.11912 that introduces AbstractBuild as a parameter
to getAddress(). git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11948 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
f3c32abff3
commit
fcfa6f02e6
2 files changed
+5
-32
No files matched your search
@@ -5,7 +5,6 @@ import hudson.Plugin;
|
||||
import hudson.scm.SCM;
|
||||
import hudson.scm.CVSSCM;
|
||||
import hudson.scm.SubversionSCM;
|
||||
import hudson.model.AbstractBuild;
|
||||
import hudson.model.User;
|
||||
import hudson.model.AbstractProject;
|
||||
|
||||
@@ -60,15 +59,9 @@ public abstract class MailAddressResolver implements ExtensionPoint {
|
||||
*/
|
||||
public abstract String findMailAddressFor(User u);
|
||||
|
||||
public static String resolve(AbstractBuild<?, ?> build, User u) {
|
||||
public static String resolve(User u) {
|
||||
for (MailAddressResolver r : LIST) {
|
||||
String email = null;
|
||||
|
||||
if(build != null)
|
||||
email = r.findMailAddressFor(build, u);
|
||||
else
|
||||
email = r.findMailAddressFor(u);
|
||||
|
||||
String email = r.findMailAddressFor(u);
|
||||
if(email!=null) return email;
|
||||
}
|
||||
|
||||
@@ -86,14 +79,6 @@ public abstract class MailAddressResolver implements ExtensionPoint {
|
||||
return u.getId()+ds;
|
||||
else
|
||||
return null;
|
||||
}
|
||||
|
||||
protected String findMailAddressFor(AbstractBuild<?, ?> build, User u) {
|
||||
return findMailAddressFor(u);
|
||||
}
|
||||
|
||||
public static String resolve(User u) {
|
||||
return resolve(null, u);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -132,10 +117,6 @@ public abstract class MailAddressResolver implements ExtensionPoint {
|
||||
*/
|
||||
public static class DefaultAddressResolver extends MailAddressResolver {
|
||||
public String findMailAddressFor(User u) {
|
||||
return findMailAddressFor(null, u);
|
||||
}
|
||||
|
||||
public String findMailAddressFor(AbstractBuild<?, ?>build, User u) {
|
||||
for (AbstractProject<?,?> p : u.getProjects()) {
|
||||
SCM scm = p.getScm();
|
||||
if (scm instanceof CVSSCM) {
|
||||
@@ -146,7 +127,7 @@ public abstract class MailAddressResolver implements ExtensionPoint {
|
||||
}
|
||||
if (scm instanceof SubversionSCM) {
|
||||
SubversionSCM svn = (SubversionSCM) scm;
|
||||
for (SubversionSCM.ModuleLocation loc : svn.getLocations(build)) {
|
||||
for (SubversionSCM.ModuleLocation loc : svn.getLocations()) {
|
||||
String s = findMailAddressFor(u,loc.remote);
|
||||
if(s!=null) return s;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package hudson.tasks;
|
||||
import hudson.Launcher;
|
||||
import hudson.Functions;
|
||||
import hudson.maven.AbstractMavenProject;
|
||||
import hudson.model.AbstractBuild;
|
||||
import hudson.model.AbstractProject;
|
||||
import hudson.model.Build;
|
||||
import hudson.model.BuildListener;
|
||||
@@ -415,19 +414,12 @@ public class Mailer extends Publisher {
|
||||
|
||||
@Exported
|
||||
public String getAddress() {
|
||||
return getAddress(null);
|
||||
}
|
||||
|
||||
public String getAddress(AbstractBuild<?, ?> build) {
|
||||
if(emailAddress!=null)
|
||||
return emailAddress;
|
||||
|
||||
// try the inference logic
|
||||
if(build != null)
|
||||
return MailAddressResolver.resolve(build, user);
|
||||
else
|
||||
return MailAddressResolver.resolve(user);
|
||||
}
|
||||
return MailAddressResolver.resolve(user);
|
||||
}
|
||||
|
||||
public DescriptorImpl getDescriptor() {
|
||||
return DESCRIPTOR;
|
||||
|
||||
Reference in new issue
Block a user