Skip to content

Commit 37bca93

Browse files
pengradpengrad
committed
Remove deprecated methods of AddStickerToSet, CreateNewStickerSet, UploadStickerFile
1 parent 977a08f commit 37bca93

File tree

7 files changed

+36
-170
lines changed

7 files changed

+36
-170
lines changed

‎library/src/main/java/com/pengrad/telegrambot/model/StickerSet.java

+5-16
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public class StickerSet implements Serializable {
1616
private String name;
1717
private String title;
1818
private Type sticker_type;
19-
private Boolean is_animated;
20-
private Boolean is_video;
2119
private Boolean contains_masks;
2220
private Sticker[] stickers;
2321
private PhotoSize thumbnail;
@@ -40,7 +38,7 @@ public Type stickerType() {
4038
*/
4139
@Deprecated
4240
public Boolean isAnimated() {
43-
return is_animated;
41+
return false;
4442
}
4543

4644
/**
@@ -72,27 +70,20 @@ public PhotoSize thumb() {
7270
*/
7371
@Deprecated
7472
public Boolean isVideo() {
75-
return is_video;
73+
return false;
7674
}
7775

7876
@Override
7977
public boolean equals(Object o) {
8078
if (this == o) return true;
8179
if (o == null || getClass() != o.getClass()) return false;
8280
StickerSet that = (StickerSet) o;
83-
return Objects.equals(name, that.name) &&
84-
Objects.equals(title, that.title) &&
85-
Objects.equals(sticker_type, that.sticker_type) &&
86-
Objects.equals(is_animated, that.is_animated) &&
87-
Objects.equals(is_video, that.is_video) &&
88-
Objects.equals(contains_masks, that.contains_masks) &&
89-
Arrays.equals(stickers, that.stickers) &&
90-
Objects.equals(thumbnail, that.thumbnail);
81+
return Objects.equals(name, that.name) && Objects.equals(title, that.title) && sticker_type == that.sticker_type && Objects.equals(contains_masks, that.contains_masks) && Arrays.equals(stickers, that.stickers) && Objects.equals(thumbnail, that.thumbnail);
9182
}
9283

9384
@Override
9485
public int hashCode() {
95-
int result = Objects.hash(name, title, sticker_type, is_animated, is_video, thumbnail);
86+
int result = Objects.hash(name, title, sticker_type, contains_masks, thumbnail);
9687
result = 31 * result + Arrays.hashCode(stickers);
9788
return result;
9889
}
@@ -102,9 +93,7 @@ public String toString() {
10293
return "StickerSet{" +
10394
"name='" + name + '\'' +
10495
", title='" + title + '\'' +
105-
", sticker_type='" + sticker_type + '\'' +
106-
", is_animated=" + is_animated +
107-
", is_video=" + is_video +
96+
", sticker_type=" + sticker_type +
10897
", contains_masks=" + contains_masks +
10998
", stickers=" + Arrays.toString(stickers) +
11099
", thumbnail=" + thumbnail +

‎library/src/main/java/com/pengrad/telegrambot/model/request/InputSticker.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.pengrad.telegrambot.model.request;
22

3-
import com.google.gson.annotations.SerializedName;
43
import com.pengrad.telegrambot.AttachName;
54
import com.pengrad.telegrambot.model.MaskPosition;
65
import com.pengrad.telegrambot.model.Sticker;
@@ -21,7 +20,8 @@ public class InputSticker implements Serializable {
2120
transient private String attachName;
2221
transient private Object attach;
2322

24-
public InputSticker(Object sticker, String[] emojiList) {
23+
public InputSticker(Object sticker, Sticker.Format format, String[] emojiList) {
24+
this.format = format;
2525
this.emoji_list = emojiList;
2626
if (sticker instanceof String) {
2727
this.sticker = (String) sticker;

‎library/src/main/java/com/pengrad/telegrambot/request/AddStickerToSet.java

+4-43
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,6 @@
1010
*/
1111
public class AddStickerToSet extends AbstractUploadRequest<AddStickerToSet, BaseResponse> {
1212

13-
/**
14-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
15-
*/
16-
@Deprecated
17-
public static AddStickerToSet tgsSticker(Long userId, String name, String emojis, Object tgsSticker) {
18-
return new AddStickerToSet(userId, name, emojis, "tgs_sticker", tgsSticker);
19-
}
20-
21-
/**
22-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
23-
*/
24-
@Deprecated
25-
public static AddStickerToSet pngSticker(Long userId, String name, String emojis, Object pngSticker) {
26-
return new AddStickerToSet(userId, name, emojis, "png_sticker", pngSticker);
27-
}
28-
29-
/**
30-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
31-
*/
32-
@Deprecated
33-
public static AddStickerToSet webmSticker(Long userId, String name, String emojis, Object webmSticker) {
34-
return new AddStickerToSet(userId, name, emojis, "webm_sticker", webmSticker);
35-
}
36-
37-
/**
38-
* @deprecated Use static methods according to sticker set type - {@link #pngSticker(Long, String, String, Object) for png}, {@link #tgsSticker(Long, String, String, Object) for tgs} and {@link #webmSticker(Long, String, String, Object) for webm}
39-
*/
40-
@Deprecated
41-
public AddStickerToSet(Long userId, String name, Object pngSticker, String emojis) {
42-
this(userId, name, emojis, "png_sticker", pngSticker);
43-
}
44-
45-
/**
46-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
47-
*/
48-
@Deprecated
49-
private AddStickerToSet(Long userId, String name, String emojis, String stickerParam, Object sticker) {
50-
super(BaseResponse.class, stickerParam, sticker);
51-
add("user_id", userId);
52-
add("name", name);
53-
add("emojis", emojis);
54-
}
55-
5613
public AddStickerToSet(Long userId, String name, InputSticker sticker) {
5714
super(BaseResponse.class, attachName(sticker), attachment(sticker));
5815
add("user_id", userId);
@@ -68,6 +25,10 @@ private static Object attachment(InputSticker sticker) {
6825
return sticker.getAttachment() != null ? sticker.getAttachment() : "sticker_id";
6926
}
7027

28+
/**
29+
* @deprecated Use maskPosition on InputSticker (since API v6.6)
30+
*/
31+
@Deprecated
7132
public AddStickerToSet maskPosition(MaskPosition maskPosition) {
7233
return add("mask_position", maskPosition);
7334
}

‎library/src/main/java/com/pengrad/telegrambot/request/CreateNewStickerSet.java

+1-72
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,6 @@
1212
*/
1313
public class CreateNewStickerSet extends BaseRequest<CreateNewStickerSet, BaseResponse> {
1414

15-
/**
16-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
17-
*/
18-
@Deprecated
19-
public static CreateNewStickerSet tgsSticker(Long userId, String name, String title, String emojis, Object tgsSticker) {
20-
return new CreateNewStickerSet(userId, name, title, emojis, "tgs_sticker", tgsSticker);
21-
}
22-
23-
/**
24-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
25-
*/
26-
@Deprecated
27-
public static CreateNewStickerSet pngSticker(Long userId, String name, String title, String emojis, Object pngSticker) {
28-
return new CreateNewStickerSet(userId, name, title, emojis, "png_sticker", pngSticker);
29-
}
30-
31-
/**
32-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
33-
*/
34-
@Deprecated
35-
public static CreateNewStickerSet webmSticker(Long userId, String name, String title, String emojis, Object webmSticker) {
36-
return new CreateNewStickerSet(userId, name, title, emojis, "webm_sticker", webmSticker);
37-
}
38-
39-
/**
40-
* @deprecated Use static methods according to sticker set type - {@link #pngSticker(Long, String, String, String, Object) for png}, {@link #tgsSticker(Long, String, String, String, Object) for tgs} and {@link #webmSticker(Long, String, String, String, Object) for webm}
41-
*/
42-
@Deprecated
43-
public CreateNewStickerSet(Long userId, String name, String title, Object pngSticker, String emojis) {
44-
this(userId, name, title, emojis, "png_sticker", pngSticker);
45-
}
46-
47-
/**
48-
* @deprecated Use constructor with the InputSticker type (since API v6.6)
49-
*/
50-
@Deprecated
51-
private CreateNewStickerSet(Long userId, String name, String title, String emojis, String stickerParam, Object sticker) {
52-
super(BaseResponse.class);
53-
add(stickerParam, sticker);
54-
add("user_id", userId);
55-
add("name", name);
56-
add("title", title);
57-
add("emojis", emojis);
58-
}
59-
6015
public CreateNewStickerSet(Long userId, String name, String title, InputSticker[] stickers) {
6116
super(BaseResponse.class);
6217
add("user_id", userId);
@@ -75,40 +30,14 @@ public CreateNewStickerSet(Long userId, String name, String title, InputSticker[
7530
*/
7631
@Deprecated
7732
public CreateNewStickerSet(Long userId, String name, String title, InputSticker[] stickers, Format stickerFormat) {
78-
super(BaseResponse.class);
79-
add("user_id", userId);
80-
add("name", name);
81-
add("title", title);
82-
add("stickers", stickers);
83-
add("sticker_format", stickerFormat.name().toLowerCase());
84-
for (InputSticker sticker : stickers) {
85-
if (sticker.getAttachment() != null) {
86-
add(sticker.getAttachName(), sticker.getAttachment());
87-
}
88-
}
33+
this(userId, name, title, stickers);
8934
}
9035

9136
@Override
9237
public boolean isMultipart() {
9338
return true;
9439
}
9540

96-
/**
97-
* @deprecated Use stickerType(Type.mask) instead
98-
*/
99-
@Deprecated
100-
public CreateNewStickerSet containsMasks(boolean containsMasks) {
101-
return add("contains_masks", containsMasks);
102-
}
103-
104-
/**
105-
* @deprecated Invalid when the new constructor with InputSticker type is used (since API v6.6)
106-
*/
107-
@Deprecated
108-
public CreateNewStickerSet maskPosition(MaskPosition maskPosition) {
109-
return add("mask_position", maskPosition);
110-
}
111-
11241

11342
/**
11443
* Type of stickers in the set.

‎library/src/main/java/com/pengrad/telegrambot/request/UploadStickerFile.java

-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
*/
1010
public class UploadStickerFile extends AbstractUploadRequest<UploadStickerFile, GetFileResponse> {
1111

12-
/**
13-
* @deprecated Use constructor with the InputFile type (since API v6.6)
14-
*/
15-
@Deprecated
16-
public UploadStickerFile(Long userId, Object pngSticker) {
17-
super(GetFileResponse.class, "png_sticker", pngSticker);
18-
add("user_id", userId);
19-
}
20-
2112
/**
2213
* @param stickerFormat must be one of “static”, “animated”, “video”.
2314
*/

‎library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

+23-27
Original file line numberDiff line numberDiff line change
@@ -1374,60 +1374,56 @@ public void getStickerSet() {
13741374
@Test
13751375
public void uploadStickerFile() throws IOException {
13761376
byte[] bytes = Files.readAllBytes(stickerFile.toPath());
1377-
GetFileResponse response = bot.execute(new UploadStickerFile(chatId, bytes));
1377+
GetFileResponse response = bot.execute(new UploadStickerFile(chatId, bytes, Sticker.Format.Static));
13781378
FileTest.check(response.file(), false);
13791379

13801380
response = bot.execute(new UploadStickerFile(chatId, bytes, Sticker.Format.Static));
13811381
FileTest.check(response.file(), false);
13821382
}
13831383

13841384
@Test
1385-
public void createNewPngStickerSet() {
1385+
public void createNewPngStickerSetAndAddSticker() {
13861386
String name = "test" + System.currentTimeMillis() + "_by_pengrad_test_bot";
1387+
String[] emojis = new String[]{"\uD83D\uDE00"};
1388+
InputSticker[] stickers = new InputSticker[]{new InputSticker(stickerFile, Sticker.Format.Static, emojis)};
13871389
BaseResponse response = bot.execute(
1388-
CreateNewStickerSet.pngSticker(chatId, name, "test1", "\uD83D\uDE00", stickerFile)
1389-
.stickerType(Sticker.Type.mask)
1390-
.maskPosition(new MaskPosition(MaskPosition.Point.forehead, 0f, 0f, 1f)));
1390+
new CreateNewStickerSet(chatId, name, "test1", stickers)
1391+
.stickerType(Sticker.Type.mask));
13911392
assertTrue(response.isOk());
13921393

13931394
response = bot.execute(new AddStickerToSet(chatId, name,
1394-
new InputSticker(stickerId, new String[]{"\uD83D\uDE00"}))
1395-
.maskPosition(new MaskPosition("eyes", 0f, 0f, 1f)));
1395+
new InputSticker(stickerId, Sticker.Format.Static, emojis)
1396+
.maskPosition(new MaskPosition("eyes", 0f, 0f, 1f))));
13961397
assertTrue(response.isOk());
13971398
}
13981399

13991400
@Test
14001401
public void createNewWebmStickerSetAndAddSticker() {
14011402
String setName = "test" + System.currentTimeMillis() + "_by_pengrad_test_bot";
1403+
String[] emojis = new String[]{"\uD83D\uDE00"};
1404+
InputSticker[] stickers = new InputSticker[]{new InputSticker(stickerFileVid, Sticker.Format.video, emojis)};
14021405
BaseResponse response = bot.execute(
1403-
CreateNewStickerSet.webmSticker(chatId, setName,
1404-
"test1", "\uD83D\uDE00", stickerFileVid)
1405-
.stickerType(Sticker.Type.mask)
1406-
.maskPosition(new MaskPosition(MaskPosition.Point.forehead, 0f, 0f, 1f)));
1407-
assertTrue(response.isOk());
1408-
1409-
response = bot.execute(
1410-
AddStickerToSet.webmSticker(chatId, setName, "\uD83D\uDE15", stickerFileVid));
1406+
new CreateNewStickerSet(chatId, setName, "test1", stickers)
1407+
.stickerType(Sticker.Type.regular)
1408+
);
14111409
assertTrue(response.isOk());
14121410
}
14131411

14141412
@Test
14151413
public void addStickerToSet() {
14161414
BaseResponse response = bot.execute(
1417-
AddStickerToSet.pngSticker(chatId, stickerSet, "\uD83D\uDE15", "BQADAgADuAAD7yupS4eB23UmZhGuAg")
1418-
.maskPosition(new MaskPosition("eyes", 0f, 0f, 1f)));
1415+
new AddStickerToSet(chatId, stickerSet,
1416+
new InputSticker("BQADAgADuAAD7yupS4eB23UmZhGuAg", Sticker.Format.Static, new String[]{"\uD83D\uDE15"})
1417+
.maskPosition(new MaskPosition("eyes", 0f, 0f, 1f))));
14191418
assertTrue(response.isOk());
14201419
}
14211420

14221421
@Test
14231422
public void createSetAndAddStickerTgs() {
14241423
String setName = "test" + System.currentTimeMillis() + "_by_pengrad_test_bot";
1424+
InputSticker[] stickers = new InputSticker[]{new InputSticker(stickerFileAnim, Sticker.Format.animated, new String[]{"\uD83D\uDE00"})};
14251425
BaseResponse response = bot.execute(
1426-
CreateNewStickerSet.tgsSticker(chatId, setName, "test1", "\uD83D\uDE00", stickerFileAnim));
1427-
assertTrue(response.isOk());
1428-
1429-
response = bot.execute(
1430-
AddStickerToSet.tgsSticker(chatId, setName, "\uD83D\uDE15", stickerFileAnim));
1426+
new CreateNewStickerSet(chatId, setName, "test1", stickers));
14311427
assertTrue(response.isOk());
14321428
}
14331429

@@ -1437,11 +1433,10 @@ public void createNewStickerSet() {
14371433
String title = "test112312312";
14381434
BaseResponse response = bot.execute(
14391435
new CreateNewStickerSet(chatId, setName, title, new InputSticker[]{
1440-
new InputSticker(stickerFile, new String[]{"\uD83D\uDE00"})
1436+
new InputSticker(stickerFile, Sticker.Format.Static, new String[]{"\uD83D\uDE00"})
14411437
.keywords(new String[]{"yes", "no"})
14421438
.maskPosition(new MaskPosition(MaskPosition.Point.forehead, 10f, 20f, 1f))
14431439
}, Sticker.Format.Static)
1444-
.containsMasks(false)
14451440
.needsRepainting(false));
14461441
assertTrue(response.isOk());
14471442

@@ -1487,7 +1482,8 @@ public void setStickerPositionInSet() {
14871482

14881483
@Test
14891484
public void deleteStickerFromSet() {
1490-
BaseResponse response = bot.execute(AddStickerToSet.pngSticker(chatId, stickerSet, "\uD83D\uDE15", stickerFile));
1485+
InputSticker inputSticker = new InputSticker("BQADAgADuAAD7yupS4eB23UmZhGuAg", Sticker.Format.Static, new String[]{"\uD83D\uDE15"});
1486+
BaseResponse response = bot.execute(new AddStickerToSet(chatId, stickerSet, inputSticker));
14911487
assertTrue(response.isOk());
14921488

14931489
GetStickerSetResponse setResponse = bot.execute(new GetStickerSet(stickerSet));
@@ -1511,7 +1507,7 @@ public void setStickerSetThumb() {
15111507
assertTrue(response.isOk());
15121508

15131509
StickerSet set = bot.execute(new GetStickerSet(stickerSetAnim)).stickerSet();
1514-
assertTrue(set.isAnimated());
1510+
assertFalse(set.isAnimated());
15151511
PhotoSize thumb = set.thumb();
15161512
PhotoSizeTest.checkPhotos(thumb);
15171513
assertEquals(Integer.valueOf(100), thumb.width());
@@ -1538,7 +1534,7 @@ public void setCustomEmojiStickerSetThumbnail() {
15381534
String setName = "custom_emoji_set_by_pengrad_test_bot";
15391535
BaseResponse response = bot.execute(
15401536
new CreateNewStickerSet(chatId, setName, "title",
1541-
new InputSticker[]{new InputSticker(stickerFileAnim, new String[]{"\uD83D\uDE15"})},
1537+
new InputSticker[]{new InputSticker(stickerFileAnim, Sticker.Format.animated, new String[]{"\uD83D\uDE15"})},
15421538
Sticker.Format.animated
15431539
).stickerType(Sticker.Type.custom_emoji)
15441540
);

‎library/src/test/java/com/pengrad/telegrambot/checks/MessageTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void checkTextMessage(Message message) {
3535
assertNull(message.messageThreadId());
3636
assertFalse(message.isTopicMessage());
3737
assertNull(message.isAutomaticForward());
38-
assertNull(message.hasMediaSpoiler());
38+
assertFalse(message.hasMediaSpoiler());
3939
assertNull(message.messageAutoDeleteTimerChanged());
4040
assertNull(message.chatShared());
4141
assertNull(message.proximityAlertTriggered());

0 commit comments

Comments
 (0)