提交 83c7f846 编写于 作者: J Jesse Glick

[FIXED JENKINS-28093] Reverting getDownloadableId from #1563. Not compatible.

(cherry picked from commit 972db2a5)
上级 30f13604
...@@ -122,7 +122,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { ...@@ -122,7 +122,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
} }
protected Downloadable createDownloadable() { protected Downloadable createDownloadable() {
return new Downloadable(getDownloadableId()); return new Downloadable(getId());
} }
/** /**
...@@ -130,7 +130,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { ...@@ -130,7 +130,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
* <p> * <p>
* By default we use the fully-qualified class name of the {@link DownloadFromUrlInstaller} subtype. * By default we use the fully-qualified class name of the {@link DownloadFromUrlInstaller} subtype.
*/ */
public String getDownloadableId() { public String getId() {
return clazz.getName().replace('$','.'); return clazz.getName().replace('$','.');
} }
...@@ -144,7 +144,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { ...@@ -144,7 +144,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
* @return never null. * @return never null.
*/ */
public List<? extends Installable> getInstallables() throws IOException { public List<? extends Installable> getInstallables() throws IOException {
JSONObject d = Downloadable.get(getDownloadableId()).getData(); JSONObject d = Downloadable.get(getId()).getData();
if(d==null) return Collections.emptyList(); if(d==null) return Collections.emptyList();
return Arrays.asList(((InstallableList)JSONObject.toBean(d,InstallableList.class)).list); return Arrays.asList(((InstallableList)JSONObject.toBean(d,InstallableList.class)).list);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册