Added javax-annotations

Fixed some minor problems

Author: darmiel

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/mods/chatlog/ChatlogModule.java

@@ -14,11 +14,12 @@
 import io.d2a.schwurbelwatch.tgcrawler.core.message.SimpleChatMessage;
 import io.d2a.schwurbelwatch.tgcrawler.core.module.BotModule;
 import io.d2a.schwurbelwatch.tgcrawler.core.module.Module;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import lombok.SneakyThrows;
+import javax.annotation.Nonnull;
 import org.drinkless.tdlib.TdApi;
 import org.drinkless.tdlib.TdApi.GetMessage;
 import org.drinkless.tdlib.TdApi.UpdateDeleteMessages;
@@ -56,10 +57,18 @@ public void onEnable() {
     updateContentTypes();
   }
 
-  @SneakyThrows
   private void updateContentTypes() {
     // Update content types
-    final Response<List<ContentType>> execute = SwApi.BASE_SERVICE.getContentTypes().execute();
+    final Response<List<ContentType>> execute;
+
+    try {
+      execute = SwApi.BASE_SERVICE.getContentTypes().execute();
+    } catch (IOException e) {
+      e.printStackTrace();
+      Logger.error(e);
+      return;
+    }
+
     final List<ContentType> body = execute.body();
     if (body == null) {
       Logger.error("Failed to update content type. Response:");
@@ -75,7 +84,7 @@ private void updateContentTypes() {
     Logger.info("Updated Content Types: " + contentTypeMap.size() + " types found.");
   }
 
-  private void updateInsertMessage(final TdApi.Message tdMessage, boolean edit) {
+  private void updateInsertMessage(@Nonnull final TdApi.Message tdMessage, boolean edit) {
     final ApiMessage msg = ApiMessage.wrap(tdMessage, contentTypeMap);
     final SimpleChatMessage dcm = SimpleChatMessage.wrap(tdMessage);
     if (msg == null || dcm == null) {

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/mods/updaters/ChatsUpdateModule.java

@@ -12,7 +12,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.drinkless.tdlib.Client;
 import org.drinkless.tdlib.Client.ResultHandler;

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/ApiTest.java

@@ -1,33 +1,9 @@
 package io.d2a.schwurbelwatch.tgcrawler.api;
 
-import io.d2a.schwurbelwatch.tgcrawler.api.response.DatabaseResult;
-import io.d2a.schwurbelwatch.tgcrawler.api.routes.messages.ApiMessage;
-import io.d2a.schwurbelwatch.tgcrawler.api.routes.messages.MessageService;
-import java.io.IOException;
-import retrofit2.Call;
-import retrofit2.Response;
-
 public class ApiTest {
 
-  public static void main(String[] args) throws IOException {
-    final MessageService service = SwApi.MESSAGE_SERVICE;
-
-    final ApiMessage apiMessage = new ApiMessage();
-    apiMessage.messageId = 8869;
-    apiMessage.userId = 3;
-    apiMessage.chatId = 4;
-    apiMessage.contentType = 2;
-    apiMessage.content = "Hallo!";
+  public static void main(String[] args) {
 
-    final Call<DatabaseResult> call = service.addMessage(apiMessage);
-    System.out.println(call);
-    final Response<DatabaseResult> response = call.execute();
-    System.out.println(response);
-    final DatabaseResult body = response.body();
-
-    if (body.isError()) {
-      System.out.println(" -> Error! :: " + body.errorMessage);
-    }
-    System.out.println(body);
   }
+
 }

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/SwApi.java

@@ -11,6 +11,7 @@
 import io.d2a.schwurbelwatch.tgcrawler.core.logging.AnsiColor;
 import io.d2a.schwurbelwatch.tgcrawler.core.logging.Logger;
 import java.io.IOException;
+import javax.annotation.Nullable;
 import okhttp3.Request;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
@@ -41,7 +42,12 @@ public class SwApi {
   public static final FileService FILE_SERVICE = retrofit.create(FileService.class);
   public static final ChatService CHAT_SERVICE = retrofit.create(ChatService.class);
 
-  public static void callDatabaseResult(final Call<DatabaseResult> call) {
+  public static void callDatabaseResult(@Nullable final Call<DatabaseResult> call) {
+    if (call == null) {
+      Logger.warn("Tried to call a null Call<?>");
+      return;
+    }
+
     try {
       long start = System.currentTimeMillis();
 

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/chats/ChatService.java

@@ -2,6 +2,8 @@
 
 import io.d2a.schwurbelwatch.tgcrawler.api.response.DatabaseResult;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -30,7 +32,8 @@ public interface ChatService {
   @POST("chats/:id/count/:count")
   Call<DatabaseResult> updateMemberCount(@Path("id") long chatId, @Path("count") int count);
 
-  default Call<DatabaseResult> addChat(ApiChat chat) {
+  @Nullable
+  default Call<DatabaseResult> addChat(@Nonnull final ApiChat chat) {
     if (chat.chatId != null) {
       return addChatByChatId(chat);
     } else if (chat.groupId != null) {

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/chats/ChatType.java

@@ -23,7 +23,7 @@ public enum ChatType {
   }
 
   @Nonnull
-  public static ChatType getType(final TdApi.ChatType type) {
+  public static ChatType getType(@Nonnull final TdApi.ChatType type) {
     for (final ChatType value : values()) {
       if (value.constructor == type.getConstructor()) {
         return value;

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/messages/ApiMessage.java

@@ -4,6 +4,8 @@
 import io.d2a.schwurbelwatch.tgcrawler.api.routes.base.ContentType;
 import io.d2a.schwurbelwatch.tgcrawler.core.message.SimpleChatMessage;
 import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.ToString;
 import org.drinkless.tdlib.TdApi;
 
@@ -35,12 +37,16 @@ public class ApiMessage {
   public boolean isDeleted() {
     return this.deletedOn > 0;
   }
+
   public boolean isChannelPost() {
     return this.isChannelPost == 1;
   }
 
-  public static ApiMessage wrap(final TdApi.Message tdMessage,
-      final Map<Integer, ContentType> contentTypeMap) {
+  @Nullable
+  public static ApiMessage wrap(
+      @Nonnull final TdApi.Message tdMessage,
+      @Nonnull Map<Integer, ContentType> contentTypeMap) {
+
     final SimpleChatMessage dcm = SimpleChatMessage.wrap(tdMessage);
     if (dcm == null) {
       return null;

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/user/User.java

@@ -1,6 +1,7 @@
 package io.d2a.schwurbelwatch.tgcrawler.api.routes.user;
 
 import com.google.gson.annotations.SerializedName;
+import javax.annotation.Nonnull;
 import lombok.ToString;
 import org.drinkless.tdlib.TdApi;
 
@@ -28,7 +29,8 @@ public class User {
   @SerializedName("is_scam")
   public int isScam;
 
-  public static User wrap (final TdApi.User tdUser) {
+  @Nonnull
+  public static User wrap(@Nonnull final TdApi.User tdUser) {
     final User res = new User();
     res.userId = tdUser.id;
     res.username = tdUser.username;

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/BotMain.java

@@ -131,7 +131,7 @@ private void start() throws
     Logger.info("Loading modules ...");
     ModuleRegistry.loadModules();
 
-    if (ModuleRegistry.getEnablabledModules().size() == 0) {
+    if (ModuleRegistry.getEnabledModules().size() == 0) {
       Logger.warn("No modules enabled.");
     }
   }

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/auth/SystemInfo.java

@@ -6,20 +6,20 @@
 
 package io.d2a.schwurbelwatch.tgcrawler.core.auth;
 
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 @Getter
 @Builder
 @ToString
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class SystemInfo {
 
-  private String systemLanguageCode;
-  private String systemVersion;
-  private String deviceModel;
-  private String applicationVersion;
+  private final String systemLanguageCode;
+  private final String systemVersion;
+  private final String deviceModel;
+  private final String applicationVersion;
 
 }

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/client/AuthStateResultHandler.java

@@ -1,28 +1,32 @@
 package io.d2a.schwurbelwatch.tgcrawler.core.client;
 
+import io.d2a.schwurbelwatch.tgcrawler.core.logging.AnsiColor;
+import io.d2a.schwurbelwatch.tgcrawler.core.logging.Logger;
+import javax.annotation.Nonnull;
 import org.drinkless.tdlib.Client.ResultHandler;
 import org.drinkless.tdlib.TdApi;
 
 public class AuthStateResultHandler implements ResultHandler {
 
   private final TelegramClient client;
 
-  public AuthStateResultHandler(final TelegramClient client) {
+  public AuthStateResultHandler(@Nonnull final TelegramClient client) {
     this.client = client;
   }
 
   @Override
   public void onResult(final TdApi.Object object) {
     switch (object.getConstructor()) {
       case TdApi.Error.CONSTRUCTOR:
-        System.err.println("Receive an error:\n" + object);
+        Logger.error(AnsiColor.ANSI_RED + "Received an error | AuthStateResultHandler:");
+        Logger.error(object);
 
-        // result is already received through UpdateAuthorizationState, nothing to do
       case TdApi.Ok.CONSTRUCTOR:
         break;
 
       default:
-        System.err.println("Receive wrong response from TDLib for client " + this.client.toString() + ":\n" + object);
+        Logger.warn("Receive wrong response from TDLib for client " +
+            this.client.toString() + ":\n" + object);
     }
   }
 

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/client/AuthStateUpdateHandler.java

@@ -4,6 +4,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import javax.annotation.Nonnull;
 import org.drinkless.tdlib.Client;
 import org.drinkless.tdlib.Client.ResultHandler;
 import org.drinkless.tdlib.TdApi;
@@ -24,7 +25,8 @@ public AuthStateUpdateHandler(final TelegramClient client) {
    * @param prompt The text shown on the prompt
    * @return The typed text
    */
-  private static String promptString(String prompt) {
+  @Nonnull
+  private static String promptString(@Nonnull String prompt) {
     System.out.print(prompt);
 
     final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
@@ -47,7 +49,7 @@ private ResultHandler result() {
     return new AuthStateResultHandler(this.client);
   }
 
-  public void onAuthorizationStateUpdated(final UpdateAuthorizationState state) {
+  public void onAuthorizationStateUpdated(@Nonnull final UpdateAuthorizationState state) {
     Logger.debug("");
     Logger.debug("Auth State Updated:");
     Logger.debug(state);

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/client/ClientRouter.java

@@ -35,15 +35,18 @@ public class ClientRouter {
    * @param clientName Input string
    * @return Lower-Case + Stripped
    */
+  @Nonnull
   private String formatClientName(@Nonnull final String clientName) {
     return clientName.toLowerCase().trim();
   }
 
+  @Nonnull
   public Optional<ClientConfig> findConfiguration(@Nonnull final String clientName) {
     final String key = formatClientName(clientName);
     return Optional.ofNullable(this.clientConfigMap.get(key));
   }
 
+  @Nonnull
   public Optional<TelegramClient> findTelegramClient(@Nonnull final String clientName) {
     final String key = formatClientName(clientName);
 

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/client/TelegramClient.java

@@ -104,6 +104,7 @@ private TelegramClient(
 
   /////////////////////////////////////////////////////////////////////////////////////////////
 
+  @Nonnull
   public static TelegramClient create(
       @Nonnull final String identifier,
       @Nonnull final ApiCredentials credentials,

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/config/ClientConfig.java

@@ -11,29 +11,31 @@
 import io.d2a.schwurbelwatch.tgcrawler.core.auth.ApiCredentials;
 import io.d2a.schwurbelwatch.tgcrawler.core.auth.SystemInfo;
 import java.util.Set;
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 @Getter
 @ToString
+@RequiredArgsConstructor
 public class ClientConfig {
 
   @SerializedName("use_cases")
-  private Set<String> useCases = Sets.newHashSet();
+  private final Set<String> useCases = Sets.newHashSet();
 
   @SerializedName("credentials")
-  private ApiCredentials credentials;
+  private final ApiCredentials credentials;
 
   @SerializedName("info")
-  private SystemInfo systemInfo = new SystemInfo(
+  private final SystemInfo systemInfo = new SystemInfo(
       "en",
       "Unknown",
       "Desktop",
       "1.0"
   );
 
-  public boolean accepts(String useCase) {
+  public boolean accepts(@Nullable String useCase) {
     if (useCase == null) {
       return true;
     }

apps/message-crawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/core/logging/ConsoleLogProvider.java

@@ -1,19 +1,25 @@
 package io.d2a.schwurbelwatch.tgcrawler.core.logging;
 
+import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Setter;
 
 public class ConsoleLogProvider implements LoggerProvider {
 
-  private static final String seperator = " | ";
+  private static final String separator = " | ";
   private static final String textColor = AnsiColor.ANSI_RESET;
 
   @Setter
   @Getter
   private LogLevel minimumLevel = LogLevel.DEBUG;
 
   @Override
-  public void log(final String message, final LogLevel level) {
+  public void log(@Nullable final String message, @Nullable LogLevel level) {
+    // default log level: INFO
+    if (level == null) {
+      level = LogLevel.INFO;
+    }
+
     // check level before printing the message
     if (level.getLevel() < this.getMinimumLevel().getLevel()) {
       return;
@@ -33,7 +39,7 @@ public void log(final String message, final LogLevel level) {
     builder.append(level.name());
     builder.append(AnsiColor.ANSI_RESET);
 
-    builder.append(seperator);
+    builder.append(separator);
     builder.append(textColor);
     builder.append(message);
     builder.append(AnsiColor.ANSI_RESET);