diff --git a/src/main/lombok/com/restfb/types/send/QuickReply.java b/src/main/lombok/com/restfb/types/send/QuickReply.java index 14dca8e73..c14b05303 100644 --- a/src/main/lombok/com/restfb/types/send/QuickReply.java +++ b/src/main/lombok/com/restfb/types/send/QuickReply.java @@ -67,24 +67,12 @@ public QuickReply(String title, String payload) { this.payload = payload; } - /** - * @deprecated use {@link QuickReply#QuickReply(QuickReplyType)} with {@link QuickReplyType#LOCATION} as parameter instead - */ - @Deprecated - public QuickReply() { - this(QuickReplyType.LOCATION); - } - public QuickReply(QuickReplyType quickReplyType) { this.contentType = quickReplyType.getContentType(); } public enum QuickReplyType { - USER_EMAIL, USER_PHONE_NUMBER, - /** - * @TODO: remove after October 29th, 2019 - */ - @Deprecated LOCATION; + USER_EMAIL, USER_PHONE_NUMBER; public String getContentType() { return name().toLowerCase(); diff --git a/src/test/java/com/restfb/types/SendApiTest.java b/src/test/java/com/restfb/types/SendApiTest.java index 2eafdcacf..76ecfb598 100644 --- a/src/test/java/com/restfb/types/SendApiTest.java +++ b/src/test/java/com/restfb/types/SendApiTest.java @@ -558,17 +558,12 @@ void messageWithQuickRepliesAndMetadata() { QuickReply quickReply1 = new QuickReply("title 1", "payload 1"); QuickReply quickReply2 = new QuickReply("title 2", "payload 2"); quickReply2.setImageUrl("http://example.org/test.jpg"); - QuickReply quickReply3 = new QuickReply(QuickReply.QuickReplyType.LOCATION); - QuickReply quickReply4 = new QuickReply(QuickReply.QuickReplyType.LOCATION); - quickReply4.setImageUrl("http://example.org/test2.jpg"); QuickReply quickReply5 = new QuickReply(QuickReply.QuickReplyType.USER_EMAIL); QuickReply quickReply6 = new QuickReply(QuickReply.QuickReplyType.USER_PHONE_NUMBER); Message message = new Message("message text"); message.setMetadata("metadata payload"); message.addQuickReply(quickReply1); message.addQuickReply(quickReply2); - message.addQuickReply(quickReply3); - message.addQuickReply(quickReply4); message.addQuickReply(quickReply5); message.addQuickReply(quickReply6); @@ -576,7 +571,7 @@ void messageWithQuickRepliesAndMetadata() { String messageJsonString = mapper.toJson(message, true); AssertJson.assertEquals( - "{\"text\":\"message text\",\"quick_replies\":[{\"content_type\":\"text\",\"title\":\"title 1\",\"payload\":\"payload 1\"},{\"content_type\":\"text\",\"title\":\"title 2\",\"payload\":\"payload 2\",\"image_url\":\"http://example.org/test.jpg\"},{\"content_type\":\"location\"},{\"content_type\":\"location\",\"image_url\":\"http://example.org/test2.jpg\"},{\"content_type\":\"user_email\"},{\"content_type\":\"user_phone_number\"}],\"metadata\":\"metadata payload\"}", + "{\"text\":\"message text\",\"quick_replies\":[{\"content_type\":\"text\",\"title\":\"title 1\",\"payload\":\"payload 1\"},{\"content_type\":\"text\",\"title\":\"title 2\",\"payload\":\"payload 2\",\"image_url\":\"http://example.org/test.jpg\"},{\"content_type\":\"user_email\"},{\"content_type\":\"user_phone_number\"}],\"metadata\":\"metadata payload\"}", messageJsonString); }