From da50dde9729a069d46dc0eea7c11572a3fbd78fe Mon Sep 17 00:00:00 2001 From: mrbesen Date: Fri, 8 Feb 2019 14:14:11 +0100 Subject: [PATCH] changed structure --- pom.xml | 7 ++++++- src/{ => main/java}/de/mrbesen/telegram/AsyncHandler.java | 0 .../java}/de/mrbesen/telegram/MessageBuilder.java | 0 src/{ => main/java}/de/mrbesen/telegram/TelegramAPI.java | 0 .../java}/de/mrbesen/telegram/WebhookTelegramAPI.java | 2 +- .../java}/de/mrbesen/telegram/commands/CommandHandler.java | 0 .../java}/de/mrbesen/telegram/commands/CommandManager.java | 0 .../de/mrbesen/telegram/commands/ICommandHandler.java | 0 .../de/mrbesen/telegram/commands/JSONCommandHandler.java | 0 src/{ => main/java}/de/mrbesen/telegram/event/Event.java | 0 .../java}/de/mrbesen/telegram/event/EventHandler.java | 0 .../java}/de/mrbesen/telegram/event/EventListener.java | 0 .../java}/de/mrbesen/telegram/event/EventManager.java | 0 .../mrbesen/telegram/event/events/UserCallbackEvent.java | 0 .../mrbesen/telegram/event/events/UserSendAudioEvent.java | 0 .../telegram/event/events/UserSendMessageEvent.java | 0 src/{ => main/java}/de/mrbesen/telegram/log/Log.java | 0 src/{ => main/java}/de/mrbesen/telegram/log/Log4JLog.java | 0 src/{ => main/java}/de/mrbesen/telegram/log/SimpleLog.java | 0 .../java}/de/mrbesen/telegram/objects/JSONBased.java | 0 .../java}/de/mrbesen/telegram/objects/TAudio.java | 0 .../java}/de/mrbesen/telegram/objects/TDocument.java | 0 src/{ => main/java}/de/mrbesen/telegram/objects/TFile.java | 0 .../de/mrbesen/telegram/objects/TInlineKeyboardMarkup.java | 0 .../java}/de/mrbesen/telegram/objects/TLocation.java | 0 .../java}/de/mrbesen/telegram/objects/TMessage.java | 0 .../java}/de/mrbesen/telegram/objects/TPhotoSize.java | 0 .../de/mrbesen/telegram/objects/TReplyKeyboardMarkup.java | 0 .../de/mrbesen/telegram/objects/TReplyKeyboardRemove.java | 0 .../java}/de/mrbesen/telegram/objects/TReplyMarkup.java | 0 .../java}/de/mrbesen/telegram/objects/TSendable.java | 0 src/{ => main/java}/de/mrbesen/telegram/objects/TUser.java | 0 .../de/mrbesen/telegram/objects/TUserProfilePhotos.java | 0 .../java}/de/mrbesen/telegram/objects/TVenue.java | 0 .../java}/de/mrbesen/telegram/objects/TVideo.java | 0 src/{ => main/java}/de/mrbesen/test/Main.java | 0 .../java}/de/mrbesen/test/commands/InlineKeyboardTC.java | 0 .../de/mrbesen/test/commands/ReplyKeyboardRemoveTC.java | 0 .../de/mrbesen/test/commands/ReplyKeyboardTestCase.java | 0 .../java}/de/mrbesen/test/commands/SimpleTestCase.java | 0 src/{ => main/resources}/log4j2.properties | 2 +- 41 files changed, 8 insertions(+), 3 deletions(-) rename src/{ => main/java}/de/mrbesen/telegram/AsyncHandler.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/MessageBuilder.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/TelegramAPI.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/WebhookTelegramAPI.java (97%) rename src/{ => main/java}/de/mrbesen/telegram/commands/CommandHandler.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/commands/CommandManager.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/commands/ICommandHandler.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/commands/JSONCommandHandler.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/Event.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/EventHandler.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/EventListener.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/EventManager.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/events/UserCallbackEvent.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/events/UserSendAudioEvent.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/event/events/UserSendMessageEvent.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/log/Log.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/log/Log4JLog.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/log/SimpleLog.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/JSONBased.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TAudio.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TDocument.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TFile.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TInlineKeyboardMarkup.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TLocation.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TMessage.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TPhotoSize.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TReplyKeyboardMarkup.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TReplyKeyboardRemove.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TReplyMarkup.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TSendable.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TUser.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TUserProfilePhotos.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TVenue.java (100%) rename src/{ => main/java}/de/mrbesen/telegram/objects/TVideo.java (100%) rename src/{ => main/java}/de/mrbesen/test/Main.java (100%) rename src/{ => main/java}/de/mrbesen/test/commands/InlineKeyboardTC.java (100%) rename src/{ => main/java}/de/mrbesen/test/commands/ReplyKeyboardRemoveTC.java (100%) rename src/{ => main/java}/de/mrbesen/test/commands/ReplyKeyboardTestCase.java (100%) rename src/{ => main/java}/de/mrbesen/test/commands/SimpleTestCase.java (100%) rename src/{ => main/resources}/log4j2.properties (85%) diff --git a/pom.xml b/pom.xml index 0d7dc03..6e73e06 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,12 @@ TelegramAPI 0.0.1-SNAPSHOT - src + src/main/java + + + src/main/resources + + maven-compiler-plugin diff --git a/src/de/mrbesen/telegram/AsyncHandler.java b/src/main/java/de/mrbesen/telegram/AsyncHandler.java similarity index 100% rename from src/de/mrbesen/telegram/AsyncHandler.java rename to src/main/java/de/mrbesen/telegram/AsyncHandler.java diff --git a/src/de/mrbesen/telegram/MessageBuilder.java b/src/main/java/de/mrbesen/telegram/MessageBuilder.java similarity index 100% rename from src/de/mrbesen/telegram/MessageBuilder.java rename to src/main/java/de/mrbesen/telegram/MessageBuilder.java diff --git a/src/de/mrbesen/telegram/TelegramAPI.java b/src/main/java/de/mrbesen/telegram/TelegramAPI.java similarity index 100% rename from src/de/mrbesen/telegram/TelegramAPI.java rename to src/main/java/de/mrbesen/telegram/TelegramAPI.java diff --git a/src/de/mrbesen/telegram/WebhookTelegramAPI.java b/src/main/java/de/mrbesen/telegram/WebhookTelegramAPI.java similarity index 97% rename from src/de/mrbesen/telegram/WebhookTelegramAPI.java rename to src/main/java/de/mrbesen/telegram/WebhookTelegramAPI.java index 1fbf118..68d0f3c 100644 --- a/src/de/mrbesen/telegram/WebhookTelegramAPI.java +++ b/src/main/java/de/mrbesen/telegram/WebhookTelegramAPI.java @@ -41,7 +41,7 @@ public class WebhookTelegramAPI extends TelegramAPI implements HttpHandler { public WebhookTelegramAPI(String apikey, String externaladdr, String allowedupd) throws IOException { super(apikey); - byte[] array = new byte[7]; // length is bounded by 7 + byte[] array = new byte[16]; // length is bounded by 7 new Random().nextBytes(array); pw = new String(array, Charset.forName("UTF-8")); if(externaladdr.endsWith("/")) diff --git a/src/de/mrbesen/telegram/commands/CommandHandler.java b/src/main/java/de/mrbesen/telegram/commands/CommandHandler.java similarity index 100% rename from src/de/mrbesen/telegram/commands/CommandHandler.java rename to src/main/java/de/mrbesen/telegram/commands/CommandHandler.java diff --git a/src/de/mrbesen/telegram/commands/CommandManager.java b/src/main/java/de/mrbesen/telegram/commands/CommandManager.java similarity index 100% rename from src/de/mrbesen/telegram/commands/CommandManager.java rename to src/main/java/de/mrbesen/telegram/commands/CommandManager.java diff --git a/src/de/mrbesen/telegram/commands/ICommandHandler.java b/src/main/java/de/mrbesen/telegram/commands/ICommandHandler.java similarity index 100% rename from src/de/mrbesen/telegram/commands/ICommandHandler.java rename to src/main/java/de/mrbesen/telegram/commands/ICommandHandler.java diff --git a/src/de/mrbesen/telegram/commands/JSONCommandHandler.java b/src/main/java/de/mrbesen/telegram/commands/JSONCommandHandler.java similarity index 100% rename from src/de/mrbesen/telegram/commands/JSONCommandHandler.java rename to src/main/java/de/mrbesen/telegram/commands/JSONCommandHandler.java diff --git a/src/de/mrbesen/telegram/event/Event.java b/src/main/java/de/mrbesen/telegram/event/Event.java similarity index 100% rename from src/de/mrbesen/telegram/event/Event.java rename to src/main/java/de/mrbesen/telegram/event/Event.java diff --git a/src/de/mrbesen/telegram/event/EventHandler.java b/src/main/java/de/mrbesen/telegram/event/EventHandler.java similarity index 100% rename from src/de/mrbesen/telegram/event/EventHandler.java rename to src/main/java/de/mrbesen/telegram/event/EventHandler.java diff --git a/src/de/mrbesen/telegram/event/EventListener.java b/src/main/java/de/mrbesen/telegram/event/EventListener.java similarity index 100% rename from src/de/mrbesen/telegram/event/EventListener.java rename to src/main/java/de/mrbesen/telegram/event/EventListener.java diff --git a/src/de/mrbesen/telegram/event/EventManager.java b/src/main/java/de/mrbesen/telegram/event/EventManager.java similarity index 100% rename from src/de/mrbesen/telegram/event/EventManager.java rename to src/main/java/de/mrbesen/telegram/event/EventManager.java diff --git a/src/de/mrbesen/telegram/event/events/UserCallbackEvent.java b/src/main/java/de/mrbesen/telegram/event/events/UserCallbackEvent.java similarity index 100% rename from src/de/mrbesen/telegram/event/events/UserCallbackEvent.java rename to src/main/java/de/mrbesen/telegram/event/events/UserCallbackEvent.java diff --git a/src/de/mrbesen/telegram/event/events/UserSendAudioEvent.java b/src/main/java/de/mrbesen/telegram/event/events/UserSendAudioEvent.java similarity index 100% rename from src/de/mrbesen/telegram/event/events/UserSendAudioEvent.java rename to src/main/java/de/mrbesen/telegram/event/events/UserSendAudioEvent.java diff --git a/src/de/mrbesen/telegram/event/events/UserSendMessageEvent.java b/src/main/java/de/mrbesen/telegram/event/events/UserSendMessageEvent.java similarity index 100% rename from src/de/mrbesen/telegram/event/events/UserSendMessageEvent.java rename to src/main/java/de/mrbesen/telegram/event/events/UserSendMessageEvent.java diff --git a/src/de/mrbesen/telegram/log/Log.java b/src/main/java/de/mrbesen/telegram/log/Log.java similarity index 100% rename from src/de/mrbesen/telegram/log/Log.java rename to src/main/java/de/mrbesen/telegram/log/Log.java diff --git a/src/de/mrbesen/telegram/log/Log4JLog.java b/src/main/java/de/mrbesen/telegram/log/Log4JLog.java similarity index 100% rename from src/de/mrbesen/telegram/log/Log4JLog.java rename to src/main/java/de/mrbesen/telegram/log/Log4JLog.java diff --git a/src/de/mrbesen/telegram/log/SimpleLog.java b/src/main/java/de/mrbesen/telegram/log/SimpleLog.java similarity index 100% rename from src/de/mrbesen/telegram/log/SimpleLog.java rename to src/main/java/de/mrbesen/telegram/log/SimpleLog.java diff --git a/src/de/mrbesen/telegram/objects/JSONBased.java b/src/main/java/de/mrbesen/telegram/objects/JSONBased.java similarity index 100% rename from src/de/mrbesen/telegram/objects/JSONBased.java rename to src/main/java/de/mrbesen/telegram/objects/JSONBased.java diff --git a/src/de/mrbesen/telegram/objects/TAudio.java b/src/main/java/de/mrbesen/telegram/objects/TAudio.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TAudio.java rename to src/main/java/de/mrbesen/telegram/objects/TAudio.java diff --git a/src/de/mrbesen/telegram/objects/TDocument.java b/src/main/java/de/mrbesen/telegram/objects/TDocument.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TDocument.java rename to src/main/java/de/mrbesen/telegram/objects/TDocument.java diff --git a/src/de/mrbesen/telegram/objects/TFile.java b/src/main/java/de/mrbesen/telegram/objects/TFile.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TFile.java rename to src/main/java/de/mrbesen/telegram/objects/TFile.java diff --git a/src/de/mrbesen/telegram/objects/TInlineKeyboardMarkup.java b/src/main/java/de/mrbesen/telegram/objects/TInlineKeyboardMarkup.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TInlineKeyboardMarkup.java rename to src/main/java/de/mrbesen/telegram/objects/TInlineKeyboardMarkup.java diff --git a/src/de/mrbesen/telegram/objects/TLocation.java b/src/main/java/de/mrbesen/telegram/objects/TLocation.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TLocation.java rename to src/main/java/de/mrbesen/telegram/objects/TLocation.java diff --git a/src/de/mrbesen/telegram/objects/TMessage.java b/src/main/java/de/mrbesen/telegram/objects/TMessage.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TMessage.java rename to src/main/java/de/mrbesen/telegram/objects/TMessage.java diff --git a/src/de/mrbesen/telegram/objects/TPhotoSize.java b/src/main/java/de/mrbesen/telegram/objects/TPhotoSize.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TPhotoSize.java rename to src/main/java/de/mrbesen/telegram/objects/TPhotoSize.java diff --git a/src/de/mrbesen/telegram/objects/TReplyKeyboardMarkup.java b/src/main/java/de/mrbesen/telegram/objects/TReplyKeyboardMarkup.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TReplyKeyboardMarkup.java rename to src/main/java/de/mrbesen/telegram/objects/TReplyKeyboardMarkup.java diff --git a/src/de/mrbesen/telegram/objects/TReplyKeyboardRemove.java b/src/main/java/de/mrbesen/telegram/objects/TReplyKeyboardRemove.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TReplyKeyboardRemove.java rename to src/main/java/de/mrbesen/telegram/objects/TReplyKeyboardRemove.java diff --git a/src/de/mrbesen/telegram/objects/TReplyMarkup.java b/src/main/java/de/mrbesen/telegram/objects/TReplyMarkup.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TReplyMarkup.java rename to src/main/java/de/mrbesen/telegram/objects/TReplyMarkup.java diff --git a/src/de/mrbesen/telegram/objects/TSendable.java b/src/main/java/de/mrbesen/telegram/objects/TSendable.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TSendable.java rename to src/main/java/de/mrbesen/telegram/objects/TSendable.java diff --git a/src/de/mrbesen/telegram/objects/TUser.java b/src/main/java/de/mrbesen/telegram/objects/TUser.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TUser.java rename to src/main/java/de/mrbesen/telegram/objects/TUser.java diff --git a/src/de/mrbesen/telegram/objects/TUserProfilePhotos.java b/src/main/java/de/mrbesen/telegram/objects/TUserProfilePhotos.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TUserProfilePhotos.java rename to src/main/java/de/mrbesen/telegram/objects/TUserProfilePhotos.java diff --git a/src/de/mrbesen/telegram/objects/TVenue.java b/src/main/java/de/mrbesen/telegram/objects/TVenue.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TVenue.java rename to src/main/java/de/mrbesen/telegram/objects/TVenue.java diff --git a/src/de/mrbesen/telegram/objects/TVideo.java b/src/main/java/de/mrbesen/telegram/objects/TVideo.java similarity index 100% rename from src/de/mrbesen/telegram/objects/TVideo.java rename to src/main/java/de/mrbesen/telegram/objects/TVideo.java diff --git a/src/de/mrbesen/test/Main.java b/src/main/java/de/mrbesen/test/Main.java similarity index 100% rename from src/de/mrbesen/test/Main.java rename to src/main/java/de/mrbesen/test/Main.java diff --git a/src/de/mrbesen/test/commands/InlineKeyboardTC.java b/src/main/java/de/mrbesen/test/commands/InlineKeyboardTC.java similarity index 100% rename from src/de/mrbesen/test/commands/InlineKeyboardTC.java rename to src/main/java/de/mrbesen/test/commands/InlineKeyboardTC.java diff --git a/src/de/mrbesen/test/commands/ReplyKeyboardRemoveTC.java b/src/main/java/de/mrbesen/test/commands/ReplyKeyboardRemoveTC.java similarity index 100% rename from src/de/mrbesen/test/commands/ReplyKeyboardRemoveTC.java rename to src/main/java/de/mrbesen/test/commands/ReplyKeyboardRemoveTC.java diff --git a/src/de/mrbesen/test/commands/ReplyKeyboardTestCase.java b/src/main/java/de/mrbesen/test/commands/ReplyKeyboardTestCase.java similarity index 100% rename from src/de/mrbesen/test/commands/ReplyKeyboardTestCase.java rename to src/main/java/de/mrbesen/test/commands/ReplyKeyboardTestCase.java diff --git a/src/de/mrbesen/test/commands/SimpleTestCase.java b/src/main/java/de/mrbesen/test/commands/SimpleTestCase.java similarity index 100% rename from src/de/mrbesen/test/commands/SimpleTestCase.java rename to src/main/java/de/mrbesen/test/commands/SimpleTestCase.java diff --git a/src/log4j2.properties b/src/main/resources/log4j2.properties similarity index 85% rename from src/log4j2.properties rename to src/main/resources/log4j2.properties index 1411b79..f615dfb 100644 --- a/src/log4j2.properties +++ b/src/main/resources/log4j2.properties @@ -13,6 +13,6 @@ appender.console.name = STDOUT appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n -rootLogger.level = debug +rootLogger.level = info rootLogger.appenderRefs = stdout rootLogger.appenderRef.stdout.ref = STDOUT \ No newline at end of file