Skip to content

Commit

Permalink
confluence: handle page IDs as long values (#147)
Browse files Browse the repository at this point in the history 
* confluence: adding support for Long ids

* converting all pageId usage to long
  • Loading branch information
@dankle
dankle authored May 23, 2024
1 parent d467e89 commit e90337f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
16 changes: 8 additions & 8 deletions ...luence/src/main/java/com/walmartlabs/concord/plugins/confluence/ConfluenceTaskCommon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private Result createPage(CreatePageParams in) {
.url("content/")
.post(objMain);

Integer id = Integer.parseInt(results.get("id").toString());
Long id = Long.parseLong(results.get("id").toString());

log.info("Confluence page with title '{}' is created under space '{}' and its Id is: '{}'.",
pageTitle, spaceKey, id);
Expand All @@ -128,10 +128,10 @@ private Result updatePage(UpdatePageParams in) {
String pageUpdate;
try {
//Get confluence page id
int pageId = Integer.parseInt(Utils.getPageId(in, pageTitle, spaceKey));
long pageId = Long.parseLong(Utils.getPageId(in, pageTitle, spaceKey));
log.info("Id of page '{}/{}': '{}'.", spaceKey, pageTitle, pageId);

int version = Integer.parseInt(Utils.getPageCurrentVersion(in, pageId));
long version = Long.parseLong(Utils.getPageCurrentVersion(in, pageId));
log.info("Current version of page '{}/{}' is: '{}'.", spaceKey, pageTitle, version);
log.info("Incrementing the page version accordingly as a part of 'updatePage' action...");

Expand Down Expand Up @@ -180,7 +180,7 @@ private Result updatePage(UpdatePageParams in) {
}

private Result addCommentsToPage(AddCommentsToPage in) {
int pageId = in.pageId();
long pageId = in.pageId();

try {
//Build JSON data
Expand Down Expand Up @@ -219,7 +219,7 @@ private Result addCommentsToPage(AddCommentsToPage in) {
}

private Result uploadAttachment(UploadAttachmentParams in) {
int pageId = in.pageId();
long pageId = in.pageId();
String attachmentComment = in.attachmentComment();

try {
Expand All @@ -246,7 +246,7 @@ private Result createChildPage(CreateChildPageParams in) {
String childPageContent = in.childPageContent();
String template = in.template();
Map<String, Object> templateParams = in.templateParams();
int parentPageId = in.parentPageId();
long parentPageId = in.parentPageId();

try {
//Build JSON data
Expand Down Expand Up @@ -278,7 +278,7 @@ private Result createChildPage(CreateChildPageParams in) {
.url("content/")
.post(objMain);

Integer id = Integer.parseInt(results.get("id").toString());
Long id = Long.parseLong(results.get("id").toString());

log.info("Child page '{}' is created under parent# '{}/{}' and its Id is: '{}'",
childPageTitle, spaceKey, parentPageId, id);
Expand All @@ -295,7 +295,7 @@ private Result createChildPage(CreateChildPageParams in) {
}

private Result deletePage(DeletePageParams in) {
int pageId = in.pageId();
long pageId = in.pageId();

try {
log.info("Deleting confluence page# '{}''...", pageId);
Expand Down
12 changes: 6 additions & 6 deletions tasks/confluence/src/main/java/com/walmartlabs/concord/plugins/confluence/Result.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

public class Result implements Serializable {

public static Result ok(Integer pageId, Integer childId, String data) {
public static Result ok(Long pageId, Long childId, String data) {
return new Result(true, pageId, childId, data, null);
}

Expand All @@ -33,12 +33,12 @@ public static Result error(String error) {
}

public final boolean ok;
public final Integer pageId;
public final Integer childId;
public final Long pageId;
public final Long childId;
public final String data;
public final String error;

public Result(boolean ok, Integer pageId, Integer childId, String data, String error) {
public Result(boolean ok, Long pageId, Long childId, String data, String error) {
this.ok = ok;
this.pageId = pageId;
this.childId = childId;
Expand All @@ -50,11 +50,11 @@ public boolean isOk() {
return ok;
}

public Integer getpageId() {
public Long getpageId() {
return pageId;
}

public Integer getChildId() {
public Long getChildId() {
return childId;
}

Expand Down
20 changes: 10 additions & 10 deletions tasks/confluence/src/main/java/com/walmartlabs/concord/plugins/confluence/TaskParams.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ public Map<String, Object> templateParams() {
return variables.getMap(CONFLUENCE_PAGE_CONTENT_TEMPLATE_PARAMS, Collections.emptyMap());
}

public int parentPageId() {
return variables.assertInt(CONFLUENCE_PARENTPAGE_ID);
public long parentPageId() {
return variables.assertLong(CONFLUENCE_PARENTPAGE_ID);
}
}

Expand Down Expand Up @@ -228,8 +228,8 @@ public DeletePageParams(Variables variables) {
super(variables);
}

public int pageId() {
return variables.assertInt(CONFLUENCE_PAGE_ID);
public long pageId() {
return variables.assertLong(CONFLUENCE_PAGE_ID);
}
}

Expand All @@ -241,8 +241,8 @@ public GetPageParams(Variables variables) {
super(variables);
}

public int pageId() {
return variables.assertInt(CONFLUENCE_PAGE_ID);
public long pageId() {
return variables.assertLong(CONFLUENCE_PAGE_ID);
}
}

Expand All @@ -257,8 +257,8 @@ public UploadAttachmentParams(Variables variables) {
}


public int pageId() {
return variables.assertInt(CONFLUENCE_PAGE_ID);
public long pageId() {
return variables.assertLong(CONFLUENCE_PAGE_ID);
}

public String attachmentComment() {
Expand All @@ -279,8 +279,8 @@ public AddCommentsToPage(Variables variables) {
super(variables);
}

public int pageId() {
return variables.assertInt(CONFLUENCE_PAGE_ID);
public long pageId() {
return variables.assertLong(CONFLUENCE_PAGE_ID);
}

public String pageComment() {
Expand Down
4 changes: 2 additions & 2 deletions tasks/confluence/src/main/java/com/walmartlabs/concord/plugins/confluence/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static String getPageId(TaskParams in, String pageTitle, String spaceKey)
}

@SuppressWarnings("unchecked")
public static String getPageCurrentVersion(TaskParams in, int pageId) {
public static String getPageCurrentVersion(TaskParams in, long pageId) {
Map<String, Object> results;

try {
Expand All @@ -77,7 +77,7 @@ public static String getPageCurrentVersion(TaskParams in, int pageId) {
}

@SuppressWarnings("unchecked")
public static String getPageContent(TaskParams in, int pageId) {
public static String getPageContent(TaskParams in, long pageId) {
Map<String, Object> results;

try {
Expand Down

0 comments on commit e90337f

Please sign in to comment.