From db9ae4f586988434ee7d94ab8ce6db26e8f30087 Mon Sep 17 00:00:00 2001 From: chmilevfa Date: Sun, 8 Jul 2018 01:41:21 +0200 Subject: [PATCH] telegrambots-meta java 9 supported --- README.md | 2 +- TelegramBots.wiki/Errors-Handling.md | 4 +- TelegramBots.wiki/abilities/Bot-Testing.md | 2 +- .../abilitybots/api/bot/AbilityBot.java | 14 ++-- .../abilitybots/api/db/DBContext.java | 2 +- .../abilitybots/api/db/MapDBContext.java | 2 +- .../abilitybots/api/objects/Ability.java | 4 +- .../abilitybots/api/objects/EndUser.java | 2 +- .../abilitybots/api/objects/Flag.java | 2 +- .../api/objects/MessageContext.java | 2 +- .../abilitybots/api/objects/Reply.java | 2 +- .../abilitybots/api/sender/DefaultSender.java | 26 +++---- .../abilitybots/api/sender/MessageSender.java | 26 +++---- .../abilitybots/api/sender/SilentSender.java | 12 ++-- .../abilitybots/api/util/AbilityUtils.java | 4 +- .../abilitybots/api/bot/AbilityBotTest.java | 14 ++-- .../api/sender/SilentSenderTest.java | 2 +- .../TelegramLongPollingCommandBot.java | 8 +-- .../bots/commandbot/commands/BotCommand.java | 8 +-- .../commandbot/commands/CommandRegistry.java | 4 +- .../commands/DefaultBotCommand.java | 8 +-- .../bots/commandbot/commands/IBotCommand.java | 4 +- .../commandbot/commands/ICommandRegistry.java | 4 +- .../commands/helpCommand/HelpCommand.java | 10 +-- .../objects/replykeyboard/ReplyKeyboard.java | 13 ---- .../telegrambots/{ => meta}/ApiConstants.java | 2 +- .../telegrambots/{ => meta}/ApiContext.java | 4 +- .../{ => meta}/TelegramBotsApi.java | 12 ++-- .../api/interfaces/BotApiObject.java | 2 +- .../api/interfaces/InputBotApiObject.java | 2 +- .../{ => meta}/api/interfaces/Validable.java | 4 +- .../{ => meta}/api/methods/ActionType.java | 2 +- .../api/methods/AnswerCallbackQuery.java | 8 +-- .../api/methods/AnswerInlineQuery.java | 10 +-- .../api/methods/AnswerPreCheckoutQuery.java | 8 +-- .../api/methods/AnswerShippingQuery.java | 10 +-- .../{ => meta}/api/methods/BotApiMethod.java | 2 +- .../api/methods/ForwardMessage.java | 10 +-- .../{ => meta}/api/methods/GetFile.java | 10 +-- .../{ => meta}/api/methods/GetMe.java | 10 +-- .../api/methods/GetUserProfilePhotos.java | 10 +-- .../{ => meta}/api/methods/ParseMode.java | 2 +- .../api/methods/PartialBotApiMethod.java | 6 +- .../api/methods/StopMessageLiveLocation.java | 13 ++-- .../api/methods/games/GetGameHighScores.java | 13 ++-- .../api/methods/games/SetGameScore.java | 13 ++-- .../groupadministration/DeleteChatPhoto.java | 10 +-- .../DeleteStickerSetName.java | 10 +-- .../ExportChatInviteLink.java | 10 +-- .../methods/groupadministration/GetChat.java | 12 ++-- .../GetChatAdministrators.java | 12 ++-- .../groupadministration/GetChatMember.java | 12 ++-- .../GetChatMemberCount.java | 10 +-- .../groupadministration/KickChatMember.java | 10 +-- .../groupadministration/LeaveChat.java | 10 +-- .../PromoteChatMember.java | 10 +-- .../RestrictChatMember.java | 10 +-- .../SetChatDescription.java | 10 +-- .../groupadministration/SetChatPhoto.java | 10 +-- .../SetChatStickerSet.java | 10 +-- .../groupadministration/SetChatTitle.java | 10 +-- .../groupadministration/UnbanChatMember.java | 10 +-- .../pinnedmessages/PinChatMessage.java | 10 +-- .../pinnedmessages/UnpinChatMessage.java | 10 +-- .../api/methods/send/SendAudio.java | 14 ++-- .../api/methods/send/SendChatAction.java | 12 ++-- .../api/methods/send/SendContact.java | 14 ++-- .../api/methods/send/SendDocument.java | 14 ++-- .../{ => meta}/api/methods/send/SendGame.java | 14 ++-- .../api/methods/send/SendInvoice.java | 16 ++--- .../api/methods/send/SendLocation.java | 14 ++-- .../api/methods/send/SendMediaGroup.java | 14 ++-- .../api/methods/send/SendMessage.java | 16 ++--- .../api/methods/send/SendPhoto.java | 14 ++-- .../api/methods/send/SendSticker.java | 14 ++-- .../api/methods/send/SendVenue.java | 14 ++-- .../api/methods/send/SendVideo.java | 14 ++-- .../api/methods/send/SendVideoNote.java | 14 ++-- .../api/methods/send/SendVoice.java | 14 ++-- .../api/methods/stickers/AddStickerToSet.java | 12 ++-- .../methods/stickers/CreateNewStickerSet.java | 12 ++-- .../stickers/DeleteStickerFromSet.java | 10 +-- .../api/methods/stickers/GetStickerSet.java | 12 ++-- .../stickers/SetStickerPositionInSet.java | 10 +-- .../methods/stickers/UploadStickerFile.java | 12 ++-- .../api/methods/updates/AllowedUpdates.java | 2 +- .../api/methods/updates/DeleteWebhook.java | 10 +-- .../api/methods/updates/GetUpdates.java | 12 ++-- .../api/methods/updates/GetWebhookInfo.java | 12 ++-- .../api/methods/updates/SetWebhook.java | 2 +- .../updatingmessages/DeleteMessage.java | 10 +-- .../updatingmessages/EditMessageCaption.java | 14 ++-- .../EditMessageLiveLocation.java | 14 ++-- .../EditMessageReplyMarkup.java | 15 ++-- .../updatingmessages/EditMessageText.java | 17 +++-- .../{ => meta}/api/objects/Audio.java | 4 +- .../{ => meta}/api/objects/CallbackQuery.java | 4 +- .../{ => meta}/api/objects/Chat.java | 4 +- .../{ => meta}/api/objects/ChatMember.java | 4 +- .../{ => meta}/api/objects/ChatPhoto.java | 4 +- .../{ => meta}/api/objects/Contact.java | 4 +- .../{ => meta}/api/objects/Document.java | 4 +- .../{ => meta}/api/objects/EntityType.java | 2 +- .../{ => meta}/api/objects/File.java | 4 +- .../{ => meta}/api/objects/Location.java | 4 +- .../{ => meta}/api/objects/MemberStatus.java | 2 +- .../{ => meta}/api/objects/Message.java | 12 ++-- .../{ => meta}/api/objects/MessageEntity.java | 4 +- .../{ => meta}/api/objects/PhotoSize.java | 4 +- .../api/objects/ResponseParameters.java | 4 +- .../{ => meta}/api/objects/Update.java | 12 ++-- .../{ => meta}/api/objects/User.java | 4 +- .../api/objects/UserProfilePhotos.java | 4 +- .../{ => meta}/api/objects/Venue.java | 4 +- .../{ => meta}/api/objects/Video.java | 4 +- .../{ => meta}/api/objects/VideoNote.java | 4 +- .../{ => meta}/api/objects/Voice.java | 4 +- .../{ => meta}/api/objects/WebhookInfo.java | 4 +- .../api/objects/games/Animation.java | 6 +- .../api/objects/games/CallbackGame.java | 4 +- .../{ => meta}/api/objects/games/Game.java | 8 +-- .../api/objects/games/GameHighScore.java | 6 +- .../inlinequery/ChosenInlineQuery.java | 8 +-- .../api/objects/inlinequery/InlineQuery.java | 8 +-- .../InputContactMessageContent.java | 4 +- .../InputLocationMessageContent.java | 4 +- .../InputMessageContent.java | 6 +- .../InputTextMessageContent.java | 6 +- .../InputVenueMessageContent.java | 4 +- .../inlinequery/result/InlineQueryResult.java | 6 +- .../result/InlineQueryResultArticle.java | 8 +-- .../result/InlineQueryResultAudio.java | 8 +-- .../result/InlineQueryResultContact.java | 8 +-- .../result/InlineQueryResultDocument.java | 8 +-- .../result/InlineQueryResultGame.java | 6 +- .../result/InlineQueryResultGif.java | 8 +-- .../result/InlineQueryResultLocation.java | 8 +-- .../result/InlineQueryResultMpeg4Gif.java | 8 +-- .../result/InlineQueryResultPhoto.java | 8 +-- .../result/InlineQueryResultVenue.java | 8 +-- .../result/InlineQueryResultVideo.java | 8 +-- .../result/InlineQueryResultVoice.java | 8 +-- .../chached/InlineQueryResultCachedAudio.java | 10 +-- .../InlineQueryResultCachedDocument.java | 10 +-- .../chached/InlineQueryResultCachedGif.java | 10 +-- .../InlineQueryResultCachedMpeg4Gif.java | 10 +-- .../chached/InlineQueryResultCachedPhoto.java | 10 +-- .../InlineQueryResultCachedSticker.java | 10 +-- .../chached/InlineQueryResultCachedVideo.java | 10 +-- .../chached/InlineQueryResultCachedVoice.java | 10 +-- .../api/objects/media/InputMedia.java | 8 +-- .../api/objects/media/InputMediaPhoto.java | 4 +- .../api/objects/media/InputMediaVideo.java | 4 +- .../api/objects/payments/Invoice.java | 6 +- .../api/objects/payments/LabeledPrice.java | 8 +-- .../api/objects/payments/OrderInfo.java | 4 +- .../objects/payments/PreCheckoutQuery.java | 6 +- .../api/objects/payments/ShippingAddress.java | 4 +- .../api/objects/payments/ShippingOption.java | 8 +-- .../api/objects/payments/ShippingQuery.java | 6 +- .../objects/payments/SuccessfulPayment.java | 4 +- .../objects/replykeyboard/ApiResponse.java | 4 +- .../replykeyboard/ForceReplyKeyboard.java | 4 +- .../replykeyboard/InlineKeyboardMarkup.java | 6 +- .../objects/replykeyboard/ReplyKeyboard.java | 13 ++++ .../replykeyboard/ReplyKeyboardMarkup.java | 6 +- .../replykeyboard/ReplyKeyboardRemove.java | 4 +- .../buttons/InlineKeyboardButton.java | 10 +-- .../replykeyboard/buttons/KeyboardButton.java | 8 +-- .../replykeyboard/buttons/KeyboardRow.java | 6 +- .../api/objects/stickers/MaskPosition.java | 8 +-- .../api/objects/stickers/Sticker.java | 6 +- .../api/objects/stickers/StickerSet.java | 4 +- .../{ => meta}/bots/AbsSender.java | 42 +++++------ .../exceptions/TelegramApiException.java | 2 +- .../TelegramApiRequestException.java | 8 +-- .../TelegramApiValidationException.java | 6 +- .../{ => meta}/generics/BotOptions.java | 2 +- .../{ => meta}/generics/BotSession.java | 2 +- .../{ => meta}/generics/LongPollingBot.java | 6 +- .../{ => meta}/generics/UpdatesHandler.java | 2 +- .../{ => meta}/generics/UpdatesReader.java | 2 +- .../{ => meta}/generics/Webhook.java | 4 +- .../{ => meta}/generics/WebhookBot.java | 8 +-- .../{ => meta}/logging/BotLogger.java | 2 +- .../{ => meta}/logging/BotsFileHandler.java | 2 +- .../{ => meta}/logging/FileFormatter.java | 2 +- .../updateshandlers/DownloadFileCallback.java | 2 +- .../updateshandlers/SentCallback.java | 6 +- .../api/methods/send/SendMessageTest.java | 2 +- .../{ => meta}/test/TelegramBotsHelper.java | 2 +- .../{ => meta}/test/TestDeserialization.java | 28 ++++---- .../{ => meta}/test/TestTelegramApi.java | 8 +-- .../apimethods/TestAnswerInlineQuery.java | 6 +- .../test/apimethods/TestGetUpdates.java | 10 +-- .../test/apimethods/TestSetGameScore.java | 8 +-- .../{ => meta}/test/asserts/ApiAssert.java | 2 +- .../telegrambots/meta/test/base/TestBase.java | 21 ++++++ .../{ => meta}/test/fakes/FakeBotSession.java | 8 +-- .../{ => meta}/test/fakes/FakeWebhook.java | 8 +-- .../telegrambots/test/base/TestBase.java | 21 ------ .../TelegramBotStarterConfiguration.java | 8 +-- .../telegrambots/ApiContextInitializer.java | 5 +- .../telegrambots/bots/DefaultAbsSender.java | 33 ++++----- .../telegrambots/bots/DefaultBotOptions.java | 4 +- .../bots/TelegramLongPollingBot.java | 10 +-- .../telegrambots/bots/TelegramWebhookBot.java | 12 ++-- .../updatesreceivers/DefaultBotSession.java | 16 ++--- .../updatesreceivers/DefaultWebhook.java | 6 +- .../updatesreceivers/RestApi.java | 10 +-- .../test/BotApiMethodHelperFactory.java | 72 +++++++++---------- .../test/Fakes/FakeLongPollingBot.java | 8 +-- .../telegrambots/test/Fakes/FakeWebhook.java | 8 +-- .../test/TelegramLongPollingBotTest.java | 2 +- .../test/TestDefaultBotSession.java | 4 +- .../telegrambots/test/TestRestApi.java | 40 +++++------ 216 files changed, 922 insertions(+), 935 deletions(-) delete mode 100644 telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboard.java rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/ApiConstants.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/ApiContext.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/TelegramBotsApi.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/interfaces/BotApiObject.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/interfaces/InputBotApiObject.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/interfaces/Validable.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/ActionType.java (96%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/AnswerCallbackQuery.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/AnswerInlineQuery.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/AnswerPreCheckoutQuery.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/AnswerShippingQuery.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/BotApiMethod.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/ForwardMessage.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/GetFile.java (86%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/GetMe.java (78%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/GetUserProfilePhotos.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/ParseMode.java (83%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/PartialBotApiMethod.java (77%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/StopMessageLiveLocation.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/games/GetGameHighScores.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/games/SetGameScore.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/DeleteChatPhoto.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/DeleteStickerSetName.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/ExportChatInviteLink.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/GetChat.java (84%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/GetChatAdministrators.java (85%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/GetChatMember.java (85%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/GetChatMemberCount.java (85%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/KickChatMember.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/LeaveChat.java (84%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/PromoteChatMember.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/RestrictChatMember.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/SetChatDescription.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/SetChatPhoto.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/SetChatStickerSet.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/SetChatTitle.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/groupadministration/UnbanChatMember.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/pinnedmessages/PinChatMessage.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/pinnedmessages/UnpinChatMessage.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendAudio.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendChatAction.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendContact.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendDocument.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendGame.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendInvoice.java (96%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendLocation.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendMediaGroup.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendMessage.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendPhoto.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendSticker.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendVenue.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendVideo.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendVideoNote.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendVoice.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/stickers/AddStickerToSet.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/stickers/CreateNewStickerSet.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/stickers/DeleteStickerFromSet.java (85%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/stickers/GetStickerSet.java (82%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/stickers/SetStickerPositionInSet.java (88%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/stickers/UploadStickerFile.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updates/AllowedUpdates.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updates/DeleteWebhook.java (78%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updates/GetUpdates.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updates/GetWebhookInfo.java (77%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updates/SetWebhook.java (98%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updatingmessages/DeleteMessage.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updatingmessages/EditMessageCaption.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updatingmessages/EditMessageLiveLocation.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updatingmessages/EditMessageReplyMarkup.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/methods/updatingmessages/EditMessageText.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Audio.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/CallbackQuery.java (96%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Chat.java (97%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/ChatMember.java (98%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/ChatPhoto.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Contact.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Document.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/EntityType.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/File.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Location.java (88%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/MemberStatus.java (88%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Message.java (97%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/MessageEntity.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/PhotoSize.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/ResponseParameters.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Update.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/User.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/UserProfilePhotos.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Venue.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Video.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/VideoNote.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/Voice.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/WebhookInfo.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/games/Animation.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/games/CallbackGame.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/games/Game.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/games/GameHighScore.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/ChosenInlineQuery.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/InlineQuery.java (88%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java (54%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResult.java (51%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultArticle.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultAudio.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultContact.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultDocument.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultGame.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultGif.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultLocation.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultPhoto.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultVenue.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultVideo.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/InlineQueryResultVoice.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/media/InputMedia.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/media/InputMediaPhoto.java (80%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/media/InputMediaVideo.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/Invoice.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/LabeledPrice.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/OrderInfo.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/PreCheckoutQuery.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/ShippingAddress.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/ShippingOption.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/ShippingQuery.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/payments/SuccessfulPayment.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/ApiResponse.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/ForceReplyKeyboard.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/InlineKeyboardMarkup.java (89%) create mode 100644 telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboard.java rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/ReplyKeyboardMarkup.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/ReplyKeyboardRemove.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/buttons/InlineKeyboardButton.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/buttons/KeyboardButton.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/replykeyboard/buttons/KeyboardRow.java (84%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/stickers/MaskPosition.java (90%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/stickers/Sticker.java (93%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/api/objects/stickers/StickerSet.java (91%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/bots/AbsSender.java (95%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/exceptions/TelegramApiException.java (96%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/exceptions/TelegramApiRequestException.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/exceptions/TelegramApiValidationException.java (89%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/BotOptions.java (71%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/BotSession.java (92%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/LongPollingBot.java (87%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/UpdatesHandler.java (71%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/UpdatesReader.java (72%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/Webhook.java (73%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/generics/WebhookBot.java (80%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/logging/BotLogger.java (99%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/logging/BotsFileHandler.java (96%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/logging/FileFormatter.java (97%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/updateshandlers/DownloadFileCallback.java (94%) rename telegrambots-meta/src/main/java/org/telegram/telegrambots/{ => meta}/updateshandlers/SentCallback.java (82%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/api/methods/send/SendMessageTest.java (93%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/TelegramBotsHelper.java (99%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/TestDeserialization.java (91%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/TestTelegramApi.java (82%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/apimethods/TestAnswerInlineQuery.java (95%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/apimethods/TestGetUpdates.java (83%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/apimethods/TestSetGameScore.java (87%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/asserts/ApiAssert.java (67%) create mode 100644 telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/base/TestBase.java rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/fakes/FakeBotSession.java (67%) rename telegrambots-meta/src/test/java/org/telegram/telegrambots/{ => meta}/test/fakes/FakeWebhook.java (78%) delete mode 100644 telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java diff --git a/README.md b/README.md index e9feeea2..45716860 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ In order to use Long Polling mode, just create your own bot extending `org.teleg If you like to use Webhook, extend `org.telegram.telegrambots.bots.TelegramWebhookBot` -Once done, you just need to create a `org.telegram.telegrambots.TelegramBotsApi`and register your bots: +Once done, you just need to create a `org.telegram.telegrambots.meta.TelegramBotsApi`and register your bots: ```java diff --git a/TelegramBots.wiki/Errors-Handling.md b/TelegramBots.wiki/Errors-Handling.md index 665959f8..7bfa5780 100644 --- a/TelegramBots.wiki/Errors-Handling.md +++ b/TelegramBots.wiki/Errors-Handling.md @@ -1,11 +1,11 @@ * [Terminated by other long poll or webhook](#terminted_by_other) -* ["No implementation for org.telegram.telegrambots.generics.BotSession was bound"](#no_implementation_was_bound) +* ["No implementation for org.telegram.telegrambots.meta.generics.BotSession was bound"](#no_implementation_was_bound) ## Terminated by other long poll or webhook ## It means that you have already a running instance of your bot. To solve it, close all running ones and then you can start a new instance. -## No implementation for org.telegram.telegrambots.generics.BotSession was bound ## +## No implementation for org.telegram.meta.telegrambots.generics.BotSession was bound ## Please follow the steps as explained [here](https://github.com/rubenlagus/TelegramBots/wiki/How-To-Update#to-version-243) in "How To Update" > At the beginning of your program (before creating your TelegramBotsApi instance, add the following line: ``` diff --git a/TelegramBots.wiki/abilities/Bot-Testing.md b/TelegramBots.wiki/abilities/Bot-Testing.md index 603ec281..a226ea99 100644 --- a/TelegramBots.wiki/abilities/Bot-Testing.md +++ b/TelegramBots.wiki/abilities/Bot-Testing.md @@ -88,7 +88,7 @@ import org.telegram.abilitybots.api.db.MapDBContext; import org.telegram.abilitybots.api.objects.EndUser; import org.telegram.abilitybots.api.objects.MessageContext; import org.telegram.abilitybots.api.sender.MessageSender; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import static org.mockito.Mockito.*; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java index a9c4e0e3..686b186b 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java @@ -9,15 +9,15 @@ import org.telegram.abilitybots.api.sender.SilentSender; import org.telegram.abilitybots.api.util.AbilityUtils; import org.telegram.abilitybots.api.util.Pair; import org.telegram.abilitybots.api.util.Trio; -import org.telegram.telegrambots.api.methods.GetFile; -import org.telegram.telegrambots.api.methods.groupadministration.GetChatAdministrators; -import org.telegram.telegrambots.api.methods.send.SendDocument; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.methods.GetFile; +import org.telegram.telegrambots.meta.api.methods.groupadministration.GetChatAdministrators; +import org.telegram.telegrambots.meta.api.methods.send.SendDocument; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.bots.DefaultBotOptions; import org.telegram.telegrambots.bots.TelegramLongPollingBot; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.File; import java.io.FileNotFoundException; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java index eda5e9c1..c31a856f 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java @@ -1,7 +1,7 @@ package org.telegram.abilitybots.api.db; import org.telegram.abilitybots.api.bot.AbilityBot; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import java.io.Closeable; import java.util.List; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/MapDBContext.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/MapDBContext.java index e9d2efd6..37707aed 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/MapDBContext.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/MapDBContext.java @@ -7,7 +7,7 @@ import org.mapdb.DB; import org.mapdb.DBMaker; import org.mapdb.Serializer; import org.telegram.abilitybots.api.util.Pair; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.IOException; import java.util.*; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Ability.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Ability.java index 43446eef..75259dc3 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Ability.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Ability.java @@ -2,8 +2,8 @@ package org.telegram.abilitybots.api.objects; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.util.Arrays; import java.util.List; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java index 7cc08145..f686e38f 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java @@ -3,7 +3,7 @@ package org.telegram.abilitybots.api.objects; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.User; import java.io.Serializable; import java.util.Objects; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java index 8b03175e..ac8e9613 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Flag.java @@ -1,7 +1,7 @@ package org.telegram.abilitybots.api.objects; import org.telegram.abilitybots.api.objects.Ability.AbilityBuilder; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java index c3335af9..c68a2868 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java @@ -2,7 +2,7 @@ package org.telegram.abilitybots.api.objects; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import java.util.Arrays; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java index 113d26b8..0d344ce2 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/Reply.java @@ -1,7 +1,7 @@ package org.telegram.abilitybots.api.objects; import com.google.common.base.MoreObjects; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import java.util.List; import java.util.Objects; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/DefaultSender.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/DefaultSender.java index 4ea2d59a..2a5c80ca 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/DefaultSender.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/DefaultSender.java @@ -1,19 +1,19 @@ package org.telegram.abilitybots.api.sender; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.groupadministration.SetChatPhoto; -import org.telegram.telegrambots.api.methods.send.*; -import org.telegram.telegrambots.api.methods.stickers.AddStickerToSet; -import org.telegram.telegrambots.api.methods.stickers.CreateNewStickerSet; -import org.telegram.telegrambots.api.methods.stickers.UploadStickerFile; -import org.telegram.telegrambots.api.objects.File; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.api.objects.WebhookInfo; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.groupadministration.SetChatPhoto; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.stickers.AddStickerToSet; +import org.telegram.telegrambots.meta.api.methods.stickers.CreateNewStickerSet; +import org.telegram.telegrambots.meta.api.methods.stickers.UploadStickerFile; +import org.telegram.telegrambots.meta.api.objects.File; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.WebhookInfo; import org.telegram.telegrambots.bots.DefaultAbsSender; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.updateshandlers.DownloadFileCallback; -import org.telegram.telegrambots.updateshandlers.SentCallback; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.updateshandlers.DownloadFileCallback; +import org.telegram.telegrambots.meta.updateshandlers.SentCallback; import java.io.Serializable; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/MessageSender.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/MessageSender.java index a7b8ee83..95a049e5 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/MessageSender.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/MessageSender.java @@ -1,19 +1,19 @@ package org.telegram.abilitybots.api.sender; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.groupadministration.SetChatPhoto; -import org.telegram.telegrambots.api.methods.send.*; -import org.telegram.telegrambots.api.methods.stickers.AddStickerToSet; -import org.telegram.telegrambots.api.methods.stickers.CreateNewStickerSet; -import org.telegram.telegrambots.api.methods.stickers.UploadStickerFile; -import org.telegram.telegrambots.api.objects.File; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.api.objects.WebhookInfo; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.groupadministration.SetChatPhoto; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.stickers.AddStickerToSet; +import org.telegram.telegrambots.meta.api.methods.stickers.CreateNewStickerSet; +import org.telegram.telegrambots.meta.api.methods.stickers.UploadStickerFile; +import org.telegram.telegrambots.meta.api.objects.File; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.WebhookInfo; import org.telegram.telegrambots.bots.DefaultAbsSender; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.updateshandlers.DownloadFileCallback; -import org.telegram.telegrambots.updateshandlers.SentCallback; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.updateshandlers.DownloadFileCallback; +import org.telegram.telegrambots.meta.updateshandlers.SentCallback; import java.io.Serializable; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/SilentSender.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/SilentSender.java index 4b72f705..a6cb37f9 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/SilentSender.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/sender/SilentSender.java @@ -1,11 +1,11 @@ package org.telegram.abilitybots.api.sender; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ForceReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.Serializable; import java.util.Optional; diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java index 8852170f..a6d01324 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java @@ -2,8 +2,8 @@ package org.telegram.abilitybots.api.util; import org.telegram.abilitybots.api.db.DBContext; import org.telegram.abilitybots.api.objects.MessageContext; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.User; import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/AbilityBotTest.java b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/AbilityBotTest.java index ff335720..e4c0598b 100644 --- a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/AbilityBotTest.java +++ b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/bot/AbilityBotTest.java @@ -12,9 +12,9 @@ import org.telegram.abilitybots.api.sender.MessageSender; import org.telegram.abilitybots.api.sender.SilentSender; import org.telegram.abilitybots.api.util.Pair; import org.telegram.abilitybots.api.util.Trio; -import org.telegram.telegrambots.api.methods.groupadministration.GetChatAdministrators; -import org.telegram.telegrambots.api.objects.*; -import org.telegram.telegrambots.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.api.methods.groupadministration.GetChatAdministrators; +import org.telegram.telegrambots.meta.api.objects.*; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import java.io.BufferedWriter; import java.io.IOException; @@ -342,7 +342,7 @@ public class AbilityBotTest { public void canCheckPrivacy() { Update update = mock(Update.class); Message message = mock(Message.class); - org.telegram.telegrambots.api.objects.User user = mock(User.class); + User user = mock(User.class); Ability publicAbility = getDefaultBuilder().privacy(PUBLIC).build(); Ability groupAdminAbility = getDefaultBuilder().privacy(GROUP_ADMIN).build(); Ability adminAbility = getDefaultBuilder().privacy(ADMIN).build(); @@ -365,7 +365,7 @@ public class AbilityBotTest { public void canValidateGroupAdminPrivacy() throws TelegramApiException { Update update = mock(Update.class); Message message = mock(Message.class); - org.telegram.telegrambots.api.objects.User user = mock(User.class); + User user = mock(User.class); Ability groupAdminAbility = getDefaultBuilder().privacy(GROUP_ADMIN).build(); Trio groupAdminTrio = Trio.of(update, groupAdminAbility, TEXT); @@ -386,7 +386,7 @@ public class AbilityBotTest { public void canRestrictNormalUsersFromGroupAdminAbilities() throws TelegramApiException { Update update = mock(Update.class); Message message = mock(Message.class); - org.telegram.telegrambots.api.objects.User user = mock(User.class); + User user = mock(User.class); Ability groupAdminAbility = getDefaultBuilder().privacy(GROUP_ADMIN).build(); Trio groupAdminTrio = Trio.of(update, groupAdminAbility, TEXT); @@ -403,7 +403,7 @@ public class AbilityBotTest { public void canBlockAdminsFromCreatorAbilities() { Update update = mock(Update.class); Message message = mock(Message.class); - org.telegram.telegrambots.api.objects.User user = mock(User.class); + User user = mock(User.class); Ability creatorAbility = getDefaultBuilder().privacy(Privacy.CREATOR).build(); Trio creatorTrio = Trio.of(update, creatorAbility, TEXT); diff --git a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java index 1fb46a55..3b33ab36 100644 --- a/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java +++ b/telegrambots-abilities/src/test/java/org/telegram/abilitybots/api/sender/SilentSenderTest.java @@ -2,7 +2,7 @@ package org.telegram.abilitybots.api.sender; import org.junit.Before; import org.junit.Test; -import org.telegram.telegrambots.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import java.util.Optional; diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/TelegramLongPollingCommandBot.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/TelegramLongPollingCommandBot.java index 5e2e30f0..7bf923f2 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/TelegramLongPollingCommandBot.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/TelegramLongPollingCommandBot.java @@ -1,10 +1,10 @@ package org.telegram.telegrambots.bots.commandbot; -import org.telegram.telegrambots.ApiContext; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.ApiContext; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.bots.DefaultBotOptions; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.bots.commandbot.commands.BotCommand; diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java index 3ef941ec..40994049 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/BotCommand.java @@ -1,9 +1,9 @@ package org.telegram.telegrambots.bots.commandbot.commands; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.api.objects.Chat; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.bots.AbsSender; /** * Representation of a command, which can be executed diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java index 2f44eada..e1967d00 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/CommandRegistry.java @@ -1,7 +1,7 @@ package org.telegram.telegrambots.bots.commandbot.commands; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.bots.AbsSender; import java.util.Arrays; import java.util.Collection; diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/DefaultBotCommand.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/DefaultBotCommand.java index e4cb2d2d..69150a07 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/DefaultBotCommand.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/DefaultBotCommand.java @@ -1,9 +1,9 @@ package org.telegram.telegrambots.bots.commandbot.commands; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.api.objects.Chat; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.bots.AbsSender; /** * Bot command with message ID in execute method diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/IBotCommand.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/IBotCommand.java index 618e9936..fe0d0c0b 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/IBotCommand.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/IBotCommand.java @@ -1,7 +1,7 @@ package org.telegram.telegrambots.bots.commandbot.commands; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.bots.AbsSender; import java.util.Collection; import java.util.Map; diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/ICommandRegistry.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/ICommandRegistry.java index a6a4905c..e5253259 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/ICommandRegistry.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/ICommandRegistry.java @@ -1,7 +1,7 @@ package org.telegram.telegrambots.bots.commandbot.commands; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.bots.AbsSender; import java.util.Collection; import java.util.Map; diff --git a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/helpCommand/HelpCommand.java b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/helpCommand/HelpCommand.java index bd108a19..beafa244 100644 --- a/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/helpCommand/HelpCommand.java +++ b/telegrambots-extensions/src/main/java/org/telegram/telegrambots/bots/commandbot/commands/helpCommand/HelpCommand.java @@ -1,12 +1,12 @@ package org.telegram.telegrambots.bots.commandbot.commands.helpCommand; -import org.telegram.telegrambots.api.methods.send.SendMessage; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +import org.telegram.telegrambots.meta.api.objects.Chat; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.bots.AbsSender; import org.telegram.telegrambots.bots.commandbot.commands.IBotCommand; import org.telegram.telegrambots.bots.commandbot.commands.ICommandRegistry; -import org.telegram.telegrambots.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import java.util.Collection; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboard.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboard.java deleted file mode 100644 index fba02c4a..00000000 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboard.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.telegram.telegrambots.api.objects.replykeyboard; - -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; - -/** - * @author Ruben Bermudez - * @version 1.0 - * @brief Reply keyboard abstract type - * @date 20 of June of 2015 - */ -public interface ReplyKeyboard extends InputBotApiObject, Validable { -} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/ApiConstants.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/ApiConstants.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/ApiConstants.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/ApiConstants.java index b2af10ed..03e6b589 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/ApiConstants.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/ApiConstants.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots; +package org.telegram.telegrambots.meta; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/ApiContext.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/ApiContext.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/ApiContext.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/ApiContext.java index 6a647bbd..fe783e65 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/ApiContext.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/ApiContext.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots; +package org.telegram.telegrambots.meta; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Singleton; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.text.MessageFormat; import java.util.HashMap; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/TelegramBotsApi.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/TelegramBotsApi.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/TelegramBotsApi.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/TelegramBotsApi.java index 8a959eb7..94a2b1c3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/TelegramBotsApi.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/TelegramBotsApi.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots; +package org.telegram.telegrambots.meta; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.generics.BotSession; -import org.telegram.telegrambots.generics.LongPollingBot; -import org.telegram.telegrambots.generics.Webhook; -import org.telegram.telegrambots.generics.WebhookBot; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.BotSession; +import org.telegram.telegrambots.meta.generics.LongPollingBot; +import org.telegram.telegrambots.meta.generics.Webhook; +import org.telegram.telegrambots.meta.generics.WebhookBot; import java.text.MessageFormat; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/BotApiObject.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/BotApiObject.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java index f60bf13d..640e5fc0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/BotApiObject.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.interfaces; +package org.telegram.telegrambots.meta.api.interfaces; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/InputBotApiObject.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/InputBotApiObject.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/InputBotApiObject.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/InputBotApiObject.java index 8fb68c0b..caedb298 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/InputBotApiObject.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/InputBotApiObject.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.interfaces; +package org.telegram.telegrambots.meta.api.interfaces; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/Validable.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/Validable.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/Validable.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/Validable.java index e1f2b1d1..81a93070 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/interfaces/Validable.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/Validable.java @@ -15,9 +15,9 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.interfaces; +package org.telegram.telegrambots.meta.api.interfaces; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ActionType.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ActionType.java similarity index 96% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ActionType.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ActionType.java index 7a85db3d..56c4f994 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ActionType.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ActionType.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerCallbackQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerCallbackQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java index e6759cc2..fd1da785 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerCallbackQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerInlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerInlineQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java index 97ec161e..80fb9434 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerInlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Arrays; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerPreCheckoutQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerPreCheckoutQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java index b2c9199c..fdf2aa66 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerPreCheckoutQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerShippingQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerShippingQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java index 63424aa2..8f452edc 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/AnswerShippingQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.payments.ShippingOption; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.payments.ShippingOption; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/BotApiMethod.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/BotApiMethod.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/BotApiMethod.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/BotApiMethod.java index 2a1e34f2..620f7bf2 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/BotApiMethod.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/BotApiMethod.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ForwardMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ForwardMessage.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java index ae3b11de..f9694986 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ForwardMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetFile.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java similarity index 86% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetFile.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java index a278c3aa..1e8924da 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetFile.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.File; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.File; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetMe.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetMe.java similarity index 78% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetMe.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetMe.java index d2991d55..5cf16e54 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetMe.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetMe.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetUserProfilePhotos.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetUserProfilePhotos.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java index 65c0d117..4e614837 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/GetUserProfilePhotos.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.UserProfilePhotos; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.UserProfilePhotos; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ParseMode.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ParseMode.java similarity index 83% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ParseMode.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ParseMode.java index 169d03a3..496e2f37 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/ParseMode.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ParseMode.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/PartialBotApiMethod.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/PartialBotApiMethod.java similarity index 77% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/PartialBotApiMethod.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/PartialBotApiMethod.java index d8a49e94..0c0a5582 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/PartialBotApiMethod.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/PartialBotApiMethod.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.ObjectMapper; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import java.io.Serializable; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/StopMessageLiveLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/StopMessageLiveLocation.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/StopMessageLiveLocation.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/StopMessageLiveLocation.java index 9042f5f8..434fd5b4 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/StopMessageLiveLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/StopMessageLiveLocation.java @@ -1,16 +1,15 @@ -package org.telegram.telegrambots.api.methods; +package org.telegram.telegrambots.meta.api.methods; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.Serializable; -import java.util.Objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/games/GetGameHighScores.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/games/GetGameHighScores.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java index f3ad3953..e1caf389 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/games/GetGameHighScores.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/GetGameHighScores.java @@ -14,20 +14,19 @@ * You should have received a copy of the GNU General Public License * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.methods.games; +package org.telegram.telegrambots.meta.api.methods.games; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.games.GameHighScore; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.games.GameHighScore; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.ArrayList; -import java.util.Objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/games/SetGameScore.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/games/SetGameScore.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java index 50e3c1cb..115da1ac 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/games/SetGameScore.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/games/SetGameScore.java @@ -15,20 +15,19 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.methods.games; +package org.telegram.telegrambots.meta.api.methods.games; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.Serializable; -import java.util.Objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/DeleteChatPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/DeleteChatPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java index 270e5362..2cf0de88 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/DeleteChatPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteChatPhoto.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/DeleteStickerSetName.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteStickerSetName.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/DeleteStickerSetName.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteStickerSetName.java index 5dc0e858..4bda56ad 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/DeleteStickerSetName.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/DeleteStickerSetName.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/ExportChatInviteLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/ExportChatInviteLink.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java index bcd1dcce..eb5de96e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/ExportChatInviteLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/ExportChatInviteLink.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java similarity index 84% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChat.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java index 6bb4970e..08d8d485 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChat.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Chat; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatAdministrators.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java similarity index 85% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatAdministrators.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java index d1ff6c9f..34fe52c8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatAdministrators.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatAdministrators.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.ChatMember; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.ChatMember; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java similarity index 85% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatMember.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java index 7a76864e..6022cdf8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMember.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.ChatMember; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.ChatMember; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatMemberCount.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java similarity index 85% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatMemberCount.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java index 8c153f76..d7691365 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/GetChatMemberCount.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/GetChatMemberCount.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/KickChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/KickChatMember.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/KickChatMember.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/KickChatMember.java index e490ed4b..99dcda52 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/KickChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/KickChatMember.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/LeaveChat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java similarity index 84% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/LeaveChat.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java index 410f3659..fc61a094 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/LeaveChat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/LeaveChat.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/PromoteChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/PromoteChatMember.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java index 04c44290..1d1bd5db 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/PromoteChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/PromoteChatMember.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/RestrictChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/RestrictChatMember.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java index ddf557dd..feeca4eb 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/RestrictChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/RestrictChatMember.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatDescription.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatDescription.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java index bb02ab33..4238cdde 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatDescription.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatDescription.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java index 4c53f5c8..977d494e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatPhoto.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatStickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatStickerSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java index 15fa288a..13c5bef5 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatStickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatStickerSet.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatTitle.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatTitle.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java index 8e87b052..579617d5 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/SetChatTitle.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/SetChatTitle.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/UnbanChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/UnbanChatMember.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java index 7cdc842c..c586a47d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/groupadministration/UnbanChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/groupadministration/UnbanChatMember.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.groupadministration; +package org.telegram.telegrambots.meta.api.methods.groupadministration; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/pinnedmessages/PinChatMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/pinnedmessages/PinChatMessage.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java index 35c38a5a..6cc4e705 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/pinnedmessages/PinChatMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/PinChatMessage.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.pinnedmessages; +package org.telegram.telegrambots.meta.api.methods.pinnedmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/pinnedmessages/UnpinChatMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/pinnedmessages/UnpinChatMessage.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java index 491de3f8..6104d419 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/pinnedmessages/UnpinChatMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/pinnedmessages/UnpinChatMessage.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.pinnedmessages; +package org.telegram.telegrambots.meta.api.methods.pinnedmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendAudio.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendAudio.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendAudio.java index e312a513..3dc64e82 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendAudio.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendChatAction.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendChatAction.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java index 89d20b9c..41532097 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendChatAction.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendChatAction.java @@ -1,14 +1,14 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.ActionType; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.ActionType; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendContact.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendContact.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java index 13982534..4066cc16 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendContact.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendContact.java @@ -1,14 +1,14 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendDocument.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDocument.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendDocument.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDocument.java index 4923de82..fdb4bff3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendDocument.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendDocument.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendGame.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendGame.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java index c9c94efc..a2f18429 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendGame.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendGame.java @@ -15,17 +15,17 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java similarity index 96% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendInvoice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java index 6bed96f9..44a2be71 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendInvoice.java @@ -1,14 +1,14 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.payments.LabeledPrice; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.payments.LabeledPrice; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendLocation.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java index 83d98a5e..99ab6be9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendLocation.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendMediaGroup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendMediaGroup.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java index e4fde944..576cc541 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendMediaGroup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMediaGroup.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.media.InputMedia; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.media.InputMedia; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendMessage.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java index 53238969..5c1bd562 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendMessage.java @@ -1,15 +1,15 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.ParseMode; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.ParseMode; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java index e8ebec83..d959cffd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendPhoto.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendSticker.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendSticker.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendSticker.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendSticker.java index cd08c537..6e090b9e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendSticker.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendSticker.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVenue.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVenue.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java index 591c1a21..edb1453a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVenue.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVenue.java @@ -1,14 +1,14 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVideo.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVideo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVideo.java index ffdec937..a71aa0cd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVideo.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVideoNote.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVideoNote.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVideoNote.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVideoNote.java index 38ec3a5b..cb1f594d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVideoNote.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVideoNote.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVoice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java index 25b493a5..3e12fc5c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/send/SendVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/send/SendVoice.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/AddStickerToSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/AddStickerToSet.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/AddStickerToSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/AddStickerToSet.java index 93b6031f..3b6b485d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/AddStickerToSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/AddStickerToSet.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.stickers; +package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.stickers.MaskPosition; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.stickers.MaskPosition; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/CreateNewStickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/CreateNewStickerSet.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/CreateNewStickerSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/CreateNewStickerSet.java index a9c2b308..2c586882 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/CreateNewStickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/CreateNewStickerSet.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.stickers; +package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.stickers.MaskPosition; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.stickers.MaskPosition; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/DeleteStickerFromSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java similarity index 85% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/DeleteStickerFromSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java index 391de9a4..3bb30989 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/DeleteStickerFromSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/DeleteStickerFromSet.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.stickers; +package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/GetStickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java similarity index 82% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/GetStickerSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java index 9155c796..178cbf71 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/GetStickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/GetStickerSet.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.stickers; +package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.stickers.StickerSet; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.stickers.StickerSet; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/SetStickerPositionInSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/SetStickerPositionInSet.java similarity index 88% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/SetStickerPositionInSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/SetStickerPositionInSet.java index 49232f77..f24fe53c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/SetStickerPositionInSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/SetStickerPositionInSet.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.stickers; +package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/UploadStickerFile.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/UploadStickerFile.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/UploadStickerFile.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/UploadStickerFile.java index b7363609..ac81b505 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/stickers/UploadStickerFile.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/stickers/UploadStickerFile.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.stickers; +package org.telegram.telegrambots.meta.api.methods.stickers; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; -import org.telegram.telegrambots.api.objects.File; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.objects.File; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.InputStream; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/AllowedUpdates.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/AllowedUpdates.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/AllowedUpdates.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/AllowedUpdates.java index c921a4c8..b2ce70cd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/AllowedUpdates.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/AllowedUpdates.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.methods.updates; +package org.telegram.telegrambots.meta.api.methods.updates; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/DeleteWebhook.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/DeleteWebhook.java similarity index 78% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/DeleteWebhook.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/DeleteWebhook.java index 3eb13b23..38623f9d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/DeleteWebhook.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/DeleteWebhook.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.updates; +package org.telegram.telegrambots.meta.api.methods.updates; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/GetUpdates.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/GetUpdates.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/GetUpdates.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/GetUpdates.java index d67d27f5..74439cad 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/GetUpdates.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/GetUpdates.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.updates; +package org.telegram.telegrambots.meta.api.methods.updates; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/GetWebhookInfo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/GetWebhookInfo.java similarity index 77% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/GetWebhookInfo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/GetWebhookInfo.java index e74e4c81..019edd88 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/GetWebhookInfo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/GetWebhookInfo.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.methods.updates; +package org.telegram.telegrambots.meta.api.methods.updates; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.WebhookInfo; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.WebhookInfo; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/SetWebhook.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java similarity index 98% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/SetWebhook.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java index e80e1ee4..caee2cfe 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updates/SetWebhook.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updates/SetWebhook.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.methods.updates; +package org.telegram.telegrambots.meta.api.methods.updates; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/DeleteMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/DeleteMessage.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java index 256d1b4a..9437f3c7 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/DeleteMessage.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/DeleteMessage.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.methods.updatingmessages; +package org.telegram.telegrambots.meta.api.methods.updatingmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageCaption.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageCaption.java index 2a4414d7..6e020651 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageCaption.java @@ -1,14 +1,14 @@ -package org.telegram.telegrambots.api.methods.updatingmessages; +package org.telegram.telegrambots.meta.api.methods.updatingmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.Serializable; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageLiveLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageLiveLocation.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java index ff0d79ec..df23324e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageLiveLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageLiveLocation.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.api.methods.updatingmessages; +package org.telegram.telegrambots.meta.api.methods.updatingmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.Serializable; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageReplyMarkup.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageReplyMarkup.java index 9952f3b4..085cef07 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageReplyMarkup.java @@ -1,18 +1,17 @@ -package org.telegram.telegrambots.api.methods.updatingmessages; +package org.telegram.telegrambots.meta.api.methods.updatingmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.Serializable; -import java.util.Objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java index 39376ec6..49c09b04 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/updatingmessages/EditMessageText.java @@ -1,19 +1,18 @@ -package org.telegram.telegrambots.api.methods.updatingmessages; +package org.telegram.telegrambots.meta.api.methods.updatingmessages; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.ParseMode; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.ParseMode; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.IOException; import java.io.Serializable; -import java.util.Objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Audio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Audio.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Audio.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Audio.java index 31c9bc5e..13445b9a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Audio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Audio.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/CallbackQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/CallbackQuery.java similarity index 96% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/CallbackQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/CallbackQuery.java index 7125421f..2f5b631d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/CallbackQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/CallbackQuery.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Chat.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java similarity index 97% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Chat.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java index 6d26e953..3d5d7b9c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Chat.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Chat.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ChatMember.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMember.java similarity index 98% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ChatMember.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMember.java index c8b2e3fc..c22f29d0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ChatMember.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatMember.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ChatPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatPhoto.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ChatPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatPhoto.java index 521b89c1..74785e13 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ChatPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ChatPhoto.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Contact.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Contact.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Contact.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Contact.java index a50d748d..673cfc11 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Contact.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Contact.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Document.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Document.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Document.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Document.java index 501a84be..46a2e7a9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Document.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Document.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/EntityType.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/EntityType.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/EntityType.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/EntityType.java index bbf33cb3..c3109a0c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/EntityType.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/EntityType.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/File.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/File.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/File.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/File.java index 290f6e5a..c9991f1c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/File.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/File.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; import java.security.InvalidParameterException; import java.text.MessageFormat; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Location.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java similarity index 88% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Location.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java index e3044933..c9f30fb9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Location.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Location.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/MemberStatus.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MemberStatus.java similarity index 88% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/MemberStatus.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MemberStatus.java index 3ae2c83c..4b88a9c7 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/MemberStatus.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MemberStatus.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Message.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Message.java similarity index 97% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Message.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Message.java index 449e93f7..012e7fee 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Message.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Message.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.games.Game; -import org.telegram.telegrambots.api.objects.payments.Invoice; -import org.telegram.telegrambots.api.objects.payments.SuccessfulPayment; -import org.telegram.telegrambots.api.objects.stickers.Sticker; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.games.Game; +import org.telegram.telegrambots.meta.api.objects.payments.Invoice; +import org.telegram.telegrambots.meta.api.objects.payments.SuccessfulPayment; +import org.telegram.telegrambots.meta.api.objects.stickers.Sticker; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/MessageEntity.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/MessageEntity.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java index 72afee1f..ae6fb9f3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/MessageEntity.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/MessageEntity.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/PhotoSize.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/PhotoSize.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/PhotoSize.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/PhotoSize.java index 96f3254c..81b143a4 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/PhotoSize.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/PhotoSize.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ResponseParameters.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ResponseParameters.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ResponseParameters.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ResponseParameters.java index 68191090..11a54f88 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/ResponseParameters.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/ResponseParameters.java @@ -15,11 +15,11 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Update.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Update.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Update.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Update.java index d540bf8b..a5de6095 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Update.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Update.java @@ -1,12 +1,12 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.inlinequery.ChosenInlineQuery; -import org.telegram.telegrambots.api.objects.inlinequery.InlineQuery; -import org.telegram.telegrambots.api.objects.payments.PreCheckoutQuery; -import org.telegram.telegrambots.api.objects.payments.ShippingQuery; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.inlinequery.ChosenInlineQuery; +import org.telegram.telegrambots.meta.api.objects.inlinequery.InlineQuery; +import org.telegram.telegrambots.meta.api.objects.payments.PreCheckoutQuery; +import org.telegram.telegrambots.meta.api.objects.payments.ShippingQuery; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/User.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/User.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java index 88a0f0a9..536f931d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/User.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/User.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/UserProfilePhotos.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/UserProfilePhotos.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/UserProfilePhotos.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/UserProfilePhotos.java index bb3c8ab0..7c88e70a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/UserProfilePhotos.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/UserProfilePhotos.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Venue.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Venue.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Venue.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Venue.java index ba232b93..3458820c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Venue.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Venue.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Video.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Video.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Video.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Video.java index 9d7d64d4..e6d6cb0e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Video.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Video.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/VideoNote.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/VideoNote.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/VideoNote.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/VideoNote.java index e3a451f8..365da3fd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/VideoNote.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/VideoNote.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Voice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Voice.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Voice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Voice.java index 1d6c5046..977a684e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/Voice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/Voice.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/WebhookInfo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WebhookInfo.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/WebhookInfo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WebhookInfo.java index 6a61a8f1..6b013a70 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/WebhookInfo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/WebhookInfo.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects; +package org.telegram.telegrambots.meta.api.objects; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/Animation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Animation.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/Animation.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Animation.java index f5a2bfa1..a0b2222f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/Animation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Animation.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.objects.games; +package org.telegram.telegrambots.meta.api.objects.games; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.PhotoSize; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.PhotoSize; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/CallbackGame.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/CallbackGame.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/CallbackGame.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/CallbackGame.java index 6458687d..9f4fbe46 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/CallbackGame.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/CallbackGame.java @@ -15,9 +15,9 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.objects.games; +package org.telegram.telegrambots.meta.api.objects.games; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/Game.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/Game.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java index 35385f6e..7e84b3ef 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/Game.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/Game.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.objects.games; +package org.telegram.telegrambots.meta.api.objects.games; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.MessageEntity; -import org.telegram.telegrambots.api.objects.PhotoSize; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.MessageEntity; +import org.telegram.telegrambots.meta.api.objects.PhotoSize; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/GameHighScore.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/GameHighScore.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java index 1ac670fb..c9a7f43a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/games/GameHighScore.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/games/GameHighScore.java @@ -15,12 +15,12 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.objects.games; +package org.telegram.telegrambots.meta.api.objects.games; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.User; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/ChosenInlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/ChosenInlineQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java index dbaee14f..f0e4de82 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/ChosenInlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/ChosenInlineQuery.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery; +package org.telegram.telegrambots.meta.api.objects.inlinequery; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.Location; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.Location; +import org.telegram.telegrambots.meta.api.objects.User; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/InlineQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java similarity index 88% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/InlineQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java index e55014d8..99d31257 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/InlineQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/InlineQuery.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery; +package org.telegram.telegrambots.meta.api.objects.inlinequery; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.Location; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.Location; +import org.telegram.telegrambots.meta.api.objects.User; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java index c0dfc63b..82bbc6ff 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent; +package org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java index 75fc3069..d9824f0e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent; +package org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java similarity index 54% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java index 5b80870d..d929f5b3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputMessageContent.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent; +package org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java index fafdae30..1e04f6d8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent; +package org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.methods.ParseMode; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.ParseMode; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java index aa316281..5b8c749f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent; +package org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResult.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResult.java similarity index 51% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResult.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResult.java index 6789f287..6b6b6930 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResult.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResult.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultArticle.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultArticle.java index ba4e4c41..f066591c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultArticle.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java index 0a408ed4..620599f8 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultAudio.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultContact.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultContact.java index 33522758..57da922d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultContact.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultDocument.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultDocument.java index e5b0c9ef..0f4fbe75 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultDocument.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java index bd854e90..bc30b2c9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGame.java @@ -15,12 +15,12 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGif.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGif.java index 294a85bd..5ae46227 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultGif.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultLocation.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultLocation.java index a1ff830e..978e6995 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultLocation.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java index d72e66e9..7b1cb0fc 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultPhoto.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultPhoto.java index cfe9fc65..7905bc34 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultPhoto.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVenue.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVenue.java index 894e7e29..caed052a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVenue.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVideo.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVideo.java index 46ac1f41..1f49f1da 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVideo.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java index 7ba42e71..d678060f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/InlineQueryResultVoice.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java index 179576f0..bb5d0298 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java index 2aef452d..5b13d647 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java index fa184357..4d60e6df 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java index 08d61904..0a4a222d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java index 3e42d5b6..4ebd2d06 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java index b19f313a..9fb2558f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java index 71d3af36..a46c5d43 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java index 665e25bd..3f110df3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java @@ -1,11 +1,11 @@ -package org.telegram.telegrambots.api.objects.inlinequery.result.chached; +package org.telegram.telegrambots.meta.api.objects.inlinequery.result.chached; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMedia.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMedia.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java index 327ffe32..b29b076f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMedia.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMedia.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.media; +package org.telegram.telegrambots.meta.api.objects.media; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.io.File; import java.io.InputStream; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMediaPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMediaPhoto.java similarity index 80% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMediaPhoto.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMediaPhoto.java index 8e1f1297..e6fd2d98 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMediaPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMediaPhoto.java @@ -1,6 +1,6 @@ -package org.telegram.telegrambots.api.objects.media; +package org.telegram.telegrambots.meta.api.objects.media; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMediaVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMediaVideo.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMediaVideo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMediaVideo.java index a4d90f2e..5b4367c6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/media/InputMediaVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/media/InputMediaVideo.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.media; +package org.telegram.telegrambots.meta.api.objects.media; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/Invoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/Invoice.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/Invoice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/Invoice.java index 86c1077c..43ab5fc4 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/Invoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/Invoice.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.PhotoSize; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.PhotoSize; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/LabeledPrice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/LabeledPrice.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java index 42603e47..38f03403 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/LabeledPrice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/LabeledPrice.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/OrderInfo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/OrderInfo.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/OrderInfo.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/OrderInfo.java index 30062eeb..7bfbef5a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/OrderInfo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/OrderInfo.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/PreCheckoutQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/PreCheckoutQuery.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/PreCheckoutQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/PreCheckoutQuery.java index 13ac2f69..839c95e9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/PreCheckoutQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/PreCheckoutQuery.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.User; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingAddress.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingAddress.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingAddress.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingAddress.java index afdd6b90..085d7325 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingAddress.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingAddress.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingOption.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingOption.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java index f24ce208..58a6446f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingOption.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingOption.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingQuery.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingQuery.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingQuery.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingQuery.java index 637fe58b..c636089a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/ShippingQuery.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/ShippingQuery.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.User; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/SuccessfulPayment.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/SuccessfulPayment.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/SuccessfulPayment.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/SuccessfulPayment.java index c8478b01..2d4ddbc0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/payments/SuccessfulPayment.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/payments/SuccessfulPayment.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.payments; +package org.telegram.telegrambots.meta.api.objects.payments; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ApiResponse.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ApiResponse.java index 6d50db3b..7575476c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ApiResponse.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.replykeyboard; +package org.telegram.telegrambots.meta.api.objects.replykeyboard; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.ResponseParameters; +import org.telegram.telegrambots.meta.api.objects.ResponseParameters; import java.io.Serializable; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ForceReplyKeyboard.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ForceReplyKeyboard.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ForceReplyKeyboard.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ForceReplyKeyboard.java index a68c9542..2aee1d86 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ForceReplyKeyboard.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ForceReplyKeyboard.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.replykeyboard; +package org.telegram.telegrambots.meta.api.objects.replykeyboard; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/InlineKeyboardMarkup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/InlineKeyboardMarkup.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java index c5bf9d62..126707b0 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/InlineKeyboardMarkup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/InlineKeyboardMarkup.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.replykeyboard; +package org.telegram.telegrambots.meta.api.objects.replykeyboard; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.ArrayList; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboard.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboard.java new file mode 100644 index 00000000..86f6e38a --- /dev/null +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboard.java @@ -0,0 +1,13 @@ +package org.telegram.telegrambots.meta.api.objects.replykeyboard; + +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; + +/** + * @author Ruben Bermudez + * @version 1.0 + * @brief Reply keyboard abstract type + * @date 20 of June of 2015 + */ +public interface ReplyKeyboard extends InputBotApiObject, Validable { +} diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardMarkup.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardMarkup.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java index c410907c..4cd5ebd9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardMarkup.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardMarkup.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.replykeyboard; +package org.telegram.telegrambots.meta.api.objects.replykeyboard; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.ArrayList; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardRemove.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardRemove.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java index 279101ea..d9f38e85 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardRemove.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/ReplyKeyboardRemove.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.api.objects.replykeyboard; +package org.telegram.telegrambots.meta.api.objects.replykeyboard; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/InlineKeyboardButton.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/InlineKeyboardButton.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java index d40cdfff..3f79198a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/InlineKeyboardButton.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/InlineKeyboardButton.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.replykeyboard.buttons; +package org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.api.objects.games.CallbackGame; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.api.objects.games.CallbackGame; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardButton.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardButton.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java index 42575dcd..288c37bc 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardButton.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardButton.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.api.objects.replykeyboard.buttons; +package org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.Objects; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardRow.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardRow.java similarity index 84% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardRow.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardRow.java index 4cdf618f..571e19d6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardRow.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/replykeyboard/buttons/KeyboardRow.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.replykeyboard.buttons; +package org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/MaskPosition.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java similarity index 90% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/MaskPosition.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java index 599ea24e..8f1e1306 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/MaskPosition.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/MaskPosition.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.stickers; +package org.telegram.telegrambots.meta.api.objects.stickers; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.interfaces.Validable; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.Validable; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/Sticker.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/Sticker.java similarity index 93% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/Sticker.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/Sticker.java index a5b08951..c44356d3 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/Sticker.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/Sticker.java @@ -1,9 +1,9 @@ -package org.telegram.telegrambots.api.objects.stickers; +package org.telegram.telegrambots.meta.api.objects.stickers; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; -import org.telegram.telegrambots.api.objects.PhotoSize; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.objects.PhotoSize; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/StickerSet.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/StickerSet.java similarity index 91% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/StickerSet.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/StickerSet.java index 20fb1e20..a70f9241 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/stickers/StickerSet.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/objects/stickers/StickerSet.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.api.objects.stickers; +package org.telegram.telegrambots.meta.api.objects.stickers; import com.fasterxml.jackson.annotation.JsonProperty; -import org.telegram.telegrambots.api.interfaces.BotApiObject; +import org.telegram.telegrambots.meta.api.interfaces.BotApiObject; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/bots/AbsSender.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/bots/AbsSender.java similarity index 95% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/bots/AbsSender.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/bots/AbsSender.java index b0734bf8..96ffe561 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/bots/AbsSender.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/bots/AbsSender.java @@ -1,25 +1,25 @@ -package org.telegram.telegrambots.bots; +package org.telegram.telegrambots.meta.bots; -import org.telegram.telegrambots.api.methods.*; -import org.telegram.telegrambots.api.methods.games.GetGameHighScores; -import org.telegram.telegrambots.api.methods.games.SetGameScore; -import org.telegram.telegrambots.api.methods.groupadministration.*; -import org.telegram.telegrambots.api.methods.pinnedmessages.PinChatMessage; -import org.telegram.telegrambots.api.methods.pinnedmessages.UnpinChatMessage; -import org.telegram.telegrambots.api.methods.send.*; -import org.telegram.telegrambots.api.methods.stickers.AddStickerToSet; -import org.telegram.telegrambots.api.methods.stickers.CreateNewStickerSet; -import org.telegram.telegrambots.api.methods.stickers.UploadStickerFile; -import org.telegram.telegrambots.api.methods.updates.DeleteWebhook; -import org.telegram.telegrambots.api.methods.updates.GetWebhookInfo; -import org.telegram.telegrambots.api.methods.updatingmessages.DeleteMessage; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageCaption; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageReplyMarkup; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageText; -import org.telegram.telegrambots.api.objects.*; -import org.telegram.telegrambots.api.objects.games.GameHighScore; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.updateshandlers.SentCallback; +import org.telegram.telegrambots.meta.api.methods.*; +import org.telegram.telegrambots.meta.api.methods.games.GetGameHighScores; +import org.telegram.telegrambots.meta.api.methods.games.SetGameScore; +import org.telegram.telegrambots.meta.api.methods.groupadministration.*; +import org.telegram.telegrambots.meta.api.methods.pinnedmessages.PinChatMessage; +import org.telegram.telegrambots.meta.api.methods.pinnedmessages.UnpinChatMessage; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.stickers.AddStickerToSet; +import org.telegram.telegrambots.meta.api.methods.stickers.CreateNewStickerSet; +import org.telegram.telegrambots.meta.api.methods.stickers.UploadStickerFile; +import org.telegram.telegrambots.meta.api.methods.updates.DeleteWebhook; +import org.telegram.telegrambots.meta.api.methods.updates.GetWebhookInfo; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.DeleteMessage; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageCaption; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageReplyMarkup; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText; +import org.telegram.telegrambots.meta.api.objects.*; +import org.telegram.telegrambots.meta.api.objects.games.GameHighScore; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.updateshandlers.SentCallback; import java.io.Serializable; import java.util.ArrayList; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiException.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiException.java similarity index 96% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiException.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiException.java index 3bc0176a..44ef8e46 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiException.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiException.java @@ -15,7 +15,7 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.exceptions; +package org.telegram.telegrambots.meta.exceptions; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiRequestException.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiRequestException.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java index 6f40a135..239b403f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiRequestException.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiRequestException.java @@ -15,14 +15,14 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.exceptions; +package org.telegram.telegrambots.meta.exceptions; import com.fasterxml.jackson.databind.ObjectMapper; import org.json.JSONObject; -import org.telegram.telegrambots.api.objects.ResponseParameters; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.objects.ResponseParameters; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.IOException; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiValidationException.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiValidationException.java similarity index 89% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiValidationException.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiValidationException.java index 719d9cf8..69e2c5b9 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/exceptions/TelegramApiValidationException.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/exceptions/TelegramApiValidationException.java @@ -15,10 +15,10 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.exceptions; +package org.telegram.telegrambots.meta.exceptions; -import org.telegram.telegrambots.api.interfaces.InputBotApiObject; -import org.telegram.telegrambots.api.methods.PartialBotApiMethod; +import org.telegram.telegrambots.meta.api.interfaces.InputBotApiObject; +import org.telegram.telegrambots.meta.api.methods.PartialBotApiMethod; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/BotOptions.java similarity index 71% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/BotOptions.java index 912d2857..137960fd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/BotOptions.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/BotSession.java similarity index 92% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/BotSession.java index b3cb8400..c48a7e1e 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/BotSession.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/LongPollingBot.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/LongPollingBot.java similarity index 87% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/LongPollingBot.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/LongPollingBot.java index 32118616..7d76c100 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/LongPollingBot.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/LongPollingBot.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import java.util.List; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/UpdatesHandler.java similarity index 71% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/UpdatesHandler.java index c5c04e3c..0bc55898 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/UpdatesHandler.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/UpdatesReader.java similarity index 72% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/UpdatesReader.java index 540bcb91..f9dbda4a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/UpdatesReader.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/Webhook.java similarity index 73% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/Webhook.java index 0e6b9d9d..09e3b7e6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/Webhook.java @@ -1,6 +1,6 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/WebhookBot.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/WebhookBot.java similarity index 80% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/WebhookBot.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/WebhookBot.java index 18043aa5..a66cde5f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/WebhookBot.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/WebhookBot.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.generics; +package org.telegram.telegrambots.meta.generics; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/BotLogger.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/BotLogger.java similarity index 99% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/BotLogger.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/BotLogger.java index 864dff64..cb8b3bce 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/BotLogger.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/BotLogger.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.logging; +package org.telegram.telegrambots.meta.logging; import java.util.logging.Handler; import java.util.logging.Level; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/BotsFileHandler.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/BotsFileHandler.java similarity index 96% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/BotsFileHandler.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/BotsFileHandler.java index 6a2c8cd2..0da14c3f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/BotsFileHandler.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/BotsFileHandler.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.logging; +package org.telegram.telegrambots.meta.logging; import java.io.IOException; import java.util.logging.FileHandler; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/FileFormatter.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/FileFormatter.java similarity index 97% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/FileFormatter.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/FileFormatter.java index aec305b5..ca6a1e4b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/logging/FileFormatter.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/logging/FileFormatter.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.logging; +package org.telegram.telegrambots.meta.logging; import java.time.LocalDateTime; import java.util.logging.Formatter; diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/updateshandlers/DownloadFileCallback.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/updateshandlers/DownloadFileCallback.java similarity index 94% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/updateshandlers/DownloadFileCallback.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/updateshandlers/DownloadFileCallback.java index 2ba7e1aa..7adee039 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/updateshandlers/DownloadFileCallback.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/updateshandlers/DownloadFileCallback.java @@ -15,7 +15,7 @@ * along with TelegramBots. If not, see . */ -package org.telegram.telegrambots.updateshandlers; +package org.telegram.telegrambots.meta.updateshandlers; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/updateshandlers/SentCallback.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/updateshandlers/SentCallback.java similarity index 82% rename from telegrambots-meta/src/main/java/org/telegram/telegrambots/updateshandlers/SentCallback.java rename to telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/updateshandlers/SentCallback.java index d7a3bf56..0b7bcaa6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/updateshandlers/SentCallback.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/updateshandlers/SentCallback.java @@ -1,7 +1,7 @@ -package org.telegram.telegrambots.updateshandlers; +package org.telegram.telegrambots.meta.updateshandlers; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import java.io.Serializable; diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/api/methods/send/SendMessageTest.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/send/SendMessageTest.java similarity index 93% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/api/methods/send/SendMessageTest.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/send/SendMessageTest.java index d5854ece..a56a4350 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/api/methods/send/SendMessageTest.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/api/methods/send/SendMessageTest.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.api.methods.send; +package org.telegram.telegrambots.meta.api.methods.send; import org.junit.Test; diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TelegramBotsHelper.java similarity index 99% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TelegramBotsHelper.java index b071515a..05f6dd36 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TelegramBotsHelper.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.test; +package org.telegram.telegrambots.meta.test; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestDeserialization.java similarity index 91% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestDeserialization.java index 9968df5b..8662a746 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestDeserialization.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.test; +package org.telegram.telegrambots.meta.test; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -6,19 +6,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.telegram.telegrambots.api.objects.Audio; -import org.telegram.telegrambots.api.objects.CallbackQuery; -import org.telegram.telegrambots.api.objects.Chat; -import org.telegram.telegrambots.api.objects.Document; -import org.telegram.telegrambots.api.objects.EntityType; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.MessageEntity; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.api.objects.User; -import org.telegram.telegrambots.api.objects.Voice; -import org.telegram.telegrambots.api.objects.inlinequery.ChosenInlineQuery; -import org.telegram.telegrambots.api.objects.inlinequery.InlineQuery; -import org.telegram.telegrambots.api.objects.replykeyboard.ApiResponse; +import org.telegram.telegrambots.meta.api.objects.Audio; +import org.telegram.telegrambots.meta.api.objects.CallbackQuery; +import org.telegram.telegrambots.meta.api.objects.Chat; +import org.telegram.telegrambots.meta.api.objects.Document; +import org.telegram.telegrambots.meta.api.objects.EntityType; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.MessageEntity; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.Voice; +import org.telegram.telegrambots.meta.api.objects.inlinequery.ChosenInlineQuery; +import org.telegram.telegrambots.meta.api.objects.inlinequery.InlineQuery; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ApiResponse; import java.io.IOException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestTelegramApi.java similarity index 82% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestTelegramApi.java index 7e446351..45b28c36 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/TestTelegramApi.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.test; +package org.telegram.telegrambots.meta.test; import org.junit.Assert; import org.junit.Test; -import org.telegram.telegrambots.TelegramBotsApi; -import org.telegram.telegrambots.test.base.TestBase; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.TelegramBotsApi; +import org.telegram.telegrambots.meta.test.base.TestBase; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestAnswerInlineQuery.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java similarity index 95% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestAnswerInlineQuery.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java index 49467789..04f77a73 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestAnswerInlineQuery.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestAnswerInlineQuery.java @@ -1,10 +1,10 @@ -package org.telegram.telegrambots.test.apimethods; +package org.telegram.telegrambots.meta.test.apimethods; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.telegram.telegrambots.api.methods.AnswerInlineQuery; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.AnswerInlineQuery; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestGetUpdates.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestGetUpdates.java similarity index 83% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestGetUpdates.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestGetUpdates.java index f782da98..9b4f8659 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestGetUpdates.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestGetUpdates.java @@ -1,14 +1,14 @@ -package org.telegram.telegrambots.test.apimethods; +package org.telegram.telegrambots.meta.test.apimethods; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.telegram.telegrambots.test.TelegramBotsHelper; -import org.telegram.telegrambots.api.methods.updates.GetUpdates; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.test.TelegramBotsHelper; +import org.telegram.telegrambots.meta.api.methods.updates.GetUpdates; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import java.util.ArrayList; diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestSetGameScore.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestSetGameScore.java similarity index 87% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestSetGameScore.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestSetGameScore.java index ba0d2bf8..a04a9812 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/apimethods/TestSetGameScore.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/apimethods/TestSetGameScore.java @@ -1,13 +1,13 @@ -package org.telegram.telegrambots.test.apimethods; +package org.telegram.telegrambots.meta.test.apimethods; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.telegram.telegrambots.test.TelegramBotsHelper; -import org.telegram.telegrambots.api.methods.games.SetGameScore; -import org.telegram.telegrambots.api.objects.Message; +import org.telegram.telegrambots.meta.test.TelegramBotsHelper; +import org.telegram.telegrambots.meta.api.methods.games.SetGameScore; +import org.telegram.telegrambots.meta.api.objects.Message; import java.io.Serializable; diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/asserts/ApiAssert.java similarity index 67% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/asserts/ApiAssert.java index 8fffcaf6..808dc94d 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/asserts/ApiAssert.java @@ -1,4 +1,4 @@ -package org.telegram.telegrambots.test.asserts; +package org.telegram.telegrambots.meta.test.asserts; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/base/TestBase.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/base/TestBase.java new file mode 100644 index 00000000..14c18240 --- /dev/null +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/base/TestBase.java @@ -0,0 +1,21 @@ +package org.telegram.telegrambots.meta.test.base; + +import org.junit.BeforeClass; +import org.telegram.telegrambots.meta.ApiContext; +import org.telegram.telegrambots.meta.test.fakes.FakeBotSession; +import org.telegram.telegrambots.meta.test.fakes.FakeWebhook; +import org.telegram.telegrambots.meta.generics.BotSession; +import org.telegram.telegrambots.meta.generics.Webhook; + +/** + * @author Ruben Bermudez + * @version 1.0 + */ +public abstract class TestBase { + + @BeforeClass + public static void beforeClass() { + ApiContext.register(BotSession.class, FakeBotSession.class); + ApiContext.register(Webhook.class, FakeWebhook.class); + } +} diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/fakes/FakeBotSession.java similarity index 67% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/fakes/FakeBotSession.java index dc0b9e52..f4ef59a8 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/fakes/FakeBotSession.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.test.fakes; +package org.telegram.telegrambots.meta.test.fakes; -import org.telegram.telegrambots.generics.BotOptions; -import org.telegram.telegrambots.generics.BotSession; -import org.telegram.telegrambots.generics.LongPollingBot; +import org.telegram.telegrambots.meta.generics.BotOptions; +import org.telegram.telegrambots.meta.generics.BotSession; +import org.telegram.telegrambots.meta.generics.LongPollingBot; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/fakes/FakeWebhook.java similarity index 78% rename from telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java rename to telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/fakes/FakeWebhook.java index d38ebdbe..b0dc839d 100644 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java +++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/meta/test/fakes/FakeWebhook.java @@ -1,8 +1,8 @@ -package org.telegram.telegrambots.test.fakes; +package org.telegram.telegrambots.meta.test.fakes; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.generics.Webhook; -import org.telegram.telegrambots.generics.WebhookBot; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.Webhook; +import org.telegram.telegrambots.meta.generics.WebhookBot; /** * @author Ruben Bermudez diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java deleted file mode 100644 index b6867945..00000000 --- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.telegram.telegrambots.test.base; - -import org.junit.BeforeClass; -import org.telegram.telegrambots.ApiContext; -import org.telegram.telegrambots.test.fakes.FakeBotSession; -import org.telegram.telegrambots.test.fakes.FakeWebhook; -import org.telegram.telegrambots.generics.BotSession; -import org.telegram.telegrambots.generics.Webhook; - -/** - * @author Ruben Bermudez - * @version 1.0 - */ -public abstract class TestBase { - - @BeforeClass - public static void beforeClass() { - ApiContext.register(BotSession.class, FakeBotSession.class); - ApiContext.register(Webhook.class, FakeWebhook.class); - } -} diff --git a/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java b/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java index ec851dc0..26e48804 100644 --- a/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java +++ b/telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java @@ -5,10 +5,10 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.telegram.telegrambots.TelegramBotsApi; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.generics.LongPollingBot; -import org.telegram.telegrambots.generics.WebhookBot; +import org.telegram.telegrambots.meta.TelegramBotsApi; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.generics.LongPollingBot; +import org.telegram.telegrambots.meta.generics.WebhookBot; import java.util.List; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java b/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java index e6126c8b..325106bd 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java @@ -1,7 +1,8 @@ package org.telegram.telegrambots; -import org.telegram.telegrambots.generics.BotSession; -import org.telegram.telegrambots.generics.Webhook; +import org.telegram.telegrambots.meta.generics.BotSession; +import org.telegram.telegrambots.meta.generics.Webhook; +import org.telegram.telegrambots.meta.ApiContext; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; import org.telegram.telegrambots.updatesreceivers.DefaultWebhook; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java index 400ab4b9..e832e8dd 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java @@ -6,30 +6,28 @@ import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; -import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.ProxyAuthenticationStrategy; import org.apache.http.util.EntityUtils; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.groupadministration.SetChatPhoto; -import org.telegram.telegrambots.api.methods.send.*; -import org.telegram.telegrambots.api.methods.stickers.AddStickerToSet; -import org.telegram.telegrambots.api.methods.stickers.CreateNewStickerSet; -import org.telegram.telegrambots.api.methods.stickers.UploadStickerFile; -import org.telegram.telegrambots.api.objects.File; -import org.telegram.telegrambots.api.objects.Message; -import org.telegram.telegrambots.api.objects.media.InputMedia; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.groupadministration.SetChatPhoto; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.stickers.AddStickerToSet; +import org.telegram.telegrambots.meta.api.methods.stickers.CreateNewStickerSet; +import org.telegram.telegrambots.meta.api.methods.stickers.UploadStickerFile; +import org.telegram.telegrambots.meta.api.objects.File; +import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.meta.api.objects.media.InputMedia; +import org.telegram.telegrambots.meta.bots.AbsSender; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; import org.telegram.telegrambots.facilities.TelegramHttpClientBuilder; -import org.telegram.telegrambots.updateshandlers.DownloadFileCallback; -import org.telegram.telegrambots.updateshandlers.SentCallback; +import org.telegram.telegrambots.meta.updateshandlers.DownloadFileCallback; +import org.telegram.telegrambots.meta.updateshandlers.SentCallback; import java.io.IOException; import java.io.Serializable; @@ -39,7 +37,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import static org.telegram.telegrambots.Constants.SOCKET_TIMEOUT; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java index f965ab91..39b14af8 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java @@ -3,8 +3,8 @@ package org.telegram.telegrambots.bots; import org.apache.http.HttpHost; import org.apache.http.client.CredentialsProvider; import org.apache.http.client.config.RequestConfig; -import org.telegram.telegrambots.ApiConstants; -import org.telegram.telegrambots.generics.BotOptions; +import org.telegram.telegrambots.meta.ApiConstants; +import org.telegram.telegrambots.meta.generics.BotOptions; import org.telegram.telegrambots.updatesreceivers.ExponentialBackOff; import java.util.List; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java index 4ed163c7..b67a84ed 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java @@ -1,10 +1,10 @@ package org.telegram.telegrambots.bots; -import org.telegram.telegrambots.ApiContext; -import org.telegram.telegrambots.api.methods.updates.DeleteWebhook; -import org.telegram.telegrambots.exceptions.TelegramApiException; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.generics.LongPollingBot; +import org.telegram.telegrambots.meta.ApiContext; +import org.telegram.telegrambots.meta.api.methods.updates.DeleteWebhook; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.LongPollingBot; /** * @author Ruben Bermudez diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java index 9b2ff0ec..61f2eeae 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java @@ -3,22 +3,20 @@ package org.telegram.telegrambots.bots; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; -import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.telegram.telegrambots.ApiConstants; -import org.telegram.telegrambots.ApiContext; -import org.telegram.telegrambots.api.methods.updates.SetWebhook; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.ApiConstants; +import org.telegram.telegrambots.meta.ApiContext; +import org.telegram.telegrambots.meta.api.methods.updates.SetWebhook; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.facilities.TelegramHttpClientBuilder; -import org.telegram.telegrambots.generics.WebhookBot; +import org.telegram.telegrambots.meta.generics.WebhookBot; import java.io.File; import java.io.IOException; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java index 6e6b56b9..44c92fa6 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java @@ -6,23 +6,20 @@ import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; -import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.entity.BufferedHttpEntity; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.ProxyAuthenticationStrategy; import org.apache.http.util.EntityUtils; import org.json.JSONException; -import org.telegram.telegrambots.ApiConstants; -import org.telegram.telegrambots.api.methods.updates.GetUpdates; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.ApiConstants; +import org.telegram.telegrambots.meta.api.methods.updates.GetUpdates; +import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.bots.DefaultBotOptions; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; import org.telegram.telegrambots.facilities.TelegramHttpClientBuilder; -import org.telegram.telegrambots.generics.*; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.generics.*; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.io.IOException; import java.io.InvalidObjectException; @@ -32,7 +29,6 @@ import java.nio.charset.StandardCharsets; import java.security.InvalidParameterException; import java.util.*; import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.TimeUnit; import static org.telegram.telegrambots.Constants.SOCKET_TIMEOUT; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultWebhook.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultWebhook.java index 1e9d5384..4a8c4d31 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultWebhook.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultWebhook.java @@ -8,9 +8,9 @@ import org.glassfish.grizzly.ssl.SSLEngineConfigurator; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.server.ResourceConfig; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.generics.Webhook; -import org.telegram.telegrambots.generics.WebhookBot; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.Webhook; +import org.telegram.telegrambots.meta.generics.WebhookBot; import java.io.File; import java.io.IOException; diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java index 0bea565b..baf3a046 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java @@ -1,10 +1,10 @@ package org.telegram.telegrambots.updatesreceivers; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.exceptions.TelegramApiValidationException; -import org.telegram.telegrambots.generics.WebhookBot; -import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException; +import org.telegram.telegrambots.meta.generics.WebhookBot; +import org.telegram.telegrambots.meta.logging.BotLogger; import java.util.concurrent.ConcurrentHashMap; diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java index 9b8be88d..7cd9c3f2 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java @@ -1,41 +1,41 @@ package org.telegram.telegrambots.test; -import org.telegram.telegrambots.api.methods.ActionType; -import org.telegram.telegrambots.api.methods.AnswerCallbackQuery; -import org.telegram.telegrambots.api.methods.AnswerInlineQuery; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.methods.ForwardMessage; -import org.telegram.telegrambots.api.methods.GetFile; -import org.telegram.telegrambots.api.methods.GetMe; -import org.telegram.telegrambots.api.methods.GetUserProfilePhotos; -import org.telegram.telegrambots.api.methods.ParseMode; -import org.telegram.telegrambots.api.methods.games.GetGameHighScores; -import org.telegram.telegrambots.api.methods.games.SetGameScore; -import org.telegram.telegrambots.api.methods.groupadministration.GetChat; -import org.telegram.telegrambots.api.methods.groupadministration.GetChatAdministrators; -import org.telegram.telegrambots.api.methods.groupadministration.GetChatMember; -import org.telegram.telegrambots.api.methods.groupadministration.GetChatMemberCount; -import org.telegram.telegrambots.api.methods.groupadministration.KickChatMember; -import org.telegram.telegrambots.api.methods.groupadministration.LeaveChat; -import org.telegram.telegrambots.api.methods.groupadministration.UnbanChatMember; -import org.telegram.telegrambots.api.methods.send.*; -import org.telegram.telegrambots.api.methods.updates.GetWebhookInfo; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageCaption; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageReplyMarkup; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageText; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultArticle; -import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultPhoto; -import org.telegram.telegrambots.api.objects.payments.LabeledPrice; -import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboard; -import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardButton; -import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; +import org.telegram.telegrambots.meta.api.methods.ActionType; +import org.telegram.telegrambots.meta.api.methods.AnswerCallbackQuery; +import org.telegram.telegrambots.meta.api.methods.AnswerInlineQuery; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.ForwardMessage; +import org.telegram.telegrambots.meta.api.methods.GetFile; +import org.telegram.telegrambots.meta.api.methods.GetMe; +import org.telegram.telegrambots.meta.api.methods.GetUserProfilePhotos; +import org.telegram.telegrambots.meta.api.methods.ParseMode; +import org.telegram.telegrambots.meta.api.methods.games.GetGameHighScores; +import org.telegram.telegrambots.meta.api.methods.games.SetGameScore; +import org.telegram.telegrambots.meta.api.methods.groupadministration.GetChat; +import org.telegram.telegrambots.meta.api.methods.groupadministration.GetChatAdministrators; +import org.telegram.telegrambots.meta.api.methods.groupadministration.GetChatMember; +import org.telegram.telegrambots.meta.api.methods.groupadministration.GetChatMemberCount; +import org.telegram.telegrambots.meta.api.methods.groupadministration.KickChatMember; +import org.telegram.telegrambots.meta.api.methods.groupadministration.LeaveChat; +import org.telegram.telegrambots.meta.api.methods.groupadministration.UnbanChatMember; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.updates.GetWebhookInfo; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageCaption; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageReplyMarkup; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultArticle; +import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultPhoto; +import org.telegram.telegrambots.meta.api.objects.payments.LabeledPrice; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ForceReplyKeyboard; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboard; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardButton; +import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow; import java.util.ArrayList; import java.util.List; diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeLongPollingBot.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeLongPollingBot.java index 29e55ad0..6a6733ca 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeLongPollingBot.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeLongPollingBot.java @@ -1,10 +1,10 @@ package org.telegram.telegrambots.test.Fakes; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.bots.DefaultBotOptions; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.generics.BotOptions; -import org.telegram.telegrambots.generics.LongPollingBot; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.BotOptions; +import org.telegram.telegrambots.meta.generics.LongPollingBot; /** * @author Ruben Bermudez diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeWebhook.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeWebhook.java index f5a65b82..c79fa808 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeWebhook.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/Fakes/FakeWebhook.java @@ -1,9 +1,9 @@ package org.telegram.telegrambots.test.Fakes; -import org.telegram.telegrambots.api.methods.BotApiMethod; -import org.telegram.telegrambots.api.objects.Update; -import org.telegram.telegrambots.exceptions.TelegramApiRequestException; -import org.telegram.telegrambots.generics.WebhookBot; +import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException; +import org.telegram.telegrambots.meta.generics.WebhookBot; /** * @author Ruben Bermudez diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/TelegramLongPollingBotTest.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/TelegramLongPollingBotTest.java index 992ee446..21ea2f08 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/test/TelegramLongPollingBotTest.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/TelegramLongPollingBotTest.java @@ -2,7 +2,7 @@ package org.telegram.telegrambots.test; import org.junit.Test; import org.mockito.Mockito; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.bots.DefaultBotOptions; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/TestDefaultBotSession.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/TestDefaultBotSession.java index 17d4aa65..206ee35d 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/test/TestDefaultBotSession.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/TestDefaultBotSession.java @@ -13,9 +13,9 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; import org.mockito.Mockito; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.bots.DefaultBotOptions; -import org.telegram.telegrambots.generics.LongPollingBot; +import org.telegram.telegrambots.meta.generics.LongPollingBot; import org.telegram.telegrambots.test.Fakes.FakeLongPollingBot; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java index 0cf6f510..15123914 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java @@ -7,16 +7,16 @@ import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.Before; import org.junit.Test; -import org.telegram.telegrambots.api.methods.*; -import org.telegram.telegrambots.api.methods.games.GetGameHighScores; -import org.telegram.telegrambots.api.methods.games.SetGameScore; -import org.telegram.telegrambots.api.methods.groupadministration.*; -import org.telegram.telegrambots.api.methods.send.*; -import org.telegram.telegrambots.api.methods.updates.GetWebhookInfo; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageCaption; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageReplyMarkup; -import org.telegram.telegrambots.api.methods.updatingmessages.EditMessageText; -import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.meta.api.methods.*; +import org.telegram.telegrambots.meta.api.methods.games.GetGameHighScores; +import org.telegram.telegrambots.meta.api.methods.games.SetGameScore; +import org.telegram.telegrambots.meta.api.methods.groupadministration.*; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.updates.GetWebhookInfo; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageCaption; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageReplyMarkup; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageText; +import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.test.Fakes.FakeWebhook; import org.telegram.telegrambots.updatesreceivers.RestApi; @@ -59,7 +59,7 @@ public class TestRestApi extends JerseyTest { target("callback/testbot") .request(MediaType.APPLICATION_JSON) .post(entity, SendMessage.class); - assertEquals("{\"chat_id\":\"@test\",\"text\":\"Hithere\",\"parse_mode\":\"html\",\"reply_to_message_id\":12,\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard\",\"force_reply\":true},\"method\":\"sendmessage\"}", map(result)); + assertEquals("{\"chat_id\":\"@test\",\"text\":\"Hithere\",\"parse_mode\":\"html\",\"reply_to_message_id\":12,\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.ForceReplyKeyboard\",\"force_reply\":true},\"method\":\"sendmessage\"}", map(result)); } @Test @@ -85,7 +85,7 @@ public class TestRestApi extends JerseyTest { .request(MediaType.APPLICATION_JSON) .post(entity, AnswerInlineQuery.class); - assertEquals("{\"personal\":true,\"inline_query_id\":\"id\",\"results\":[{\"@class\":\"org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultArticle\",\"type\":\"article\",\"id\":\"0\",\"title\":\"Title\",\"input_message_content\":{\"@class\":\"org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent\",\"message_text\":\"Text\",\"parse_mode\":\"Markdown\"},\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup\",\"inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton\",\"text\":\"Button1\",\"callback_data\":\"Callback\"}]]},\"url\":\"Url\",\"hide_url\":false,\"description\":\"Description\",\"thumb_url\":\"ThumbUrl\",\"thumb_width\":10,\"thumb_height\":20},{\"@class\":\"org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultPhoto\",\"type\":\"photo\",\"id\":\"1\",\"photo_url\":\"PhotoUrl\",\"mime_type\":\"image/jpg\",\"photo_width\":10,\"photo_height\":20,\"thumb_url\":\"ThumbUrl\",\"title\":\"Title\",\"description\":\"Description\",\"caption\":\"Caption\",\"input_message_content\":{\"@class\":\"org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent\",\"message_text\":\"Text\",\"parse_mode\":\"Markdown\"},\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup\",\"inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton\",\"text\":\"Button1\",\"callback_data\":\"Callback\"}]]}}],\"cache_time\":100,\"is_personal\":true,\"next_offset\":\"3\",\"switch_pm_text\":\"pmText\",\"switch_pm_parameter\":\"PmParameter\",\"method\":\"answerInlineQuery\"}", map(result)); + assertEquals("{\"personal\":true,\"inline_query_id\":\"id\",\"results\":[{\"@class\":\"org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultArticle\",\"type\":\"article\",\"id\":\"0\",\"title\":\"Title\",\"input_message_content\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent\",\"message_text\":\"Text\",\"parse_mode\":\"Markdown\"},\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup\",\"inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton\",\"text\":\"Button1\",\"callback_data\":\"Callback\"}]]},\"url\":\"Url\",\"hide_url\":false,\"description\":\"Description\",\"thumb_url\":\"ThumbUrl\",\"thumb_width\":10,\"thumb_height\":20},{\"@class\":\"org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultPhoto\",\"type\":\"photo\",\"id\":\"1\",\"photo_url\":\"PhotoUrl\",\"mime_type\":\"image/jpg\",\"photo_width\":10,\"photo_height\":20,\"thumb_url\":\"ThumbUrl\",\"title\":\"Title\",\"description\":\"Description\",\"caption\":\"Caption\",\"input_message_content\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent\",\"message_text\":\"Text\",\"parse_mode\":\"Markdown\"},\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup\",\"inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton\",\"text\":\"Button1\",\"callback_data\":\"Callback\"}]]}}],\"cache_time\":100,\"is_personal\":true,\"next_offset\":\"3\",\"switch_pm_text\":\"pmText\",\"switch_pm_parameter\":\"PmParameter\",\"method\":\"answerInlineQuery\"}", map(result)); } @Test @@ -99,9 +99,9 @@ public class TestRestApi extends JerseyTest { .post(entity, EditMessageCaption.class); assertEquals("{\"chat_id\":\"ChatId\",\"message_id\":1,\"caption\":\"Caption\"," + - "\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard" + + "\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard" + ".InlineKeyboardMarkup\",\"inline_keyboard\":[[{\"@class\":\"org.telegram." + - "telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton\"," + + "telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton\"," + "\"text\":\"Button1\",\"callback_data\":\"Callback\"}]]},\"method\":" + "\"editmessagecaption\"}", map(result)); } @@ -117,8 +117,8 @@ public class TestRestApi extends JerseyTest { .post(entity, EditMessageReplyMarkup.class); assertEquals("{\"inline_message_id\":\"12345\",\"reply_markup\":{\"@class\":\"org" + - ".telegram.telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup\"," + - "\"inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.api.objects." + + ".telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup\"," + + "\"inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.meta.api.objects." + "replykeyboard.buttons.InlineKeyboardButton\",\"text\":\"Button1\"," + "\"callback_data\":\"Callback\"}]]},\"method\":\"editmessagereplymarkup\"}", map(result)); @@ -136,8 +136,8 @@ public class TestRestApi extends JerseyTest { assertEquals("{\"chat_id\":\"ChatId\",\"message_id\":1,\"text\":\"Text\"," + "\"parse_mode\":\"Markdown\",\"reply_markup\":{\"@class\":\"org.telegram." + - "telegrambots.api.objects.replykeyboard.InlineKeyboardMarkup\",\"" + - "inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.api.objects." + + "telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup\",\"" + + "inline_keyboard\":[[{\"@class\":\"org.telegram.telegrambots.meta.api.objects." + "replykeyboard.buttons.InlineKeyboardButton\",\"text\":\"Button1\",\"callback_data\"" + ":\"Callback\"}]]},\"method\":\"editmessagetext\"}", map(result)); } @@ -322,7 +322,7 @@ public class TestRestApi extends JerseyTest { .request(MediaType.APPLICATION_JSON) .post(entity, SendContact.class); - assertEquals("{\"chat_id\":\"12345\",\"phone_number\":\"123456789\",\"first_name\":\"First Name\",\"last_name\":\"Last Name\",\"reply_to_message_id\":54,\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup\",\"keyboard\":[[{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardButton\",\"text\":\"Button1\",\"request_contact\":true}]],\"resize_keyboard\":true,\"one_time_keyboard\":true,\"selective\":true},\"method\":\"sendContact\"}", map(result)); + assertEquals("{\"chat_id\":\"12345\",\"phone_number\":\"123456789\",\"first_name\":\"First Name\",\"last_name\":\"Last Name\",\"reply_to_message_id\":54,\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup\",\"keyboard\":[[{\"@class\":\"org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardButton\",\"text\":\"Button1\",\"request_contact\":true}]],\"resize_keyboard\":true,\"one_time_keyboard\":true,\"selective\":true},\"method\":\"sendContact\"}", map(result)); } @Test @@ -403,7 +403,7 @@ public class TestRestApi extends JerseyTest { assertEquals("{\"chat_id\":12345,\"title\":\"Random title\",\"description\":\"Random description\"" + ",\"payload\":\"Random Payload\",\"provider_token\":\"Random provider token\",\"start_parameter\":" + "\"STARTPARAM\",\"currency\":\"EUR\",\"prices\":[{\"@class\":" + - "\"org.telegram.telegrambots.api.objects.payments.LabeledPrice\",\"label\":\"LABEL\"," + + "\"org.telegram.telegrambots.meta.api.objects.payments.LabeledPrice\",\"label\":\"LABEL\"," + "\"amount\":1000}],\"method\":\"sendinvoice\"}", map(result)); }