♻️ refactor: refactor codebase #2

sivaosorg · Jun 15, 2024 · 26f107b · 26f107b
1 parent de1a5b8
commit 26f107b
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 16 deletions.
diff --git a/plugin/src/main/groovy/org/bot4j/slack/common/Slack4j.java b/plugin/src/main/groovy/org/bot4j/slack/common/Slack4j.java
@@ -3,7 +3,7 @@
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
 import kong.unirest.Unirest;
-import org.bot4j.slack.model.onlyrd.AbstractSlackClass;
+import org.bot4j.slack.model.rd.AbstractSlackClass;
 import org.unify4j.common.*;
 import org.unify4j.model.builder.HttpStatusBuilder;
 import org.unify4j.model.builder.HttpWrapBuilder;

diff --git a/plugin/src/main/groovy/org/bot4j/slack/model/builder/SlackConnectionBuilder.java b/plugin/src/main/groovy/org/bot4j/slack/model/builder/SlackConnectionBuilder.java
@@ -1,7 +1,7 @@
 package org.bot4j.slack.model.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.bot4j.slack.model.options.SlackConnections;
+import org.bot4j.slack.model.request.SlackConnections;
 
 import java.io.Serializable;
 

diff --git a/plugin/src/main/groovy/org/bot4j/slack/model/builder/SlackOptionBuilder.java b/plugin/src/main/groovy/org/bot4j/slack/model/builder/SlackOptionBuilder.java
@@ -1,7 +1,7 @@
 package org.bot4j.slack.model.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.bot4j.slack.model.options.SlackOptions;
+import org.bot4j.slack.model.request.SlackOptions;
 import org.unify4j.common.UniqueId4j;
 
 import java.io.Serializable;

diff --git a/...lack/model/onlyrd/AbstractSlackClass.java → ...4j/slack/model/rd/AbstractSlackClass.java b/...lack/model/onlyrd/AbstractSlackClass.java → ...4j/slack/model/rd/AbstractSlackClass.java
@@ -1,9 +1,9 @@
-package org.bot4j.slack.model.onlyrd;
+package org.bot4j.slack.model.rd;
 
 import org.bot4j.slack.model.builder.SlackConnectionBuilder;
 import org.bot4j.slack.model.builder.SlackOptionBuilder;
-import org.bot4j.slack.model.options.SlackConnections;
-import org.bot4j.slack.model.options.SlackOptions;
+import org.bot4j.slack.model.request.SlackConnections;
+import org.bot4j.slack.model.request.SlackOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.unify4j.model.response.WrapResponse;

diff --git a/...slack/model/options/SlackConnections.java → ...slack/model/request/SlackConnections.java b/...slack/model/options/SlackConnections.java → ...slack/model/request/SlackConnections.java
@@ -1,4 +1,4 @@
-package org.bot4j.slack.model.options;
+package org.bot4j.slack.model.request;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...t4j/slack/model/options/SlackOptions.java → ...t4j/slack/model/request/SlackOptions.java b/...t4j/slack/model/options/SlackOptions.java → ...t4j/slack/model/request/SlackOptions.java
@@ -1,4 +1,4 @@
-package org.bot4j.slack.model.options;
+package org.bot4j.slack.model.request;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/plugin/src/main/groovy/org/bot4j/telegram/common/Telegram4j.java b/plugin/src/main/groovy/org/bot4j/telegram/common/Telegram4j.java
@@ -3,7 +3,7 @@
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
 import kong.unirest.Unirest;
-import org.bot4j.telegram.model.onlyrd.AbstractTelegramClass;
+import org.bot4j.telegram.model.rd.AbstractTelegramClass;
 import org.unify4j.common.Json4j;
 import org.unify4j.common.Object4j;
 import org.unify4j.common.String4j;

diff --git a/plugin/src/main/groovy/org/bot4j/telegram/model/builder/TelegramConnectionBuilder.java b/plugin/src/main/groovy/org/bot4j/telegram/model/builder/TelegramConnectionBuilder.java
@@ -1,7 +1,7 @@
 package org.bot4j.telegram.model.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.bot4j.telegram.model.options.TelegramConnections;
+import org.bot4j.telegram.model.request.TelegramConnections;
 
 import java.io.Serializable;
 

diff --git a/plugin/src/main/groovy/org/bot4j/telegram/model/builder/TelegramOptionBuilder.java b/plugin/src/main/groovy/org/bot4j/telegram/model/builder/TelegramOptionBuilder.java
@@ -1,7 +1,7 @@
 package org.bot4j.telegram.model.builder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.bot4j.telegram.model.options.TelegramOptions;
+import org.bot4j.telegram.model.request.TelegramOptions;
 import org.unify4j.common.UniqueId4j;
 
 import java.io.Serializable;

diff --git a/...m/model/onlyrd/AbstractTelegramClass.java → ...egram/model/rd/AbstractTelegramClass.java b/...m/model/onlyrd/AbstractTelegramClass.java → ...egram/model/rd/AbstractTelegramClass.java
@@ -1,10 +1,10 @@
-package org.bot4j.telegram.model.onlyrd;
+package org.bot4j.telegram.model.rd;
 
 import org.bot4j.telegram.model.builder.TelegramConnectionBuilder;
 import org.bot4j.telegram.model.builder.TelegramOptionBuilder;
 import org.bot4j.telegram.model.enums.TelegramTextMode;
-import org.bot4j.telegram.model.options.TelegramConnections;
-import org.bot4j.telegram.model.options.TelegramOptions;
+import org.bot4j.telegram.model.request.TelegramConnections;
+import org.bot4j.telegram.model.request.TelegramOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.unify4j.common.Class4j;

diff --git a/...am/model/options/TelegramConnections.java → ...am/model/request/TelegramConnections.java b/...am/model/options/TelegramConnections.java → ...am/model/request/TelegramConnections.java
@@ -1,4 +1,4 @@
-package org.bot4j.telegram.model.options;
+package org.bot4j.telegram.model.request;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...legram/model/options/TelegramOptions.java → ...legram/model/request/TelegramOptions.java b/...legram/model/options/TelegramOptions.java → ...legram/model/request/TelegramOptions.java
@@ -1,4 +1,4 @@
-package org.bot4j.telegram.model.options;
+package org.bot4j.telegram.model.request;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/plugin/src/main/groovy/org/bot4j/viber/model/enums/ViberTextMode.java b/plugin/src/main/groovy/org/bot4j/viber/model/enums/ViberTextMode.java
@@ -0,0 +1,24 @@
+package org.bot4j.viber.model.enums;
+
+public enum ViberTextMode {
+    TEXT("text"),
+    PICTURE("picture"),
+    VIDEO("video"),
+    FILE("file"),
+    LOCATION("location"),
+    CONTACT("contact"),
+    STICKER("sticker"),
+    CAROUSEL("carousel"),
+    CONTENT("content"),
+    URL("url");
+
+    ViberTextMode(String value) {
+        this.value = value;
+    }
+
+    private final String value;
+
+    public String getValue() {
+        return value;
+    }
+}