Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #651: adds custom_status_id to Request object #652

Merged
merged 5 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/org/zendesk/client/v2/Zendesk.java
Original file line number Diff line number Diff line change
Expand Up @@ -2394,7 +2394,9 @@ public <T extends SearchResultEntity> Iterable<T> getSearchResults(Class<T> type
return getSearchResults(type, query, Collections.emptyMap());
}

/** @deprecated Use {@link #getSearchResults(Class, String, Map)} instead. */
/**
* @deprecated Use {@link #getSearchResults(Class, String, Map)} instead.
*/
@Deprecated
public <T extends SearchResultEntity> Iterable<T> getSearchResults(
Class<T> type, String query, String params) {
Expand Down Expand Up @@ -2864,7 +2866,9 @@ public Locales listHelpCenterLocales() {
return complete(submit(req("GET", cnst("/help_center/locales.json")), handle(Locales.class)));
}

/** @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead */
/**
* @deprecated Use {@link Zendesk#listHelpCenterLocales()} instead
*/
@Deprecated
public List<String> getHelpCenterLocales() {
return listHelpCenterLocales().getLocales();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/Condition.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import java.io.Serializable;

/** @author Sandeep Kaul ([email protected]) */
/**
* @author Sandeep Kaul ([email protected])
*/
public class Condition implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/Conditions.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import java.util.ArrayList;
import java.util.List;

/** @author Sandeep Kaul([email protected]) */
/**
* @author Sandeep Kaul([email protected])
*/
public class Conditions implements Serializable {

private static final long serialVersionUID = 1L;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/Metric.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import java.io.Serializable;
import java.util.Date;

/** @author jyrij */
/**
* @author jyrij
*/
public class Metric implements Serializable {

private static final long serialVersionUID = -847290591071406141L;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/zendesk/client/v2/model/Request.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class Request implements Serializable {
protected String subject;
protected String description;
protected Status status;
protected Long customStatusId;
protected Ticket.Requester requester;
protected Long requesterId;
protected Long organizationId;
Expand Down Expand Up @@ -87,6 +88,15 @@ public void setStatus(Status status) {
this.status = status;
}

@JsonProperty("custom_status_id")
public Long getCustomStatusId() {
return customStatusId;
}

public void setCustomStatusId(Long customStatusId) {
this.customStatusId = customStatusId;
}

public String getSubject() {
return subject;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package org.zendesk.client.v2.model;

/** @author Stephen Connolly */
/**
* @author Stephen Connolly
*/
public interface SearchResultEntity {}
4 changes: 3 additions & 1 deletion src/main/java/org/zendesk/client/v2/model/TicketImport.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import java.util.Date;
import java.util.List;

/** @author robert-fernandes */
/**
* @author robert-fernandes
*/
@JsonIgnoreProperties(value = "comment", ignoreUnknown = true)
public class TicketImport extends Ticket {

Expand Down
20 changes: 15 additions & 5 deletions src/main/java/org/zendesk/client/v2/model/schedules/Schedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public void setId(Long id) {
this.id = id;
}

/** @return Name of the Schedule */
/**
* @return Name of the Schedule
*/
public String getName() {
return name;
}
Expand All @@ -38,7 +40,9 @@ public void setName(String name) {
this.name = name;
}

/** @return Time zone of the schedule */
/**
* @return Time zone of the schedule
*/
@JsonProperty("time_zone")
public String getTimeZone() {
return timeZone;
Expand All @@ -48,7 +52,9 @@ public void setTimeZone(String timeZone) {
this.timeZone = timeZone;
}

/** @return List of intervals for the schedule */
/**
* @return List of intervals for the schedule
*/
public List<Interval> getIntervals() {
return intervals;
}
Expand All @@ -57,7 +63,9 @@ public void setIntervals(List<Interval> intervals) {
this.intervals = intervals;
}

/** @return Time the schedule was created */
/**
* @return Time the schedule was created
*/
@JsonProperty("created_at")
public Date getCreatedAt() {
return createdAt;
Expand All @@ -67,7 +75,9 @@ public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}

/** @return Time the schedule was last updated */
/**
* @return Time the schedule was last updated
*/
@JsonProperty("updated_at")
public Date getUpdatedAt() {
return updatedAt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.fasterxml.jackson.annotation.JsonProperty;

/** @author adavidson */
/**
* @author adavidson
*/
public class BasecampTarget extends Target {
private String targetUrl;
private String token;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.fasterxml.jackson.annotation.JsonProperty;

/** @author adavidson */
/**
* @author adavidson
*/
public class CampfireTarget extends Target {
private String subdomain;
private boolean ssl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.zendesk.client.v2.model.targets;

/** @author adavidson */
/**
* @author adavidson
*/
public class EmailTarget extends Target {
private String email;
private String subject;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.fasterxml.jackson.annotation.JsonProperty;

/** @author adavidson */
/**
* @author adavidson
*/
public class PivotalTarget extends Target {
private String token;
private String projectId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.zendesk.client.v2.model.targets;

/** @author adavidson */
/**
* @author adavidson
*/
public class TwitterTarget extends Target {
private String token;
private String secret;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.fasterxml.jackson.annotation.JsonProperty;

/** @author adavidson */
/**
* @author adavidson
*/
public class UrlTarget extends Target {
private String targetUrl;
private String method;
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/zendesk/client/v2/junit/UTCRule.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;

/** @author Johno Crawford ([email protected]) */
/**
* @author Johno Crawford ([email protected])
*/
public class UTCRule extends TestWatcher {

private DateTimeZone originalDefault = DateTimeZone.getDefault();
Expand Down
Loading