Skip to content
This repository has been archived by the owner on Dec 16, 2021. It is now read-only.

Commit

Permalink
MOB-6442 -> Update the d-types for max space and usage summary, to fi…
Browse files Browse the repository at this point in the history
…x JSON PE

-> Bump version
  • Loading branch information
Monika Bolleddula committed Mar 14, 2019
1 parent aa0fcb0 commit db3fb92
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ allprojects {

group = 'com.constantcontact'
def isRelease = Boolean.valueOf(project.hasProperty("release") ? project.property("release") as String : "false")
version = '5.2.2' + (isRelease ? "" : "-SNAPSHOT")
version = '5.2.3' + (isRelease ? "" : "-SNAPSHOT")
}

apply plugin: "net.wooga.github"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;

Expand All @@ -31,7 +32,7 @@ public class LibraryInfo implements Serializable {
protected int _maxFreeFileNum;

@JsonProperty("max_premium_space_limit")
protected int _maxPremiumSpaceLimit;
protected long _maxPremiumSpaceLimit;

@JsonProperty("image_root")
protected String _imageRoot;
Expand All @@ -53,11 +54,11 @@ public void setMaxFreeFileNum(int maxFreeFileNum) {
_maxFreeFileNum = maxFreeFileNum;
}

public int getMaxPremiumSpaceLimit() {
public long getMaxPremiumSpaceLimit() {
return _maxPremiumSpaceLimit;
}

public void setMaxPremiumSpaceLimit(int maxPremiumSpaceLimit) {
public void setMaxPremiumSpaceLimit(long maxPremiumSpaceLimit) {
_maxPremiumSpaceLimit = maxPremiumSpaceLimit;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;

Expand All @@ -40,16 +41,16 @@ public class UsageSummary implements Serializable {
protected int _documentCount;

@JsonProperty("total_bytes_used")
protected int _totalBytesUsed;
protected long _totalBytesUsed;

@JsonProperty("image_bytes_used")
protected int _imageBytesUsed;
protected long _imageBytesUsed;

@JsonProperty("document_bytes_used")
protected int _documentBytesUsed;
protected long _documentBytesUsed;

@JsonProperty("total_bytes_remaining")
protected int _totalBytesRemaining;
protected long _totalBytesRemaining;

@JsonProperty("free_files_remaining")
protected int _freeFilesRemaining;
Expand Down Expand Up @@ -89,35 +90,35 @@ public void setDocumentCount(int documentCount) {
_documentCount = documentCount;
}

public int getTotalBytesUsed() {
public long getTotalBytesUsed() {
return _totalBytesUsed;
}

public void setTotalBytesUsed(int totalBytesUsed) {
public void setTotalBytesUsed(long totalBytesUsed) {
_totalBytesUsed = totalBytesUsed;
}

public int getImageBytesUsed() {
public long getImageBytesUsed() {
return _imageBytesUsed;
}

public void setImageBytesUsed(int imageBytesUsed) {
public void setImageBytesUsed(long imageBytesUsed) {
_imageBytesUsed = imageBytesUsed;
}

public int getDocumentBytesUsed() {
public long getDocumentBytesUsed() {
return _documentBytesUsed;
}

public void setDocumentBytesUsed(int documentBytesUsed) {
public void setDocumentBytesUsed(long documentBytesUsed) {
_documentBytesUsed = documentBytesUsed;
}

public int getTotalBytesRemaining() {
public long getTotalBytesRemaining() {
return _totalBytesRemaining;
}

public void setTotalBytesRemaining(int totalBytesRemaining) {
public void setTotalBytesRemaining(long totalBytesRemaining) {
_totalBytesRemaining = totalBytesRemaining;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class LibraryInfoTest {

private static final int MAX_FREE_FILE = 5;

private static final int MAX_PREMIUM_SPACE = 100;
private static final long MAX_PREMIUM_SPACE = 100;

private static final int MAX_UPLOAD_SIZE = 1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/**
*/
public class UsageSummaryTest {
private static final int DOCUMENTS_BYTES_USED = 5;
private static final long DOCUMENTS_BYTES_USED = 5;

private static final int DOCUMENT_COUNT = 6;

Expand All @@ -31,13 +31,13 @@ public class UsageSummaryTest {

private static final int FREE_FILES_REMAINING = 9;

private static final int IMAGE_BYTES_USED = 10;
private static final long IMAGE_BYTES_USED = 10;

private static final int IMAGE_COUNT = 11;

private static final int TOTAL_BYTES_USED = 12;
private static final long TOTAL_BYTES_USED = 12;

private static final int TOTAL_BYTES_REMAINING = 13;
private static final long TOTAL_BYTES_REMAINING = 13;

static UsageSummary createUsageSummary() {
UsageSummary usageSummary = new UsageSummary();
Expand Down

0 comments on commit db3fb92

Please sign in to comment.