From afe303bc36768874aa7a0f4d15c3cedd913bad80 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 12 Apr 2007 06:28:44 +0000 Subject: [PATCH] exposing more objects and properties. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3043 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/model/AbstractBuild.java | 1 + core/src/main/java/hudson/model/Run.java | 3 +++ .../main/java/hudson/scm/CVSChangeLogSet.java | 13 +++++++++++++ .../src/main/java/hudson/scm/ChangeLogSet.java | 18 ++++++++++++++++++ core/src/main/java/hudson/scm/EditType.java | 8 +++++++- .../hudson/scm/SubversionChangeLogSet.java | 9 ++++++++- 6 files changed, 50 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index c62e5927cc..836aad360e 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -179,6 +179,7 @@ public abstract class AbstractBuild

,R extends Abs * * @return never null. */ + @Exposed public ChangeLogSet getChangeSet() { if(scm==null) scm = new CVSChangeLogParser(); diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index e806c3d359..e9cd2c6933 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -197,6 +197,7 @@ public abstract class Run ,RunT extends Run,RunT extends Run,RunT extends Run { f.parent = this; } + @Exposed public String getDate() { return date; } @@ -133,6 +135,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.date = date; } + @Exposed public String getTime() { return time; } @@ -141,6 +144,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.time = time; } + @Exposed public User getAuthor() { return author; } @@ -161,10 +165,12 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.author = User.get(author); } + @Exposed public String getUser() {// digester wants read/write property, even though it never reads. Duh. return author.getDisplayName(); } + @Exposed public String getMsg() { return msg; } @@ -178,6 +184,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { files.add(f); } + @Exposed public List getFiles() { return files; } @@ -198,6 +205,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { *

* The path is relative to the workspace root. */ + @Exposed public String getName() { return name; } @@ -210,6 +218,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { * Unlike {@link #getName()}, this method returns * a full name from the root of the CVS repository. */ + @Exposed public String getFullName() { if(fullName==null) { // Hudson < 1.91 doesn't record full path name for CVS, @@ -250,6 +259,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.name = name; } + @Exposed public String getRevision() { return revision; } @@ -258,6 +268,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.revision = revision; } + @Exposed public String getPrevrevision() { return prevrevision; } @@ -266,6 +277,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.prevrevision = prevrevision; } + @Exposed public boolean isDead() { return dead; } @@ -274,6 +286,7 @@ public final class CVSChangeLogSet extends ChangeLogSet { this.dead = true; } + @Exposed public EditType getEditType() { // see issue #73. Can't do much better right now if(dead) diff --git a/core/src/main/java/hudson/scm/ChangeLogSet.java b/core/src/main/java/hudson/scm/ChangeLogSet.java index 309f90d691..91a50228cd 100644 --- a/core/src/main/java/hudson/scm/ChangeLogSet.java +++ b/core/src/main/java/hudson/scm/ChangeLogSet.java @@ -2,11 +2,15 @@ package hudson.scm; import hudson.MarkupText; import hudson.Util; +import hudson.api.ExposedBean; +import hudson.api.Exposed; import hudson.model.AbstractBuild; import hudson.model.User; import java.util.Collection; import java.util.Collections; +import java.util.List; +import java.util.ArrayList; /** * Represents SCM change list. @@ -16,6 +20,7 @@ import java.util.Collections; * * @author Kohsuke Kawaguchi */ +@ExposedBean public abstract class ChangeLogSet implements Iterable { /** @@ -32,6 +37,18 @@ public abstract class ChangeLogSet implements Iter */ public abstract boolean isEmptySet(); + /** + * All changes in the change set. + */ + // method for the remote API. + @Exposed + public final Object[] getItems() { + List r = new ArrayList(); + for (T t : this) + r.add(t); + return r.toArray(); + } + /** * Constant instance that represents no changes. */ @@ -39,6 +56,7 @@ public abstract class ChangeLogSet implements Iter return new CVSChangeLogSet(build,Collections.emptyList()); } + @ExposedBean public static abstract class Entry { private ChangeLogSet parent; diff --git a/core/src/main/java/hudson/scm/EditType.java b/core/src/main/java/hudson/scm/EditType.java index f0222df3bf..407dde6585 100644 --- a/core/src/main/java/hudson/scm/EditType.java +++ b/core/src/main/java/hudson/scm/EditType.java @@ -1,11 +1,13 @@ package hudson.scm; +import hudson.api.CustomExposureBean; + /** * Designates the SCM operation. * * @author Kohsuke Kawaguchi */ -public final class EditType { +public final class EditType implements CustomExposureBean { private String name; private String description; @@ -22,6 +24,10 @@ public final class EditType { return description; } + public Object toExposedObject() { + return name; + } + public static final EditType ADD = new EditType("add","The file was added"); public static final EditType EDIT = new EditType("edit","The file was modified"); public static final EditType DELETE = new EditType("delete","The file was removed"); diff --git a/core/src/main/java/hudson/scm/SubversionChangeLogSet.java b/core/src/main/java/hudson/scm/SubversionChangeLogSet.java index da5fb31e67..d366348d08 100644 --- a/core/src/main/java/hudson/scm/SubversionChangeLogSet.java +++ b/core/src/main/java/hudson/scm/SubversionChangeLogSet.java @@ -3,6 +3,7 @@ package hudson.scm; import hudson.model.AbstractBuild; import hudson.model.User; import hudson.scm.SubversionChangeLogSet.LogEntry; +import hudson.api.Exposed; import java.io.IOException; import java.util.ArrayList; @@ -79,6 +80,7 @@ public final class SubversionChangeLogSet extends ChangeLogSet { * If the commit made the repository revision 1532, this * method returns 1532. */ + @Exposed public int getRevision() { return revision; } @@ -108,10 +110,12 @@ public final class SubversionChangeLogSet extends ChangeLogSet { this.author = User.get(author); } + @Exposed public String getUser() {// digester wants read/write property, even though it never reads. Duh. return author.getDisplayName(); } + @Exposed public String getDate() { return date; } @@ -120,7 +124,7 @@ public final class SubversionChangeLogSet extends ChangeLogSet { this.date = date; } - @Override + @Override @Exposed public String getMsg() { return msg; } @@ -139,6 +143,7 @@ public final class SubversionChangeLogSet extends ChangeLogSet { * @return * can be empty but never null. */ + @Exposed public List getPaths() { return paths; } @@ -169,6 +174,7 @@ public final class SubversionChangeLogSet extends ChangeLogSet { /** * Path in the repository. Such as /test/trunk/foo.c */ + @Exposed(name="path") public String getValue() { return value; } @@ -177,6 +183,7 @@ public final class SubversionChangeLogSet extends ChangeLogSet { this.value = value; } + @Exposed public EditType getEditType() { if( action=='A' ) return EditType.ADD;