Skip to content

Commit

Permalink
feat(trackings): remove TrackingResponse for API version 2016-06-30
Browse files Browse the repository at this point in the history
  • Loading branch information
Pallavi Shankar committed Jul 8, 2016
1 parent ead27ad commit d06610a
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 37 deletions.
28 changes: 22 additions & 6 deletions src/main/java/com/lob/protocol/response/CheckResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ public class CheckResponse extends AbstractLobResponse {
@JsonProperty private final BankAccountResponse bankAccount;
@JsonProperty private final String message;
@JsonProperty private final String url;
@JsonProperty private final TrackingResponse tracking;
@JsonProperty private final String carrier;
@JsonProperty private final String trackingNumber;
@JsonProperty private final List<TrackingEventResponse> trackingEvents;
@JsonProperty private final DateTime expectedDeliveryDate;
@JsonProperty private final List<ThumbnailResponse> thumbnails;

Expand All @@ -36,7 +38,9 @@ public CheckResponse(
@JsonProperty("bank_account") final BankAccountResponse bankAccount,
@JsonProperty("message") final String message,
@JsonProperty("url") final String url,
@JsonProperty("tracking") final TrackingResponse tracking,
@JsonProperty("carrier") final String carrier,
@JsonProperty("tracking_number") final String trackingNumber,
@JsonProperty("tracking_events") final List<TrackingEventResponse> trackingEvents,
@JsonProperty("description") final String description,
@JsonProperty("date_created") final DateTime dateCreated,
@JsonProperty("date_modified") final DateTime dateModified,
Expand All @@ -54,7 +58,9 @@ public CheckResponse(
this.bankAccount = bankAccount;
this.message = message;
this.url = url;
this.tracking = tracking;
this.carrier = carrier;
this.trackingNumber = trackingNumber;
this.trackingEvents = trackingEvents;
this.expectedDeliveryDate = expectedDeliveryDate;
this.thumbnails = thumbnails;
}
Expand Down Expand Up @@ -95,8 +101,16 @@ public String getUrl() {
return url;
}

public TrackingResponse getTracking() {
return tracking;
public String getCarrier() {
return carrier;
}

public String getTrackingNumber() {
return trackingNumber;
}

public List<TrackingEventResponse> getTrackingEvents() {
return defensiveCopy(this.trackingEvents);
}

public DateTime getExpectedDeliveryDate() {
Expand All @@ -119,7 +133,9 @@ public String toString() {
", bankAccount=" + bankAccount +
", message='" + message + '\'' +
", url='" + url + '\'' +
", tracking=" + tracking +
", carrier='" + carrier + '\'' +
", trackingNumber='" + trackingNumber + '\'' +
", trackingEvents='" + trackingEvents + '\'' +
", expectedDeliveryDate=" + expectedDeliveryDate +
", thumbnails=" + thumbnails +
super.toString();
Expand Down
26 changes: 20 additions & 6 deletions src/main/java/com/lob/protocol/response/LetterResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.util.List;
import java.util.Map;

import static com.lob.Util.defensiveCopy;

public class LetterResponse extends AbstractLobResponse {
@JsonProperty private final LetterId id;
@JsonProperty private final AddressResponse to;
Expand All @@ -24,7 +26,9 @@ public class LetterResponse extends AbstractLobResponse {
@JsonProperty private final String url;
@JsonProperty private final DateTime expectedDeliveryDate;
@JsonProperty private final List<ThumbnailResponse> thumbnails;
@JsonProperty private final TrackingResponse tracking;
@JsonProperty private final String carrier;
@JsonProperty private final String trackingNumber;
@JsonProperty private final List<TrackingEventResponse> trackingEvents;

@JsonCreator
public LetterResponse(
Expand All @@ -42,7 +46,9 @@ public LetterResponse(
@JsonProperty("url") final String url,
@JsonProperty("expected_delivery_date") final DateTime expectedDeliveryDate,
@JsonProperty("thumbnails") final List<ThumbnailResponse> thumbnails,
@JsonProperty("tracking") final TrackingResponse tracking,
@JsonProperty("carrier") final String carrier,
@JsonProperty("tracking_number") final String trackingNumber,
@JsonProperty("tracking_events") final List<TrackingEventResponse> trackingEvents,
@JsonProperty("description") final String description,
@JsonProperty("date_created") final DateTime dateCreated,
@JsonProperty("date_modified") final DateTime dateModified,
Expand All @@ -63,7 +69,9 @@ public LetterResponse(
this.url = url;
this.expectedDeliveryDate = expectedDeliveryDate;
this.thumbnails = thumbnails;
this.tracking = tracking;
this.carrier = carrier;
this.trackingNumber = trackingNumber;
this.trackingEvents = trackingEvents;
}

public LetterId getId() { return id; }
Expand Down Expand Up @@ -94,9 +102,13 @@ public LetterResponse(

public DateTime getExpectedDeliveryDate() { return expectedDeliveryDate; }

public List<ThumbnailResponse> getThumbnails() { return thumbnails; }
public List<ThumbnailResponse> getThumbnails() { return defensiveCopy(this.thumbnails); }

public String getCarrier() { return carrier; }

public String getTrackingNumber() { return trackingNumber; }

public TrackingResponse getTracking() { return tracking; }
public List<TrackingEventResponse> getTrackingEvents() { return defensiveCopy(this.trackingEvents); }

@Override
public String toString() {
Expand All @@ -115,7 +127,9 @@ public String toString() {
", url='" + url + "'" +
", expectedDeliveryDate='" + expectedDeliveryDate + "'" +
", thumbnails='" + thumbnails + "'" +
", tracking='" + tracking + "'" +
", carrier='" + carrier + "'" +
", trackingNumber='" + trackingNumber + "'" +
", trackingEvents='" + trackingEvents + "'" +
super.toString();

}
Expand Down
24 changes: 17 additions & 7 deletions src/main/java/com/lob/protocol/response/PostcardResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.List;
import java.util.Map;

import static com.lob.Util.defensiveCopy;

public class PostcardResponse extends AbstractLobResponse {
@JsonProperty private final PostcardId id;
@JsonProperty private final String message;
Expand All @@ -20,7 +22,8 @@ public class PostcardResponse extends AbstractLobResponse {
@JsonProperty private final String url;
@JsonProperty private final DateTime expectedDeliveryDate;
@JsonProperty private final List<ThumbnailResponse> thumbnails;
@JsonProperty private final TrackingResponse tracking;
@JsonProperty private final String carrier;
@JsonProperty private final List<TrackingEventResponse> trackingEvents;

@JsonCreator
public PostcardResponse(
Expand All @@ -33,7 +36,8 @@ public PostcardResponse(
@JsonProperty("url") final String url,
@JsonProperty("expected_delivery_date") final DateTime expectedDeliveryDate,
@JsonProperty("thumbnails") final List<ThumbnailResponse> thumbnails,
@JsonProperty("tracking") final TrackingResponse tracking,
@JsonProperty("carrier") final String carrier,
@JsonProperty("tracking_events") final List<TrackingEventResponse> trackingEvents,
@JsonProperty("description") final String description,
@JsonProperty("date_created") final DateTime dateCreated,
@JsonProperty("date_modified") final DateTime dateModified,
Expand All @@ -49,7 +53,8 @@ public PostcardResponse(
this.url = url;
this.expectedDeliveryDate = expectedDeliveryDate;
this.thumbnails = thumbnails;
this.tracking = tracking;
this.carrier = carrier;
this.trackingEvents = trackingEvents;
}

public PostcardId getId() {
Expand Down Expand Up @@ -86,11 +91,15 @@ public DateTime getExpectedDeliveryDate() {
}

public List<ThumbnailResponse> getThumbnails() {
return thumbnails;
return defensiveCopy(this.thumbnails);
}

public String getCarrier() {
return carrier;
}

public TrackingResponse getTracking() {
return tracking;
public List<TrackingEventResponse> getTrackingEvents() {
return defensiveCopy(this.trackingEvents);
}

@Override
Expand All @@ -105,7 +114,8 @@ public String toString() {
", url='" + url + '\'' +
", expectedDeliveryDate='" + expectedDeliveryDate + '\'' +
", thumbnails='" + thumbnails + '\'' +
", tracking='" + tracking + '\'' +
", carrier='" + carrier + '\'' +
", trackingEvents='" + trackingEvents + '\'' +
super.toString();
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/lob/protocol/response/TrackingEventResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ public String toString() {
", object='" + object + '\'' +
'}';
}
}
}
8 changes: 4 additions & 4 deletions src/main/java/com/lob/protocol/response/TrackingResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
public class TrackingResponse {
@JsonProperty("id") private final TrackingId id;
@JsonProperty("tracking_number") private final String trackingNumber;
@JsonProperty("carrier") private final String carrier;
@JsonProperty("events") private final List<TrackingEventResponse> events;
@JsonProperty("object") private final String object;
@JsonProperty("carrier") private final String carrier;
@JsonProperty("events") private final List<TrackingEventResponse> events;
@JsonProperty("object") private final String object;

@JsonCreator
public TrackingResponse(
Expand Down Expand Up @@ -57,4 +57,4 @@ public String toString() {
", object='" + object + '\'' +
'}';
}
}
}
9 changes: 3 additions & 6 deletions src/test/java/com/lob/client/test/CheckTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,9 @@ public void testListChecks() throws Exception {
final CheckResponse response = responseList.get(0);

assertTrue(response instanceof CheckResponse);
assertNotNull(response.getTracking().toString());
assertNotNull(response.getTracking().getEvents());
assertNotNull(response.getTracking().getId());
assertNull(response.getTracking().getTrackingNumber());
assertNotNull(response.getTracking().getCarrier());
assertThat(response.getTracking().getObject(), is("tracking"));
assertNotNull(response.getTrackingEvents());
assertNull(response.getTrackingNumber());
assertNotNull(response.getCarrier());
assertThat(responseList.getObject(), is("list"));
assertNotNull(responseList.toString());
assertNotNull(response.toString());
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/com/lob/client/test/JobTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ public void testListJobs() throws Exception {
assertNotNull(responseList.toString());
assertNotNull(response.toString());
assertNotNull(response.getTracking());
assertNotNull(response.getTracking().getEvents());
assertNotNull(response.getTracking().getId());
assertNull(response.getTracking().getTrackingNumber());
assertNotNull(response.getTracking().getCarrier());
assertThat(response.getTracking().getObject(), is("tracking"));
}

@Test
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/lob/client/test/LetterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ public void testCreateLetter() throws Exception {
assertFalse(response.isReturnEnvelope());
assertNull(response.getPerforatedPage());
assertEquals(response.getThumbnails().size(), 1);
assertNotNull(response.getTracking());
assertNotNull(response.getTrackingEvents());
assertNull(response.getTrackingNumber());
assertNotNull(response.getCarrier());
assertThat(response.getPages(), is(0));
assertTrue(response.getId() instanceof LetterId);
assertNull(response.getPrice());
Expand Down
9 changes: 3 additions & 6 deletions src/test/java/com/lob/client/test/PostcardTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,11 @@ public void testCreatePostcardLocalFile() throws Exception {
@Test
public void testTrackingEvents() throws Exception {
final PostcardResponse response = client.getPostcard(PostcardId.parse("psc_d1f8830b03cde4ef")).get();
final TrackingResponse trackings = response.getTracking();

assertEquals(trackings.getId().toString(), "trk_b4bb17e6d0e5c3d4");
assertNull(trackings.getTrackingNumber());
assertEquals(trackings.getCarrier(), "USPS");
assertEquals(trackings.getEvents().size(), 1);
assertEquals(response.getCarrier(), "USPS");
assertEquals(response.getTrackingEvents().size(), 1);

final TrackingEventResponse event = trackings.getEvents().get(0);
final TrackingEventResponse event = response.getTrackingEvents().get(0);

assertEquals(event.getName(), "Scanned");
assertEquals(event.getLocation(), "14692");
Expand Down

0 comments on commit d06610a

Please sign in to comment.