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

Commit

Permalink
Merge remote-tracking branch 'halusstefan/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sciuto committed Jun 3, 2015
2 parents 6f8aff9 + 63cb69a commit ca5b9e5
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 73 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.constantcontact</groupId>
<artifactId>constantcontact</artifactId>
<version>4.0.0</version>
<version>4.1.0</version>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ public abstract class EmailCampaignBase extends Component implements Serializabl
private String createdDate;
@JsonIgnore
private String permalinkUrl;
@JsonIgnore
private String archiveStatus;
@JsonIgnore
private String archiveUrl;

/**
* Gets the template type.
Expand Down Expand Up @@ -386,26 +382,6 @@ public String getPermalinkUrl() {
return permalinkUrl;
}

/**
* Get the Archive Status
*
* @return The Archive Status, as seen in the {@link ArchiveStatus}
*/
@JsonProperty("archive_status")
public String getArchiveStatus() {
return archiveStatus;
}

/**
* Get the Archive Url
*
* @return The Archive Url
*/
@JsonProperty("archive_url")
public String getArchiveUrl() {
return archiveUrl;
}

/**
* Sets the template type.
*
Expand Down Expand Up @@ -676,24 +652,6 @@ public void setPermalinkUrl(String permalinkUrl) {
this.permalinkUrl = permalinkUrl;
}

/**
* Set the Archive Status
*
* @param archiveStatus The Archive Status, as seen in {@link ArchiveStatus}
*/
public void setArchiveStatus(String archiveStatus) {
this.archiveStatus = archiveStatus;
}

/**
* Set the Archive Url
*
* @param archiveUrl The Archive Url
*/
public void setArchiveUrl(String archiveUrl) {
this.archiveUrl = archiveUrl;
}

/**
* Default constructor.
*/
Expand Down Expand Up @@ -770,10 +728,6 @@ public String toString() {
builder.append(createdDate);
builder.append(", permalinkUrl=");
builder.append(permalinkUrl);
builder.append(", archiveStatus=");
builder.append(archiveStatus);
builder.append(", archiveUrl=");
builder.append(archiveUrl);
builder.append(" ]\n");
return builder.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,30 +138,6 @@ public boolean isVisibleInUi() {
public TrackingSummary getTrackingSummary() {
return super.getTrackingSummary();
}
/**
* Override of {@link EmailCampaignBase#getArchiveStatus()} to hide it via JsonIgnore.<br/>
* Reason: server returns an error when this field appears in a request.
*
* @return Call to parent method
*/
@Override
@JsonIgnore
public String getArchiveStatus() {
return super.getArchiveStatus();
}
/**
* Override of {@link EmailCampaignBase#getArchiveUrl()} to hide it via JsonIgnore.<br/>
* Reason: server returns an error when this field appears in a request.
*
* @return Call to parent method
*/
@Override
@JsonIgnore
public String getArchiveUrl() {
return super.getArchiveUrl();
}



/**
* Default constructor.
Expand Down Expand Up @@ -205,8 +181,6 @@ public EmailCampaignRequest(EmailCampaignResponse response) {
setTrackingSummary(response.getTrackingSummary());
setSentToContactLists(response.getSentToContactLists());
setCreatedDate(response.getCreatedDate());
setArchiveStatus(response.getArchiveStatus());
setArchiveUrl(response.getArchiveUrl());
}

/**
Expand Down

0 comments on commit ca5b9e5

Please sign in to comment.