Updated Branches: refs/heads/api_refactoring c83323fea -> f4892fbb8
api: remove those evil extra newlines Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f4892fbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f4892fbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f4892fbb Branch: refs/heads/api_refactoring Commit: f4892fbb8482572605ac5aff01de419ced5f8f5c Parents: 8735716 Author: Rohit Yadav <[email protected]> Authored: Tue Dec 11 13:38:32 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Tue Dec 11 13:38:32 2012 -0800 ---------------------------------------------------------------------- .../cloudstack/api/view/vo/ProjectJoinVO.java | 112 --------------- .../com/cloud/projects/dao/ProjectJoinDaoImpl.java | 22 --- 2 files changed, 0 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f4892fbb/api/src/org/apache/cloudstack/api/view/vo/ProjectJoinVO.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/view/vo/ProjectJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/ProjectJoinVO.java index f4226d3..a3f28a1 100644 --- a/api/src/org/apache/cloudstack/api/view/vo/ProjectJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/ProjectJoinVO.java @@ -101,69 +101,45 @@ public class ProjectJoinVO extends BaseViewVO { @Column(name="tag_customer") private String tagCustomer; - public ProjectJoinVO() { } - - - public String getUuid() { return uuid; } - - - public void setUuid(String uuid) { this.uuid = uuid; } - - public String getName() { return name; } - public void setName(String name) { this.name = name; } - - - - - public long getDomainId() { return domainId; } - public void setDomainId(long domainId) { this.domainId = domainId; } - public String getDomainUuid() { return domainUuid; } - - - public void setDomainUuid(String domainUuid) { this.domainUuid = domainUuid; } - - - public String getDomainName() { return domainName; } - public void setDomainName(String domainName) { this.domainName = domainName; } @@ -172,224 +148,136 @@ public class ProjectJoinVO extends BaseViewVO { return domainPath; } - public void setDomainPath(String domainPath) { this.domainPath = domainPath; } - public State getState() { return state; } - public void setState(State state) { this.state = state; } - public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } - public Date getRemoved() { return removed; } - public void setRemoved(Date removed) { this.removed = removed; } - - - public String getDisplayText() { return displayText; } - - - public void setDisplayText(String displayText) { this.displayText = displayText; } - - - public String getOwner() { return owner; } - - - public void setOwner(String owner) { this.owner = owner; } - - - public long getTagId() { return tagId; } - - - public void setTagId(long tagId) { this.tagId = tagId; } - - - public String getTagUuid() { return tagUuid; } - - - public void setTagUuid(String tagUuid) { this.tagUuid = tagUuid; } - - - public String getTagKey() { return tagKey; } - - - public void setTagKey(String tagKey) { this.tagKey = tagKey; } - - - public String getTagValue() { return tagValue; } - - - public void setTagValue(String tagValue) { this.tagValue = tagValue; } - - - public long getTagDomainId() { return tagDomainId; } - - - public void setTagDomainId(long tagDomainId) { this.tagDomainId = tagDomainId; } - - - public long getTagAccountId() { return tagAccountId; } - - - public void setTagAccountId(long tagAccountId) { this.tagAccountId = tagAccountId; } - - - public long getTagResourceId() { return tagResourceId; } - - - public void setTagResourceId(long tagResourceId) { this.tagResourceId = tagResourceId; } - - - public String getTagResourceUuid() { return tagResourceUuid; } - - - public void setTagResourceUuid(String tagResourceUuid) { this.tagResourceUuid = tagResourceUuid; } - - - public TaggedResourceType getTagResourceType() { return tagResourceType; } - - - public void setTagResourceType(TaggedResourceType tagResourceType) { this.tagResourceType = tagResourceType; } - - - public String getTagCustomer() { return tagCustomer; } - - - public void setTagCustomer(String tagCustomer) { this.tagCustomer = tagCustomer; } - - - public long getAccountId() { return accountId; } - - - public void setAccountId(long accountId) { this.accountId = accountId; } - - - } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f4892fbb/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java b/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java index dc6ba86..81ccb7f 100644 --- a/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java +++ b/server/src/com/cloud/projects/dao/ProjectJoinDaoImpl.java @@ -31,7 +31,6 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; - @Local(value={ProjectJoinDao.class}) public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> implements ProjectJoinDao { public static final Logger s_logger = Logger.getLogger(ProjectJoinDaoImpl.class); @@ -40,7 +39,6 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> impl private SearchBuilder<ProjectJoinVO> vrIdSearch; - protected ProjectJoinDaoImpl() { vrSearch = createSearchBuilder(); @@ -54,11 +52,6 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> impl this._count = "select count(distinct id) from project_view WHERE "; } - - - - - @Override public ProjectResponse newProjectResponse(ProjectJoinVO proj) { ProjectResponse response = new ProjectResponse(); @@ -85,8 +78,6 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> impl return response; } - - @Override public ProjectResponse setProjectResponse(ProjectResponse rsp, ProjectJoinVO proj) { // update tag information @@ -100,11 +91,6 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> impl return rsp; } - - - - - @Override public List<ProjectJoinVO> newProjectView(Project proj) { SearchCriteria<ProjectJoinVO> sc = vrIdSearch.create(); @@ -112,11 +98,6 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> impl return searchIncludingRemoved(sc, null, null, false); } - - - - - @Override public List<ProjectJoinVO> searchByIds(Long... ids) { SearchCriteria<ProjectJoinVO> sc = vrSearch.create(); @@ -124,7 +105,4 @@ public class ProjectJoinDaoImpl extends GenericDaoBase<ProjectJoinVO, Long> impl return searchIncludingRemoved(sc, null, null, false); } - - - }
