diff --git a/.vscode/launch.json b/.vscode/launch.json index 777fee5..6432c54 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -21,7 +21,7 @@ "type": "java", "name": "Main", "request": "launch", - "mainClass": "com.rosetta.im.Main", + "mainClass": "im.rosetta.Main", "projectName": "rosetta-server", "envFile": "${workspaceFolder}/.env" } diff --git a/pom.xml b/pom.xml index 447d2b3..2448490 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.rosetta.im + im.rosetta rosetta-server 1.0-SNAPSHOT @@ -58,7 +58,7 @@ - com.rosetta.im.Main + im.rosetta.Main diff --git a/src/main/java/com/rosetta/im/database/repository/BufferRepository.java b/src/main/java/com/rosetta/im/database/repository/BufferRepository.java deleted file mode 100644 index 1e68351..0000000 --- a/src/main/java/com/rosetta/im/database/repository/BufferRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.rosetta.im.database.repository; - -import com.rosetta.im.database.Repository; -import com.rosetta.im.database.entity.Buffer; - -public class BufferRepository extends Repository { - - public BufferRepository() { - super(Buffer.class); - } - -} diff --git a/src/main/java/com/rosetta/im/database/repository/UserRepository.java b/src/main/java/com/rosetta/im/database/repository/UserRepository.java deleted file mode 100644 index 068a88a..0000000 --- a/src/main/java/com/rosetta/im/database/repository/UserRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.rosetta.im.database.repository; - -import com.rosetta.im.database.Repository; -import com.rosetta.im.database.entity.User; - -public class UserRepository extends Repository { - - public UserRepository() { - super(User.class); - } - - -} diff --git a/src/main/java/com/rosetta/im/executors/base/ExecutorBaseDialog.java b/src/main/java/com/rosetta/im/executors/base/ExecutorBaseDialog.java deleted file mode 100644 index 537ba1a..0000000 --- a/src/main/java/com/rosetta/im/executors/base/ExecutorBaseDialog.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.rosetta.im.executors.base; - -public class ExecutorBaseDialog { - -} diff --git a/src/main/java/com/rosetta/im/Boot.java b/src/main/java/im/rosetta/Boot.java similarity index 74% rename from src/main/java/com/rosetta/im/Boot.java rename to src/main/java/im/rosetta/Boot.java index bc8e289..9235654 100644 --- a/src/main/java/com/rosetta/im/Boot.java +++ b/src/main/java/im/rosetta/Boot.java @@ -1,55 +1,55 @@ -package com.rosetta.im; +package im.rosetta; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.OnlineManager; -import com.rosetta.im.event.EventManager; -import com.rosetta.im.executors.Executor0Handshake; -import com.rosetta.im.executors.Executor10RequestUpdate; -import com.rosetta.im.executors.Executor11Typeing; -import com.rosetta.im.executors.Executor15RequestTransport; -import com.rosetta.im.executors.Executor16PushNotification; -import com.rosetta.im.executors.Executor17GroupCreate; -import com.rosetta.im.executors.Executor18GroupInfo; -import com.rosetta.im.executors.Executor19GroupInviteInfo; -import com.rosetta.im.executors.Executor1UserInfo; -import com.rosetta.im.executors.Executor20GroupJoin; -import com.rosetta.im.executors.Executor21GroupLeave; -import com.rosetta.im.executors.Executor22GroupBan; -import com.rosetta.im.executors.Executor24DeviceResolve; -import com.rosetta.im.executors.Executor3Search; -import com.rosetta.im.executors.Executor4OnlineState; -import com.rosetta.im.executors.Executor6Message; -import com.rosetta.im.executors.Executor7Read; -import com.rosetta.im.listeners.DeviceListListener; -import com.rosetta.im.listeners.HandshakeCompleteListener; -import com.rosetta.im.listeners.OnlineStatusDisconnectListener; -import com.rosetta.im.listeners.OnlineStatusHandshakeCompleteListener; -import com.rosetta.im.listeners.ServerStopListener; -import com.rosetta.im.logger.Logger; -import com.rosetta.im.logger.enums.Color; -import com.rosetta.im.logger.enums.LogLevel; -import com.rosetta.im.packet.Packet0Handshake; -import com.rosetta.im.packet.Packet10RequestUpdate; -import com.rosetta.im.packet.Packet11Typeing; -import com.rosetta.im.packet.Packet15RequestTransport; -import com.rosetta.im.packet.Packet16PushNotification; -import com.rosetta.im.packet.Packet17GroupCreate; -import com.rosetta.im.packet.Packet18GroupInfo; -import com.rosetta.im.packet.Packet19GroupInviteInfo; -import com.rosetta.im.packet.Packet1UserInfo; -import com.rosetta.im.packet.Packet20GroupJoin; -import com.rosetta.im.packet.Packet21GroupLeave; -import com.rosetta.im.packet.Packet22GroupBan; -import com.rosetta.im.packet.Packet23DeviceList; -import com.rosetta.im.packet.Packet24DeviceResolve; -import com.rosetta.im.packet.Packet2Result; -import com.rosetta.im.packet.Packet3Search; -import com.rosetta.im.packet.Packet4OnlineSubscribe; -import com.rosetta.im.packet.Packet5OnlineState; -import com.rosetta.im.packet.Packet6Message; -import com.rosetta.im.packet.Packet7Read; -import com.rosetta.im.packet.Packet8Delivery; -import com.rosetta.im.packet.Packet9DeviceNew; +import im.rosetta.client.ClientManager; +import im.rosetta.client.OnlineManager; +import im.rosetta.event.EventManager; +import im.rosetta.executors.Executor0Handshake; +import im.rosetta.executors.Executor10RequestUpdate; +import im.rosetta.executors.Executor11Typeing; +import im.rosetta.executors.Executor15RequestTransport; +import im.rosetta.executors.Executor16PushNotification; +import im.rosetta.executors.Executor17GroupCreate; +import im.rosetta.executors.Executor18GroupInfo; +import im.rosetta.executors.Executor19GroupInviteInfo; +import im.rosetta.executors.Executor1UserInfo; +import im.rosetta.executors.Executor20GroupJoin; +import im.rosetta.executors.Executor21GroupLeave; +import im.rosetta.executors.Executor22GroupBan; +import im.rosetta.executors.Executor24DeviceResolve; +import im.rosetta.executors.Executor3Search; +import im.rosetta.executors.Executor4OnlineState; +import im.rosetta.executors.Executor6Message; +import im.rosetta.executors.Executor7Read; +import im.rosetta.listeners.DeviceListListener; +import im.rosetta.listeners.HandshakeCompleteListener; +import im.rosetta.listeners.OnlineStatusDisconnectListener; +import im.rosetta.listeners.OnlineStatusHandshakeCompleteListener; +import im.rosetta.listeners.ServerStopListener; +import im.rosetta.logger.Logger; +import im.rosetta.logger.enums.Color; +import im.rosetta.logger.enums.LogLevel; +import im.rosetta.packet.Packet0Handshake; +import im.rosetta.packet.Packet10RequestUpdate; +import im.rosetta.packet.Packet11Typeing; +import im.rosetta.packet.Packet15RequestTransport; +import im.rosetta.packet.Packet16PushNotification; +import im.rosetta.packet.Packet17GroupCreate; +import im.rosetta.packet.Packet18GroupInfo; +import im.rosetta.packet.Packet19GroupInviteInfo; +import im.rosetta.packet.Packet1UserInfo; +import im.rosetta.packet.Packet20GroupJoin; +import im.rosetta.packet.Packet21GroupLeave; +import im.rosetta.packet.Packet22GroupBan; +import im.rosetta.packet.Packet23DeviceList; +import im.rosetta.packet.Packet24DeviceResolve; +import im.rosetta.packet.Packet2Result; +import im.rosetta.packet.Packet3Search; +import im.rosetta.packet.Packet4OnlineSubscribe; +import im.rosetta.packet.Packet5OnlineState; +import im.rosetta.packet.Packet6Message; +import im.rosetta.packet.Packet7Read; +import im.rosetta.packet.Packet8Delivery; +import im.rosetta.packet.Packet9DeviceNew; import io.orprotocol.Server; import io.orprotocol.Settings; diff --git a/src/main/java/com/rosetta/im/Failures.java b/src/main/java/im/rosetta/Failures.java similarity index 97% rename from src/main/java/com/rosetta/im/Failures.java rename to src/main/java/im/rosetta/Failures.java index d57737d..03b1ca6 100644 --- a/src/main/java/com/rosetta/im/Failures.java +++ b/src/main/java/im/rosetta/Failures.java @@ -1,4 +1,4 @@ -package com.rosetta.im; +package im.rosetta; import io.orprotocol.BaseFailures; diff --git a/src/main/java/com/rosetta/im/Main.java b/src/main/java/im/rosetta/Main.java similarity index 97% rename from src/main/java/com/rosetta/im/Main.java rename to src/main/java/im/rosetta/Main.java index c9aedee..2dafa3d 100644 --- a/src/main/java/com/rosetta/im/Main.java +++ b/src/main/java/im/rosetta/Main.java @@ -1,4 +1,4 @@ -package com.rosetta.im; +package im.rosetta; public class Main { public static void main(String[] args) { diff --git a/src/main/java/com/rosetta/im/ServerAdapter.java b/src/main/java/im/rosetta/ServerAdapter.java similarity index 87% rename from src/main/java/com/rosetta/im/ServerAdapter.java rename to src/main/java/im/rosetta/ServerAdapter.java index c8c08e1..e81c49c 100644 --- a/src/main/java/com/rosetta/im/ServerAdapter.java +++ b/src/main/java/im/rosetta/ServerAdapter.java @@ -1,12 +1,12 @@ -package com.rosetta.im; +package im.rosetta; -import com.rosetta.im.event.EventManager; -import com.rosetta.im.event.events.ConnectEvent; -import com.rosetta.im.event.events.DisconnectEvent; -import com.rosetta.im.event.events.PacketInputEvent; -import com.rosetta.im.event.events.ServerErrorEvent; -import com.rosetta.im.event.events.ServerStartEvent; -import com.rosetta.im.event.events.ServerStopEvent; +import im.rosetta.event.EventManager; +import im.rosetta.event.events.ConnectEvent; +import im.rosetta.event.events.DisconnectEvent; +import im.rosetta.event.events.PacketInputEvent; +import im.rosetta.event.events.ServerErrorEvent; +import im.rosetta.event.events.ServerStartEvent; +import im.rosetta.event.events.ServerStopEvent; import io.orprotocol.Server; import io.orprotocol.ServerListener; diff --git a/src/main/java/com/rosetta/im/client/ClientManager.java b/src/main/java/im/rosetta/client/ClientManager.java similarity index 98% rename from src/main/java/com/rosetta/im/client/ClientManager.java rename to src/main/java/im/rosetta/client/ClientManager.java index 9fd1259..95198c8 100644 --- a/src/main/java/com/rosetta/im/client/ClientManager.java +++ b/src/main/java/im/rosetta/client/ClientManager.java @@ -1,9 +1,9 @@ -package com.rosetta.im.client; +package im.rosetta.client; import java.util.HashSet; import java.util.List; -import com.rosetta.im.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIAuthentificate; import io.orprotocol.ProtocolException; import io.orprotocol.Server; diff --git a/src/main/java/com/rosetta/im/client/OnlineManager.java b/src/main/java/im/rosetta/client/OnlineManager.java similarity index 97% rename from src/main/java/com/rosetta/im/client/OnlineManager.java rename to src/main/java/im/rosetta/client/OnlineManager.java index f45e08a..343a6b8 100644 --- a/src/main/java/com/rosetta/im/client/OnlineManager.java +++ b/src/main/java/im/rosetta/client/OnlineManager.java @@ -1,11 +1,11 @@ -package com.rosetta.im.client; +package im.rosetta.client; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; -import com.rosetta.im.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIAuthentificate; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/client/tags/ECIAuthentificate.java b/src/main/java/im/rosetta/client/tags/ECIAuthentificate.java similarity index 95% rename from src/main/java/com/rosetta/im/client/tags/ECIAuthentificate.java rename to src/main/java/im/rosetta/client/tags/ECIAuthentificate.java index e238b39..3975e5b 100644 --- a/src/main/java/com/rosetta/im/client/tags/ECIAuthentificate.java +++ b/src/main/java/im/rosetta/client/tags/ECIAuthentificate.java @@ -1,9 +1,9 @@ -package com.rosetta.im.client.tags; +package im.rosetta.client.tags; import java.util.HashMap; import java.util.Map; -import com.rosetta.im.packet.runtime.HandshakeStage; +import im.rosetta.packet.runtime.HandshakeStage; import io.orprotocol.client.ECITag; diff --git a/src/main/java/com/rosetta/im/client/tags/ECIDevice.java b/src/main/java/im/rosetta/client/tags/ECIDevice.java similarity index 95% rename from src/main/java/com/rosetta/im/client/tags/ECIDevice.java rename to src/main/java/im/rosetta/client/tags/ECIDevice.java index 0994835..1a5c1eb 100644 --- a/src/main/java/com/rosetta/im/client/tags/ECIDevice.java +++ b/src/main/java/im/rosetta/client/tags/ECIDevice.java @@ -1,4 +1,4 @@ -package com.rosetta.im.client.tags; +package im.rosetta.client.tags; import io.orprotocol.client.ECITag; diff --git a/src/main/java/com/rosetta/im/database/CreateUpdateEntity.java b/src/main/java/im/rosetta/database/CreateUpdateEntity.java similarity index 96% rename from src/main/java/com/rosetta/im/database/CreateUpdateEntity.java rename to src/main/java/im/rosetta/database/CreateUpdateEntity.java index 77fe545..d89f95f 100644 --- a/src/main/java/com/rosetta/im/database/CreateUpdateEntity.java +++ b/src/main/java/im/rosetta/database/CreateUpdateEntity.java @@ -1,4 +1,4 @@ -package com.rosetta.im.database; +package im.rosetta.database; import java.time.LocalDateTime; diff --git a/src/main/java/com/rosetta/im/database/HibernateUtil.java b/src/main/java/im/rosetta/database/HibernateUtil.java similarity index 97% rename from src/main/java/com/rosetta/im/database/HibernateUtil.java rename to src/main/java/im/rosetta/database/HibernateUtil.java index feb87ca..4e4ed49 100644 --- a/src/main/java/com/rosetta/im/database/HibernateUtil.java +++ b/src/main/java/im/rosetta/database/HibernateUtil.java @@ -1,4 +1,4 @@ -package com.rosetta.im.database; +package im.rosetta.database; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/src/main/java/com/rosetta/im/database/QuerySession.java b/src/main/java/im/rosetta/database/QuerySession.java similarity index 96% rename from src/main/java/com/rosetta/im/database/QuerySession.java rename to src/main/java/im/rosetta/database/QuerySession.java index 917298e..2a317f7 100644 --- a/src/main/java/com/rosetta/im/database/QuerySession.java +++ b/src/main/java/im/rosetta/database/QuerySession.java @@ -1,4 +1,4 @@ -package com.rosetta.im.database; +package im.rosetta.database; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/src/main/java/com/rosetta/im/database/Repository.java b/src/main/java/im/rosetta/database/Repository.java similarity index 99% rename from src/main/java/com/rosetta/im/database/Repository.java rename to src/main/java/im/rosetta/database/Repository.java index d3f5177..2d63286 100644 --- a/src/main/java/com/rosetta/im/database/Repository.java +++ b/src/main/java/im/rosetta/database/Repository.java @@ -1,4 +1,4 @@ -package com.rosetta.im.database; +package im.rosetta.database; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/rosetta/im/database/converters/StringListConverter.java b/src/main/java/im/rosetta/database/converters/StringListConverter.java similarity index 94% rename from src/main/java/com/rosetta/im/database/converters/StringListConverter.java rename to src/main/java/im/rosetta/database/converters/StringListConverter.java index 6bd4d5b..9e5d5c4 100644 --- a/src/main/java/com/rosetta/im/database/converters/StringListConverter.java +++ b/src/main/java/im/rosetta/database/converters/StringListConverter.java @@ -1,4 +1,4 @@ -package com.rosetta.im.database.converters; +package im.rosetta.database.converters; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/rosetta/im/database/entity/Buffer.java b/src/main/java/im/rosetta/database/entity/Buffer.java similarity index 95% rename from src/main/java/com/rosetta/im/database/entity/Buffer.java rename to src/main/java/im/rosetta/database/entity/Buffer.java index 0d45c53..8b824c1 100644 --- a/src/main/java/com/rosetta/im/database/entity/Buffer.java +++ b/src/main/java/im/rosetta/database/entity/Buffer.java @@ -1,6 +1,6 @@ -package com.rosetta.im.database.entity; +package im.rosetta.database.entity; -import com.rosetta.im.database.CreateUpdateEntity; +import im.rosetta.database.CreateUpdateEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/rosetta/im/database/entity/Device.java b/src/main/java/im/rosetta/database/entity/Device.java similarity index 95% rename from src/main/java/com/rosetta/im/database/entity/Device.java rename to src/main/java/im/rosetta/database/entity/Device.java index b8127ee..52700a6 100644 --- a/src/main/java/com/rosetta/im/database/entity/Device.java +++ b/src/main/java/im/rosetta/database/entity/Device.java @@ -1,6 +1,6 @@ -package com.rosetta.im.database.entity; +package im.rosetta.database.entity; -import com.rosetta.im.database.CreateUpdateEntity; +import im.rosetta.database.CreateUpdateEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/rosetta/im/database/entity/Group.java b/src/main/java/im/rosetta/database/entity/Group.java similarity index 91% rename from src/main/java/com/rosetta/im/database/entity/Group.java rename to src/main/java/im/rosetta/database/entity/Group.java index 77f9e51..eba7114 100644 --- a/src/main/java/com/rosetta/im/database/entity/Group.java +++ b/src/main/java/im/rosetta/database/entity/Group.java @@ -1,10 +1,10 @@ -package com.rosetta.im.database.entity; +package im.rosetta.database.entity; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.database.CreateUpdateEntity; -import com.rosetta.im.database.converters.StringListConverter; +import im.rosetta.database.CreateUpdateEntity; +import im.rosetta.database.converters.StringListConverter; import jakarta.persistence.Column; import jakarta.persistence.Convert; diff --git a/src/main/java/com/rosetta/im/database/entity/User.java b/src/main/java/im/rosetta/database/entity/User.java similarity index 92% rename from src/main/java/com/rosetta/im/database/entity/User.java rename to src/main/java/im/rosetta/database/entity/User.java index 355ceae..3e77f3c 100644 --- a/src/main/java/com/rosetta/im/database/entity/User.java +++ b/src/main/java/im/rosetta/database/entity/User.java @@ -1,7 +1,7 @@ -package com.rosetta.im.database.entity; +package im.rosetta.database.entity; -import com.rosetta.im.database.CreateUpdateEntity; -import com.rosetta.im.database.converters.StringListConverter; +import im.rosetta.database.CreateUpdateEntity; +import im.rosetta.database.converters.StringListConverter; import jakarta.persistence.Column; import jakarta.persistence.Convert; diff --git a/src/main/java/im/rosetta/database/repository/BufferRepository.java b/src/main/java/im/rosetta/database/repository/BufferRepository.java new file mode 100644 index 0000000..aee28e3 --- /dev/null +++ b/src/main/java/im/rosetta/database/repository/BufferRepository.java @@ -0,0 +1,12 @@ +package im.rosetta.database.repository; + +import im.rosetta.database.Repository; +import im.rosetta.database.entity.Buffer; + +public class BufferRepository extends Repository { + + public BufferRepository() { + super(Buffer.class); + } + +} diff --git a/src/main/java/com/rosetta/im/database/repository/DeviceRepository.java b/src/main/java/im/rosetta/database/repository/DeviceRepository.java similarity index 87% rename from src/main/java/com/rosetta/im/database/repository/DeviceRepository.java rename to src/main/java/im/rosetta/database/repository/DeviceRepository.java index 35a71f7..128b869 100644 --- a/src/main/java/com/rosetta/im/database/repository/DeviceRepository.java +++ b/src/main/java/im/rosetta/database/repository/DeviceRepository.java @@ -1,10 +1,10 @@ -package com.rosetta.im.database.repository; +package im.rosetta.database.repository; import java.util.List; -import com.rosetta.im.database.Repository; -import com.rosetta.im.database.entity.Device; -import com.rosetta.im.database.entity.User; +import im.rosetta.database.Repository; +import im.rosetta.database.entity.Device; +import im.rosetta.database.entity.User; public class DeviceRepository extends Repository { diff --git a/src/main/java/com/rosetta/im/database/repository/GroupRepository.java b/src/main/java/im/rosetta/database/repository/GroupRepository.java similarity index 97% rename from src/main/java/com/rosetta/im/database/repository/GroupRepository.java rename to src/main/java/im/rosetta/database/repository/GroupRepository.java index 620f6f5..130d469 100644 --- a/src/main/java/com/rosetta/im/database/repository/GroupRepository.java +++ b/src/main/java/im/rosetta/database/repository/GroupRepository.java @@ -1,10 +1,10 @@ -package com.rosetta.im.database.repository; +package im.rosetta.database.repository; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.database.Repository; -import com.rosetta.im.database.entity.Group; +import im.rosetta.database.Repository; +import im.rosetta.database.entity.Group; public class GroupRepository extends Repository { diff --git a/src/main/java/im/rosetta/database/repository/UserRepository.java b/src/main/java/im/rosetta/database/repository/UserRepository.java new file mode 100644 index 0000000..47361fa --- /dev/null +++ b/src/main/java/im/rosetta/database/repository/UserRepository.java @@ -0,0 +1,13 @@ +package im.rosetta.database.repository; + +import im.rosetta.database.Repository; +import im.rosetta.database.entity.User; + +public class UserRepository extends Repository { + + public UserRepository() { + super(User.class); + } + + +} diff --git a/src/main/java/com/rosetta/im/event/Cancelable.java b/src/main/java/im/rosetta/event/Cancelable.java similarity index 92% rename from src/main/java/com/rosetta/im/event/Cancelable.java rename to src/main/java/im/rosetta/event/Cancelable.java index 298ee20..733e35d 100644 --- a/src/main/java/com/rosetta/im/event/Cancelable.java +++ b/src/main/java/im/rosetta/event/Cancelable.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; public interface Cancelable { diff --git a/src/main/java/com/rosetta/im/event/Event.java b/src/main/java/im/rosetta/event/Event.java similarity index 89% rename from src/main/java/com/rosetta/im/event/Event.java rename to src/main/java/im/rosetta/event/Event.java index 205b7f5..baa99b4 100644 --- a/src/main/java/com/rosetta/im/event/Event.java +++ b/src/main/java/im/rosetta/event/Event.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; public class Event { diff --git a/src/main/java/com/rosetta/im/event/EventException.java b/src/main/java/im/rosetta/event/EventException.java similarity index 88% rename from src/main/java/com/rosetta/im/event/EventException.java rename to src/main/java/im/rosetta/event/EventException.java index be5dbd9..10fb361 100644 --- a/src/main/java/com/rosetta/im/event/EventException.java +++ b/src/main/java/im/rosetta/event/EventException.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; public class EventException extends Exception { diff --git a/src/main/java/com/rosetta/im/event/EventHandler.java b/src/main/java/im/rosetta/event/EventHandler.java similarity index 89% rename from src/main/java/com/rosetta/im/event/EventHandler.java rename to src/main/java/im/rosetta/event/EventHandler.java index 6ebb89f..fe9427f 100644 --- a/src/main/java/com/rosetta/im/event/EventHandler.java +++ b/src/main/java/im/rosetta/event/EventHandler.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/rosetta/im/event/EventManager.java b/src/main/java/im/rosetta/event/EventManager.java similarity index 99% rename from src/main/java/com/rosetta/im/event/EventManager.java rename to src/main/java/im/rosetta/event/EventManager.java index 1d46fc7..7bc8f7f 100644 --- a/src/main/java/com/rosetta/im/event/EventManager.java +++ b/src/main/java/im/rosetta/event/EventManager.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/src/main/java/com/rosetta/im/event/EventPriority.java b/src/main/java/im/rosetta/event/EventPriority.java similarity index 94% rename from src/main/java/com/rosetta/im/event/EventPriority.java rename to src/main/java/im/rosetta/event/EventPriority.java index 94edd60..5200d89 100644 --- a/src/main/java/com/rosetta/im/event/EventPriority.java +++ b/src/main/java/im/rosetta/event/EventPriority.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; /** * Приоритет события diff --git a/src/main/java/com/rosetta/im/event/Listener.java b/src/main/java/im/rosetta/event/Listener.java similarity index 86% rename from src/main/java/com/rosetta/im/event/Listener.java rename to src/main/java/im/rosetta/event/Listener.java index 75eaa6c..9e131cd 100644 --- a/src/main/java/com/rosetta/im/event/Listener.java +++ b/src/main/java/im/rosetta/event/Listener.java @@ -1,4 +1,4 @@ -package com.rosetta.im.event; +package im.rosetta.event; /** * Слушатель событий diff --git a/src/main/java/com/rosetta/im/event/events/ConnectEvent.java b/src/main/java/im/rosetta/event/events/ConnectEvent.java similarity index 87% rename from src/main/java/com/rosetta/im/event/events/ConnectEvent.java rename to src/main/java/im/rosetta/event/events/ConnectEvent.java index 055a661..95a194d 100644 --- a/src/main/java/com/rosetta/im/event/events/ConnectEvent.java +++ b/src/main/java/im/rosetta/event/events/ConnectEvent.java @@ -1,7 +1,7 @@ -package com.rosetta.im.event.events; +package im.rosetta.event.events; -import com.rosetta.im.event.Cancelable; -import com.rosetta.im.event.Event; +import im.rosetta.event.Cancelable; +import im.rosetta.event.Event; import io.orprotocol.Server; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/event/events/DisconnectEvent.java b/src/main/java/im/rosetta/event/events/DisconnectEvent.java similarity index 87% rename from src/main/java/com/rosetta/im/event/events/DisconnectEvent.java rename to src/main/java/im/rosetta/event/events/DisconnectEvent.java index a80a2e4..1542a33 100644 --- a/src/main/java/com/rosetta/im/event/events/DisconnectEvent.java +++ b/src/main/java/im/rosetta/event/events/DisconnectEvent.java @@ -1,6 +1,6 @@ -package com.rosetta.im.event.events; +package im.rosetta.event.events; -import com.rosetta.im.event.Event; +import im.rosetta.event.Event; import io.orprotocol.Server; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/event/events/PacketInputEvent.java b/src/main/java/im/rosetta/event/events/PacketInputEvent.java similarity index 89% rename from src/main/java/com/rosetta/im/event/events/PacketInputEvent.java rename to src/main/java/im/rosetta/event/events/PacketInputEvent.java index 71bcb31..465844a 100644 --- a/src/main/java/com/rosetta/im/event/events/PacketInputEvent.java +++ b/src/main/java/im/rosetta/event/events/PacketInputEvent.java @@ -1,7 +1,7 @@ -package com.rosetta.im.event.events; +package im.rosetta.event.events; -import com.rosetta.im.event.Cancelable; -import com.rosetta.im.event.Event; +import im.rosetta.event.Cancelable; +import im.rosetta.event.Event; import io.orprotocol.Server; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/event/events/ServerErrorEvent.java b/src/main/java/im/rosetta/event/events/ServerErrorEvent.java similarity index 86% rename from src/main/java/com/rosetta/im/event/events/ServerErrorEvent.java rename to src/main/java/im/rosetta/event/events/ServerErrorEvent.java index 2774cdb..29eac5f 100644 --- a/src/main/java/com/rosetta/im/event/events/ServerErrorEvent.java +++ b/src/main/java/im/rosetta/event/events/ServerErrorEvent.java @@ -1,6 +1,6 @@ -package com.rosetta.im.event.events; +package im.rosetta.event.events; -import com.rosetta.im.event.Event; +import im.rosetta.event.Event; import io.orprotocol.Server; diff --git a/src/main/java/com/rosetta/im/event/events/ServerStartEvent.java b/src/main/java/im/rosetta/event/events/ServerStartEvent.java similarity index 81% rename from src/main/java/com/rosetta/im/event/events/ServerStartEvent.java rename to src/main/java/im/rosetta/event/events/ServerStartEvent.java index d491f67..0296798 100644 --- a/src/main/java/com/rosetta/im/event/events/ServerStartEvent.java +++ b/src/main/java/im/rosetta/event/events/ServerStartEvent.java @@ -1,6 +1,6 @@ -package com.rosetta.im.event.events; +package im.rosetta.event.events; -import com.rosetta.im.event.Event; +import im.rosetta.event.Event; import io.orprotocol.Server; diff --git a/src/main/java/com/rosetta/im/event/events/ServerStopEvent.java b/src/main/java/im/rosetta/event/events/ServerStopEvent.java similarity index 81% rename from src/main/java/com/rosetta/im/event/events/ServerStopEvent.java rename to src/main/java/im/rosetta/event/events/ServerStopEvent.java index 8b4ac85..031971b 100644 --- a/src/main/java/com/rosetta/im/event/events/ServerStopEvent.java +++ b/src/main/java/im/rosetta/event/events/ServerStopEvent.java @@ -1,6 +1,6 @@ -package com.rosetta.im.event.events; +package im.rosetta.event.events; -import com.rosetta.im.event.Event; +import im.rosetta.event.Event; import io.orprotocol.Server; diff --git a/src/main/java/com/rosetta/im/event/events/handshake/BaseHandshakeEvent.java b/src/main/java/im/rosetta/event/events/handshake/BaseHandshakeEvent.java similarity index 84% rename from src/main/java/com/rosetta/im/event/events/handshake/BaseHandshakeEvent.java rename to src/main/java/im/rosetta/event/events/handshake/BaseHandshakeEvent.java index 7506235..d1c9195 100644 --- a/src/main/java/com/rosetta/im/event/events/handshake/BaseHandshakeEvent.java +++ b/src/main/java/im/rosetta/event/events/handshake/BaseHandshakeEvent.java @@ -1,9 +1,9 @@ -package com.rosetta.im.event.events.handshake; +package im.rosetta.event.events.handshake; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; -import com.rosetta.im.event.Cancelable; -import com.rosetta.im.event.Event; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; +import im.rosetta.event.Cancelable; +import im.rosetta.event.Event; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/event/events/handshake/HandshakeCompletedEvent.java b/src/main/java/im/rosetta/event/events/handshake/HandshakeCompletedEvent.java similarity index 69% rename from src/main/java/com/rosetta/im/event/events/handshake/HandshakeCompletedEvent.java rename to src/main/java/im/rosetta/event/events/handshake/HandshakeCompletedEvent.java index 60f9cce..d8cf83c 100644 --- a/src/main/java/com/rosetta/im/event/events/handshake/HandshakeCompletedEvent.java +++ b/src/main/java/im/rosetta/event/events/handshake/HandshakeCompletedEvent.java @@ -1,8 +1,8 @@ -package com.rosetta.im.event.events.handshake; +package im.rosetta.event.events.handshake; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/event/events/handshake/HandshakeDeviceConfirmEvent.java b/src/main/java/im/rosetta/event/events/handshake/HandshakeDeviceConfirmEvent.java similarity index 80% rename from src/main/java/com/rosetta/im/event/events/handshake/HandshakeDeviceConfirmEvent.java rename to src/main/java/im/rosetta/event/events/handshake/HandshakeDeviceConfirmEvent.java index 120ce39..21a4169 100644 --- a/src/main/java/com/rosetta/im/event/events/handshake/HandshakeDeviceConfirmEvent.java +++ b/src/main/java/im/rosetta/event/events/handshake/HandshakeDeviceConfirmEvent.java @@ -1,7 +1,7 @@ -package com.rosetta.im.event.events.handshake; +package im.rosetta.event.events.handshake; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/event/events/handshake/HandshakeFailedEvent.java b/src/main/java/im/rosetta/event/events/handshake/HandshakeFailedEvent.java similarity index 70% rename from src/main/java/com/rosetta/im/event/events/handshake/HandshakeFailedEvent.java rename to src/main/java/im/rosetta/event/events/handshake/HandshakeFailedEvent.java index 2f769ae..e858d4c 100644 --- a/src/main/java/com/rosetta/im/event/events/handshake/HandshakeFailedEvent.java +++ b/src/main/java/im/rosetta/event/events/handshake/HandshakeFailedEvent.java @@ -1,7 +1,7 @@ -package com.rosetta.im.event.events.handshake; +package im.rosetta.event.events.handshake; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/exception/ConfigurationException.java b/src/main/java/im/rosetta/exception/ConfigurationException.java similarity index 87% rename from src/main/java/com/rosetta/im/exception/ConfigurationException.java rename to src/main/java/im/rosetta/exception/ConfigurationException.java index a5a42eb..c58b0e5 100644 --- a/src/main/java/com/rosetta/im/exception/ConfigurationException.java +++ b/src/main/java/im/rosetta/exception/ConfigurationException.java @@ -1,4 +1,4 @@ -package com.rosetta.im.exception; +package im.rosetta.exception; /** * Выбрасывается когда файл конфигурации не найден diff --git a/src/main/java/com/rosetta/im/exception/UnauthorizedExeception.java b/src/main/java/im/rosetta/exception/UnauthorizedExeception.java similarity index 80% rename from src/main/java/com/rosetta/im/exception/UnauthorizedExeception.java rename to src/main/java/im/rosetta/exception/UnauthorizedExeception.java index 9766fcb..bcd97fc 100644 --- a/src/main/java/com/rosetta/im/exception/UnauthorizedExeception.java +++ b/src/main/java/im/rosetta/exception/UnauthorizedExeception.java @@ -1,4 +1,4 @@ -package com.rosetta.im.exception; +package im.rosetta.exception; public class UnauthorizedExeception extends Exception { diff --git a/src/main/java/com/rosetta/im/executors/Executor0Handshake.java b/src/main/java/im/rosetta/executors/Executor0Handshake.java similarity index 91% rename from src/main/java/com/rosetta/im/executors/Executor0Handshake.java rename to src/main/java/im/rosetta/executors/Executor0Handshake.java index 2df0421..da59bcd 100644 --- a/src/main/java/com/rosetta/im/executors/Executor0Handshake.java +++ b/src/main/java/im/rosetta/executors/Executor0Handshake.java @@ -1,23 +1,23 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; -import com.rosetta.im.database.entity.Device; -import com.rosetta.im.database.entity.User; -import com.rosetta.im.database.repository.BufferRepository; -import com.rosetta.im.database.repository.DeviceRepository; -import com.rosetta.im.database.repository.UserRepository; -import com.rosetta.im.event.EventManager; -import com.rosetta.im.event.events.handshake.HandshakeCompletedEvent; -import com.rosetta.im.event.events.handshake.HandshakeDeviceConfirmEvent; -import com.rosetta.im.event.events.handshake.HandshakeFailedEvent; -import com.rosetta.im.packet.Packet0Handshake; -import com.rosetta.im.packet.Packet9DeviceNew; -import com.rosetta.im.packet.runtime.HandshakeStage; -import com.rosetta.im.service.services.BufferService; -import com.rosetta.im.service.services.DeviceService; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; +import im.rosetta.database.entity.Device; +import im.rosetta.database.entity.User; +import im.rosetta.database.repository.BufferRepository; +import im.rosetta.database.repository.DeviceRepository; +import im.rosetta.database.repository.UserRepository; +import im.rosetta.event.EventManager; +import im.rosetta.event.events.handshake.HandshakeCompletedEvent; +import im.rosetta.event.events.handshake.HandshakeDeviceConfirmEvent; +import im.rosetta.event.events.handshake.HandshakeFailedEvent; +import im.rosetta.packet.Packet0Handshake; +import im.rosetta.packet.Packet9DeviceNew; +import im.rosetta.packet.runtime.HandshakeStage; +import im.rosetta.service.services.BufferService; +import im.rosetta.service.services.DeviceService; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor10RequestUpdate.java b/src/main/java/im/rosetta/executors/Executor10RequestUpdate.java similarity index 93% rename from src/main/java/com/rosetta/im/executors/Executor10RequestUpdate.java rename to src/main/java/im/rosetta/executors/Executor10RequestUpdate.java index d2c2dda..64d3a41 100644 --- a/src/main/java/com/rosetta/im/executors/Executor10RequestUpdate.java +++ b/src/main/java/im/rosetta/executors/Executor10RequestUpdate.java @@ -1,10 +1,10 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.Arrays; import java.util.List; -import com.rosetta.im.packet.Packet10RequestUpdate; -import com.rosetta.im.util.RandomUtil; +import im.rosetta.packet.Packet10RequestUpdate; +import im.rosetta.util.RandomUtil; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor11Typeing.java b/src/main/java/im/rosetta/executors/Executor11Typeing.java similarity index 91% rename from src/main/java/com/rosetta/im/executors/Executor11Typeing.java rename to src/main/java/im/rosetta/executors/Executor11Typeing.java index d54e874..7729fdd 100644 --- a/src/main/java/com/rosetta/im/executors/Executor11Typeing.java +++ b/src/main/java/im/rosetta/executors/Executor11Typeing.java @@ -1,10 +1,10 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.packet.Packet11Typeing; -import com.rosetta.im.service.dispatch.MessageDispatcher; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.packet.Packet11Typeing; +import im.rosetta.service.dispatch.MessageDispatcher; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor15RequestTransport.java b/src/main/java/im/rosetta/executors/Executor15RequestTransport.java similarity index 88% rename from src/main/java/com/rosetta/im/executors/Executor15RequestTransport.java rename to src/main/java/im/rosetta/executors/Executor15RequestTransport.java index 249e490..2ff7c74 100644 --- a/src/main/java/com/rosetta/im/executors/Executor15RequestTransport.java +++ b/src/main/java/im/rosetta/executors/Executor15RequestTransport.java @@ -1,12 +1,12 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.Arrays; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.packet.Packet15RequestTransport; -import com.rosetta.im.util.RandomUtil; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.packet.Packet15RequestTransport; +import im.rosetta.util.RandomUtil; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor16PushNotification.java b/src/main/java/im/rosetta/executors/Executor16PushNotification.java similarity index 83% rename from src/main/java/com/rosetta/im/executors/Executor16PushNotification.java rename to src/main/java/im/rosetta/executors/Executor16PushNotification.java index 2b506c9..370c846 100644 --- a/src/main/java/com/rosetta/im/executors/Executor16PushNotification.java +++ b/src/main/java/im/rosetta/executors/Executor16PushNotification.java @@ -1,11 +1,11 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.User; -import com.rosetta.im.database.repository.UserRepository; -import com.rosetta.im.packet.Packet16PushNotification; -import com.rosetta.im.service.services.UserService; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.User; +import im.rosetta.database.repository.UserRepository; +import im.rosetta.packet.Packet16PushNotification; +import im.rosetta.service.services.UserService; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor17GroupCreate.java b/src/main/java/im/rosetta/executors/Executor17GroupCreate.java similarity index 80% rename from src/main/java/com/rosetta/im/executors/Executor17GroupCreate.java rename to src/main/java/im/rosetta/executors/Executor17GroupCreate.java index b2f4b9a..e85dfae 100644 --- a/src/main/java/com/rosetta/im/executors/Executor17GroupCreate.java +++ b/src/main/java/im/rosetta/executors/Executor17GroupCreate.java @@ -1,10 +1,10 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.Packet17GroupCreate; -import com.rosetta.im.util.RandomUtil; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.Packet17GroupCreate; +import im.rosetta.util.RandomUtil; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor18GroupInfo.java b/src/main/java/im/rosetta/executors/Executor18GroupInfo.java similarity index 89% rename from src/main/java/com/rosetta/im/executors/Executor18GroupInfo.java rename to src/main/java/im/rosetta/executors/Executor18GroupInfo.java index 33a75bd..082b508 100644 --- a/src/main/java/com/rosetta/im/executors/Executor18GroupInfo.java +++ b/src/main/java/im/rosetta/executors/Executor18GroupInfo.java @@ -1,12 +1,12 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.ArrayList; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.Group; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.Packet18GroupInfo; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.Group; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.Packet18GroupInfo; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor19GroupInviteInfo.java b/src/main/java/im/rosetta/executors/Executor19GroupInviteInfo.java similarity index 86% rename from src/main/java/com/rosetta/im/executors/Executor19GroupInviteInfo.java rename to src/main/java/im/rosetta/executors/Executor19GroupInviteInfo.java index 3cc5e61..0eeaace 100644 --- a/src/main/java/com/rosetta/im/executors/Executor19GroupInviteInfo.java +++ b/src/main/java/im/rosetta/executors/Executor19GroupInviteInfo.java @@ -1,11 +1,11 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.Group; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.Packet19GroupInviteInfo; -import com.rosetta.im.packet.runtime.NetworkGroupStatus; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.Group; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.Packet19GroupInviteInfo; +import im.rosetta.packet.runtime.NetworkGroupStatus; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor1UserInfo.java b/src/main/java/im/rosetta/executors/Executor1UserInfo.java similarity index 94% rename from src/main/java/com/rosetta/im/executors/Executor1UserInfo.java rename to src/main/java/im/rosetta/executors/Executor1UserInfo.java index 586b539..3dee967 100644 --- a/src/main/java/com/rosetta/im/executors/Executor1UserInfo.java +++ b/src/main/java/im/rosetta/executors/Executor1UserInfo.java @@ -1,18 +1,18 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.Arrays; import java.util.HashSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.User; -import com.rosetta.im.database.repository.UserRepository; -import com.rosetta.im.packet.Packet1UserInfo; -import com.rosetta.im.packet.Packet2Result; -import com.rosetta.im.packet.runtime.ResultCode; -import com.rosetta.im.service.services.UserService; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.User; +import im.rosetta.database.repository.UserRepository; +import im.rosetta.packet.Packet1UserInfo; +import im.rosetta.packet.Packet2Result; +import im.rosetta.packet.runtime.ResultCode; +import im.rosetta.service.services.UserService; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor20GroupJoin.java b/src/main/java/im/rosetta/executors/Executor20GroupJoin.java similarity index 87% rename from src/main/java/com/rosetta/im/executors/Executor20GroupJoin.java rename to src/main/java/im/rosetta/executors/Executor20GroupJoin.java index 06016ed..6f89877 100644 --- a/src/main/java/com/rosetta/im/executors/Executor20GroupJoin.java +++ b/src/main/java/im/rosetta/executors/Executor20GroupJoin.java @@ -1,11 +1,11 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.Group; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.Packet20GroupJoin; -import com.rosetta.im.packet.runtime.NetworkGroupStatus; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.Group; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.Packet20GroupJoin; +import im.rosetta.packet.runtime.NetworkGroupStatus; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor21GroupLeave.java b/src/main/java/im/rosetta/executors/Executor21GroupLeave.java similarity index 91% rename from src/main/java/com/rosetta/im/executors/Executor21GroupLeave.java rename to src/main/java/im/rosetta/executors/Executor21GroupLeave.java index 3723ad6..451d406 100644 --- a/src/main/java/com/rosetta/im/executors/Executor21GroupLeave.java +++ b/src/main/java/im/rosetta/executors/Executor21GroupLeave.java @@ -1,10 +1,10 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.Group; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.Packet21GroupLeave; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.Group; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.Packet21GroupLeave; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor22GroupBan.java b/src/main/java/im/rosetta/executors/Executor22GroupBan.java similarity index 91% rename from src/main/java/com/rosetta/im/executors/Executor22GroupBan.java rename to src/main/java/im/rosetta/executors/Executor22GroupBan.java index df57748..409aee1 100644 --- a/src/main/java/com/rosetta/im/executors/Executor22GroupBan.java +++ b/src/main/java/im/rosetta/executors/Executor22GroupBan.java @@ -1,13 +1,13 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.Group; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.Packet18GroupInfo; -import com.rosetta.im.packet.Packet22GroupBan; +import im.rosetta.Failures; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.Group; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.Packet18GroupInfo; +import im.rosetta.packet.Packet22GroupBan; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor24DeviceResolve.java b/src/main/java/im/rosetta/executors/Executor24DeviceResolve.java similarity index 90% rename from src/main/java/com/rosetta/im/executors/Executor24DeviceResolve.java rename to src/main/java/im/rosetta/executors/Executor24DeviceResolve.java index 93fce90..85a1511 100644 --- a/src/main/java/com/rosetta/im/executors/Executor24DeviceResolve.java +++ b/src/main/java/im/rosetta/executors/Executor24DeviceResolve.java @@ -1,20 +1,20 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; -import com.rosetta.im.database.entity.Device; -import com.rosetta.im.database.repository.DeviceRepository; -import com.rosetta.im.event.EventManager; -import com.rosetta.im.event.events.handshake.HandshakeCompletedEvent; -import com.rosetta.im.packet.Packet0Handshake; -import com.rosetta.im.packet.Packet24DeviceResolve; -import com.rosetta.im.packet.runtime.DeviceSolution; -import com.rosetta.im.packet.runtime.HandshakeStage; -import com.rosetta.im.service.dispatch.DeviceDispatcher; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; +import im.rosetta.database.entity.Device; +import im.rosetta.database.repository.DeviceRepository; +import im.rosetta.event.EventManager; +import im.rosetta.event.events.handshake.HandshakeCompletedEvent; +import im.rosetta.packet.Packet0Handshake; +import im.rosetta.packet.Packet24DeviceResolve; +import im.rosetta.packet.runtime.DeviceSolution; +import im.rosetta.packet.runtime.HandshakeStage; +import im.rosetta.service.dispatch.DeviceDispatcher; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor3Search.java b/src/main/java/im/rosetta/executors/Executor3Search.java similarity index 81% rename from src/main/java/com/rosetta/im/executors/Executor3Search.java rename to src/main/java/im/rosetta/executors/Executor3Search.java index 9242ae0..386e329 100644 --- a/src/main/java/com/rosetta/im/executors/Executor3Search.java +++ b/src/main/java/im/rosetta/executors/Executor3Search.java @@ -1,17 +1,17 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.entity.User; -import com.rosetta.im.database.repository.UserRepository; -import com.rosetta.im.packet.Packet3Search; -import com.rosetta.im.packet.runtime.NetworkStatus; -import com.rosetta.im.packet.runtime.SearchInfo; -import com.rosetta.im.service.services.UserService; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.entity.User; +import im.rosetta.database.repository.UserRepository; +import im.rosetta.packet.Packet3Search; +import im.rosetta.packet.runtime.NetworkStatus; +import im.rosetta.packet.runtime.SearchInfo; +import im.rosetta.service.services.UserService; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor4OnlineState.java b/src/main/java/im/rosetta/executors/Executor4OnlineState.java similarity index 86% rename from src/main/java/com/rosetta/im/executors/Executor4OnlineState.java rename to src/main/java/im/rosetta/executors/Executor4OnlineState.java index f508ed6..200cf61 100644 --- a/src/main/java/com/rosetta/im/executors/Executor4OnlineState.java +++ b/src/main/java/im/rosetta/executors/Executor4OnlineState.java @@ -1,16 +1,16 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.OnlineManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.packet.Packet4OnlineSubscribe; -import com.rosetta.im.packet.Packet5OnlineState; -import com.rosetta.im.packet.runtime.NetworkStatus; -import com.rosetta.im.packet.runtime.PKNetworkStatus; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.OnlineManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.packet.Packet4OnlineSubscribe; +import im.rosetta.packet.Packet5OnlineState; +import im.rosetta.packet.runtime.NetworkStatus; +import im.rosetta.packet.runtime.PKNetworkStatus; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor6Message.java b/src/main/java/im/rosetta/executors/Executor6Message.java similarity index 93% rename from src/main/java/com/rosetta/im/executors/Executor6Message.java rename to src/main/java/im/rosetta/executors/Executor6Message.java index 003bd71..dda3a49 100644 --- a/src/main/java/com/rosetta/im/executors/Executor6Message.java +++ b/src/main/java/im/rosetta/executors/Executor6Message.java @@ -1,14 +1,14 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.packet.Packet6Message; -import com.rosetta.im.packet.Packet8Delivery; -import com.rosetta.im.packet.runtime.Attachment; -import com.rosetta.im.service.dispatch.MessageDispatcher; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.packet.Packet6Message; +import im.rosetta.packet.Packet8Delivery; +import im.rosetta.packet.runtime.Attachment; +import im.rosetta.service.dispatch.MessageDispatcher; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/executors/Executor7Read.java b/src/main/java/im/rosetta/executors/Executor7Read.java similarity index 89% rename from src/main/java/com/rosetta/im/executors/Executor7Read.java rename to src/main/java/im/rosetta/executors/Executor7Read.java index ecbeea2..8383e21 100644 --- a/src/main/java/com/rosetta/im/executors/Executor7Read.java +++ b/src/main/java/im/rosetta/executors/Executor7Read.java @@ -1,10 +1,10 @@ -package com.rosetta.im.executors; +package im.rosetta.executors; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.packet.Packet7Read; -import com.rosetta.im.service.dispatch.MessageDispatcher; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.packet.Packet7Read; +import im.rosetta.service.dispatch.MessageDispatcher; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/im/rosetta/executors/base/ExecutorBaseDialog.java b/src/main/java/im/rosetta/executors/base/ExecutorBaseDialog.java new file mode 100644 index 0000000..184322d --- /dev/null +++ b/src/main/java/im/rosetta/executors/base/ExecutorBaseDialog.java @@ -0,0 +1,5 @@ +package im.rosetta.executors.base; + +public class ExecutorBaseDialog { + +} diff --git a/src/main/java/com/rosetta/im/listeners/DeviceListListener.java b/src/main/java/im/rosetta/listeners/DeviceListListener.java similarity index 82% rename from src/main/java/com/rosetta/im/listeners/DeviceListListener.java rename to src/main/java/im/rosetta/listeners/DeviceListListener.java index 231414e..5a3243f 100644 --- a/src/main/java/com/rosetta/im/listeners/DeviceListListener.java +++ b/src/main/java/im/rosetta/listeners/DeviceListListener.java @@ -1,13 +1,13 @@ -package com.rosetta.im.listeners; +package im.rosetta.listeners; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.event.EventHandler; -import com.rosetta.im.event.Listener; -import com.rosetta.im.event.events.DisconnectEvent; -import com.rosetta.im.event.events.handshake.HandshakeCompletedEvent; -import com.rosetta.im.event.events.handshake.HandshakeDeviceConfirmEvent; -import com.rosetta.im.service.dispatch.DeviceDispatcher; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.event.EventHandler; +import im.rosetta.event.Listener; +import im.rosetta.event.events.DisconnectEvent; +import im.rosetta.event.events.handshake.HandshakeCompletedEvent; +import im.rosetta.event.events.handshake.HandshakeDeviceConfirmEvent; +import im.rosetta.service.dispatch.DeviceDispatcher; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/listeners/HandshakeCompleteListener.java b/src/main/java/im/rosetta/listeners/HandshakeCompleteListener.java similarity index 68% rename from src/main/java/com/rosetta/im/listeners/HandshakeCompleteListener.java rename to src/main/java/im/rosetta/listeners/HandshakeCompleteListener.java index 39e1658..c20f7dd 100644 --- a/src/main/java/com/rosetta/im/listeners/HandshakeCompleteListener.java +++ b/src/main/java/im/rosetta/listeners/HandshakeCompleteListener.java @@ -1,7 +1,7 @@ -package com.rosetta.im.listeners; +package im.rosetta.listeners; -import com.rosetta.im.event.Listener; -import com.rosetta.im.event.events.handshake.HandshakeCompletedEvent; +import im.rosetta.event.Listener; +import im.rosetta.event.events.handshake.HandshakeCompletedEvent; public class HandshakeCompleteListener implements Listener { diff --git a/src/main/java/com/rosetta/im/listeners/OnlineStatusDisconnectListener.java b/src/main/java/im/rosetta/listeners/OnlineStatusDisconnectListener.java similarity index 82% rename from src/main/java/com/rosetta/im/listeners/OnlineStatusDisconnectListener.java rename to src/main/java/im/rosetta/listeners/OnlineStatusDisconnectListener.java index e47e42d..54759d6 100644 --- a/src/main/java/com/rosetta/im/listeners/OnlineStatusDisconnectListener.java +++ b/src/main/java/im/rosetta/listeners/OnlineStatusDisconnectListener.java @@ -1,16 +1,16 @@ -package com.rosetta.im.listeners; +package im.rosetta.listeners; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.client.OnlineManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.event.EventHandler; -import com.rosetta.im.event.Listener; -import com.rosetta.im.event.events.DisconnectEvent; -import com.rosetta.im.packet.Packet5OnlineState; -import com.rosetta.im.packet.runtime.NetworkStatus; -import com.rosetta.im.packet.runtime.PKNetworkStatus; +import im.rosetta.client.OnlineManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.event.EventHandler; +import im.rosetta.event.Listener; +import im.rosetta.event.events.DisconnectEvent; +import im.rosetta.packet.Packet5OnlineState; +import im.rosetta.packet.runtime.NetworkStatus; +import im.rosetta.packet.runtime.PKNetworkStatus; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/listeners/OnlineStatusHandshakeCompleteListener.java b/src/main/java/im/rosetta/listeners/OnlineStatusHandshakeCompleteListener.java similarity index 82% rename from src/main/java/com/rosetta/im/listeners/OnlineStatusHandshakeCompleteListener.java rename to src/main/java/im/rosetta/listeners/OnlineStatusHandshakeCompleteListener.java index 139cdd3..25cd0bc 100644 --- a/src/main/java/com/rosetta/im/listeners/OnlineStatusHandshakeCompleteListener.java +++ b/src/main/java/im/rosetta/listeners/OnlineStatusHandshakeCompleteListener.java @@ -1,16 +1,16 @@ -package com.rosetta.im.listeners; +package im.rosetta.listeners; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.client.OnlineManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.event.EventHandler; -import com.rosetta.im.event.Listener; -import com.rosetta.im.event.events.handshake.HandshakeCompletedEvent; -import com.rosetta.im.packet.Packet5OnlineState; -import com.rosetta.im.packet.runtime.NetworkStatus; -import com.rosetta.im.packet.runtime.PKNetworkStatus; +import im.rosetta.client.OnlineManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.event.EventHandler; +import im.rosetta.event.Listener; +import im.rosetta.event.events.handshake.HandshakeCompletedEvent; +import im.rosetta.packet.Packet5OnlineState; +import im.rosetta.packet.runtime.NetworkStatus; +import im.rosetta.packet.runtime.PKNetworkStatus; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/listeners/ServerStopListener.java b/src/main/java/im/rosetta/listeners/ServerStopListener.java similarity index 83% rename from src/main/java/com/rosetta/im/listeners/ServerStopListener.java rename to src/main/java/im/rosetta/listeners/ServerStopListener.java index 9aae8cb..b911fba 100644 --- a/src/main/java/com/rosetta/im/listeners/ServerStopListener.java +++ b/src/main/java/im/rosetta/listeners/ServerStopListener.java @@ -1,13 +1,13 @@ -package com.rosetta.im.listeners; +package im.rosetta.listeners; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.client.tags.ECIDevice; -import com.rosetta.im.database.repository.DeviceRepository; -import com.rosetta.im.event.EventHandler; -import com.rosetta.im.event.Listener; -import com.rosetta.im.event.events.ServerStopEvent; -import com.rosetta.im.logger.Logger; -import com.rosetta.im.logger.enums.Color; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.client.tags.ECIDevice; +import im.rosetta.database.repository.DeviceRepository; +import im.rosetta.event.EventHandler; +import im.rosetta.event.Listener; +import im.rosetta.event.events.ServerStopEvent; +import im.rosetta.logger.Logger; +import im.rosetta.logger.enums.Color; import io.orprotocol.Server; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/logger/Logger.java b/src/main/java/im/rosetta/logger/Logger.java similarity index 95% rename from src/main/java/com/rosetta/im/logger/Logger.java rename to src/main/java/im/rosetta/logger/Logger.java index 46586f0..e66ed29 100644 --- a/src/main/java/com/rosetta/im/logger/Logger.java +++ b/src/main/java/im/rosetta/logger/Logger.java @@ -1,9 +1,9 @@ -package com.rosetta.im.logger; +package im.rosetta.logger; import java.time.Instant; -import com.rosetta.im.logger.enums.Color; -import com.rosetta.im.logger.enums.LogLevel; +import im.rosetta.logger.enums.Color; +import im.rosetta.logger.enums.LogLevel; public class Logger { diff --git a/src/main/java/com/rosetta/im/logger/enums/Color.java b/src/main/java/im/rosetta/logger/enums/Color.java similarity index 93% rename from src/main/java/com/rosetta/im/logger/enums/Color.java rename to src/main/java/im/rosetta/logger/enums/Color.java index 2e9a6e2..b7b8190 100644 --- a/src/main/java/com/rosetta/im/logger/enums/Color.java +++ b/src/main/java/im/rosetta/logger/enums/Color.java @@ -1,4 +1,4 @@ -package com.rosetta.im.logger.enums; +package im.rosetta.logger.enums; public final class Color { public static final String RESET = "\u001B[0m"; diff --git a/src/main/java/com/rosetta/im/logger/enums/LogLevel.java b/src/main/java/im/rosetta/logger/enums/LogLevel.java similarity index 82% rename from src/main/java/com/rosetta/im/logger/enums/LogLevel.java rename to src/main/java/im/rosetta/logger/enums/LogLevel.java index 759b415..0cb0bda 100644 --- a/src/main/java/com/rosetta/im/logger/enums/LogLevel.java +++ b/src/main/java/im/rosetta/logger/enums/LogLevel.java @@ -1,4 +1,4 @@ -package com.rosetta.im.logger.enums; +package im.rosetta.logger.enums; public enum LogLevel { INFO, diff --git a/src/main/java/com/rosetta/im/packet/Packet0Handshake.java b/src/main/java/im/rosetta/packet/Packet0Handshake.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet0Handshake.java rename to src/main/java/im/rosetta/packet/Packet0Handshake.java index 44f415c..6989622 100644 --- a/src/main/java/com/rosetta/im/packet/Packet0Handshake.java +++ b/src/main/java/im/rosetta/packet/Packet0Handshake.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.runtime.HandshakeStage; +import im.rosetta.packet.runtime.HandshakeStage; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet10RequestUpdate.java b/src/main/java/im/rosetta/packet/Packet10RequestUpdate.java similarity index 81% rename from src/main/java/com/rosetta/im/packet/Packet10RequestUpdate.java rename to src/main/java/im/rosetta/packet/Packet10RequestUpdate.java index e3f9beb..4be20f7 100644 --- a/src/main/java/com/rosetta/im/packet/Packet10RequestUpdate.java +++ b/src/main/java/im/rosetta/packet/Packet10RequestUpdate.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.base.PacketBaseServer; +import im.rosetta.packet.base.PacketBaseServer; /** * Получает сервер обновления diff --git a/src/main/java/com/rosetta/im/packet/Packet11Typeing.java b/src/main/java/im/rosetta/packet/Packet11Typeing.java similarity index 89% rename from src/main/java/com/rosetta/im/packet/Packet11Typeing.java rename to src/main/java/im/rosetta/packet/Packet11Typeing.java index a9530d0..882df07 100644 --- a/src/main/java/com/rosetta/im/packet/Packet11Typeing.java +++ b/src/main/java/im/rosetta/packet/Packet11Typeing.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.base.PacketBaseDialog; +import im.rosetta.packet.base.PacketBaseDialog; import io.orprotocol.Stream; diff --git a/src/main/java/com/rosetta/im/packet/Packet15RequestTransport.java b/src/main/java/im/rosetta/packet/Packet15RequestTransport.java similarity index 90% rename from src/main/java/com/rosetta/im/packet/Packet15RequestTransport.java rename to src/main/java/im/rosetta/packet/Packet15RequestTransport.java index b23ed06..f5164d9 100644 --- a/src/main/java/com/rosetta/im/packet/Packet15RequestTransport.java +++ b/src/main/java/im/rosetta/packet/Packet15RequestTransport.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.base.PacketBaseServer; +import im.rosetta.packet.base.PacketBaseServer; /** * Пакет отправляется клиентом для запроса транспортного сервера, строка в этот момент клиентом diff --git a/src/main/java/com/rosetta/im/packet/Packet16PushNotification.java b/src/main/java/im/rosetta/packet/Packet16PushNotification.java similarity index 96% rename from src/main/java/com/rosetta/im/packet/Packet16PushNotification.java rename to src/main/java/im/rosetta/packet/Packet16PushNotification.java index fb1844d..02a6ba4 100644 --- a/src/main/java/com/rosetta/im/packet/Packet16PushNotification.java +++ b/src/main/java/im/rosetta/packet/Packet16PushNotification.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.runtime.NetworkNotificationAction; +import im.rosetta.packet.runtime.NetworkNotificationAction; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet17GroupCreate.java b/src/main/java/im/rosetta/packet/Packet17GroupCreate.java similarity index 96% rename from src/main/java/com/rosetta/im/packet/Packet17GroupCreate.java rename to src/main/java/im/rosetta/packet/Packet17GroupCreate.java index de88c11..c7609e9 100644 --- a/src/main/java/com/rosetta/im/packet/Packet17GroupCreate.java +++ b/src/main/java/im/rosetta/packet/Packet17GroupCreate.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet18GroupInfo.java b/src/main/java/im/rosetta/packet/Packet18GroupInfo.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet18GroupInfo.java rename to src/main/java/im/rosetta/packet/Packet18GroupInfo.java index 236ed01..22a304d 100644 --- a/src/main/java/com/rosetta/im/packet/Packet18GroupInfo.java +++ b/src/main/java/im/rosetta/packet/Packet18GroupInfo.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import java.util.List; diff --git a/src/main/java/com/rosetta/im/packet/Packet19GroupInviteInfo.java b/src/main/java/im/rosetta/packet/Packet19GroupInviteInfo.java similarity index 96% rename from src/main/java/com/rosetta/im/packet/Packet19GroupInviteInfo.java rename to src/main/java/im/rosetta/packet/Packet19GroupInviteInfo.java index 74c568f..ff1dc62 100644 --- a/src/main/java/com/rosetta/im/packet/Packet19GroupInviteInfo.java +++ b/src/main/java/im/rosetta/packet/Packet19GroupInviteInfo.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.runtime.NetworkGroupStatus; +import im.rosetta.packet.runtime.NetworkGroupStatus; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet1UserInfo.java b/src/main/java/im/rosetta/packet/Packet1UserInfo.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet1UserInfo.java rename to src/main/java/im/rosetta/packet/Packet1UserInfo.java index 1170586..9511977 100644 --- a/src/main/java/com/rosetta/im/packet/Packet1UserInfo.java +++ b/src/main/java/im/rosetta/packet/Packet1UserInfo.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet20GroupJoin.java b/src/main/java/im/rosetta/packet/Packet20GroupJoin.java similarity index 94% rename from src/main/java/com/rosetta/im/packet/Packet20GroupJoin.java rename to src/main/java/im/rosetta/packet/Packet20GroupJoin.java index d8d660f..1abbcc1 100644 --- a/src/main/java/com/rosetta/im/packet/Packet20GroupJoin.java +++ b/src/main/java/im/rosetta/packet/Packet20GroupJoin.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.runtime.NetworkGroupStatus; +import im.rosetta.packet.runtime.NetworkGroupStatus; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet21GroupLeave.java b/src/main/java/im/rosetta/packet/Packet21GroupLeave.java similarity index 97% rename from src/main/java/com/rosetta/im/packet/Packet21GroupLeave.java rename to src/main/java/im/rosetta/packet/Packet21GroupLeave.java index 9e1cdb0..6beda91 100644 --- a/src/main/java/com/rosetta/im/packet/Packet21GroupLeave.java +++ b/src/main/java/im/rosetta/packet/Packet21GroupLeave.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet22GroupBan.java b/src/main/java/im/rosetta/packet/Packet22GroupBan.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet22GroupBan.java rename to src/main/java/im/rosetta/packet/Packet22GroupBan.java index e9c7faf..ab53427 100644 --- a/src/main/java/com/rosetta/im/packet/Packet22GroupBan.java +++ b/src/main/java/im/rosetta/packet/Packet22GroupBan.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet23DeviceList.java b/src/main/java/im/rosetta/packet/Packet23DeviceList.java similarity index 92% rename from src/main/java/com/rosetta/im/packet/Packet23DeviceList.java rename to src/main/java/im/rosetta/packet/Packet23DeviceList.java index 1478c11..ad98bc7 100644 --- a/src/main/java/com/rosetta/im/packet/Packet23DeviceList.java +++ b/src/main/java/im/rosetta/packet/Packet23DeviceList.java @@ -1,10 +1,10 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import java.util.List; -import com.rosetta.im.packet.runtime.DeviceSolution; -import com.rosetta.im.packet.runtime.NetworkDevice; -import com.rosetta.im.packet.runtime.NetworkStatus; +import im.rosetta.packet.runtime.DeviceSolution; +import im.rosetta.packet.runtime.NetworkDevice; +import im.rosetta.packet.runtime.NetworkStatus; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet24DeviceResolve.java b/src/main/java/im/rosetta/packet/Packet24DeviceResolve.java similarity index 93% rename from src/main/java/com/rosetta/im/packet/Packet24DeviceResolve.java rename to src/main/java/im/rosetta/packet/Packet24DeviceResolve.java index 6dbcc84..6ca5cd8 100644 --- a/src/main/java/com/rosetta/im/packet/Packet24DeviceResolve.java +++ b/src/main/java/im/rosetta/packet/Packet24DeviceResolve.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.runtime.DeviceSolution; +import im.rosetta.packet.runtime.DeviceSolution; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet2Result.java b/src/main/java/im/rosetta/packet/Packet2Result.java similarity index 92% rename from src/main/java/com/rosetta/im/packet/Packet2Result.java rename to src/main/java/im/rosetta/packet/Packet2Result.java index cd327a1..6d0e015 100644 --- a/src/main/java/com/rosetta/im/packet/Packet2Result.java +++ b/src/main/java/im/rosetta/packet/Packet2Result.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.runtime.ResultCode; +import im.rosetta.packet.runtime.ResultCode; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet3Search.java b/src/main/java/im/rosetta/packet/Packet3Search.java similarity index 97% rename from src/main/java/com/rosetta/im/packet/Packet3Search.java rename to src/main/java/im/rosetta/packet/Packet3Search.java index 683160b..42f312f 100644 --- a/src/main/java/com/rosetta/im/packet/Packet3Search.java +++ b/src/main/java/im/rosetta/packet/Packet3Search.java @@ -1,9 +1,9 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import java.util.ArrayList; import java.util.List; -import com.rosetta.im.packet.runtime.SearchInfo; +import im.rosetta.packet.runtime.SearchInfo; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet4OnlineSubscribe.java b/src/main/java/im/rosetta/packet/Packet4OnlineSubscribe.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet4OnlineSubscribe.java rename to src/main/java/im/rosetta/packet/Packet4OnlineSubscribe.java index 8d639af..abec12d 100644 --- a/src/main/java/com/rosetta/im/packet/Packet4OnlineSubscribe.java +++ b/src/main/java/im/rosetta/packet/Packet4OnlineSubscribe.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import java.util.List; diff --git a/src/main/java/com/rosetta/im/packet/Packet5OnlineState.java b/src/main/java/im/rosetta/packet/Packet5OnlineState.java similarity index 90% rename from src/main/java/com/rosetta/im/packet/Packet5OnlineState.java rename to src/main/java/im/rosetta/packet/Packet5OnlineState.java index 9857683..e536e1b 100644 --- a/src/main/java/com/rosetta/im/packet/Packet5OnlineState.java +++ b/src/main/java/im/rosetta/packet/Packet5OnlineState.java @@ -1,9 +1,9 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import java.util.List; -import com.rosetta.im.packet.runtime.NetworkStatus; -import com.rosetta.im.packet.runtime.PKNetworkStatus; +import im.rosetta.packet.runtime.NetworkStatus; +import im.rosetta.packet.runtime.PKNetworkStatus; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet6Message.java b/src/main/java/im/rosetta/packet/Packet6Message.java similarity index 97% rename from src/main/java/com/rosetta/im/packet/Packet6Message.java rename to src/main/java/im/rosetta/packet/Packet6Message.java index a747455..f5319d4 100644 --- a/src/main/java/com/rosetta/im/packet/Packet6Message.java +++ b/src/main/java/im/rosetta/packet/Packet6Message.java @@ -1,10 +1,10 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import java.util.List; -import com.rosetta.im.packet.base.PacketBaseDialog; -import com.rosetta.im.packet.runtime.Attachment; -import com.rosetta.im.packet.runtime.AttachmentType; +import im.rosetta.packet.base.PacketBaseDialog; +import im.rosetta.packet.runtime.Attachment; +import im.rosetta.packet.runtime.AttachmentType; import io.orprotocol.Stream; diff --git a/src/main/java/com/rosetta/im/packet/Packet7Read.java b/src/main/java/im/rosetta/packet/Packet7Read.java similarity index 89% rename from src/main/java/com/rosetta/im/packet/Packet7Read.java rename to src/main/java/im/rosetta/packet/Packet7Read.java index 408c374..bda0ceb 100644 --- a/src/main/java/com/rosetta/im/packet/Packet7Read.java +++ b/src/main/java/im/rosetta/packet/Packet7Read.java @@ -1,6 +1,6 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; -import com.rosetta.im.packet.base.PacketBaseDialog; +import im.rosetta.packet.base.PacketBaseDialog; import io.orprotocol.Stream; /** diff --git a/src/main/java/com/rosetta/im/packet/Packet8Delivery.java b/src/main/java/im/rosetta/packet/Packet8Delivery.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet8Delivery.java rename to src/main/java/im/rosetta/packet/Packet8Delivery.java index 48965d2..89a6a54 100644 --- a/src/main/java/com/rosetta/im/packet/Packet8Delivery.java +++ b/src/main/java/im/rosetta/packet/Packet8Delivery.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/Packet9DeviceNew.java b/src/main/java/im/rosetta/packet/Packet9DeviceNew.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/Packet9DeviceNew.java rename to src/main/java/im/rosetta/packet/Packet9DeviceNew.java index 1d8f466..3e3d255 100644 --- a/src/main/java/com/rosetta/im/packet/Packet9DeviceNew.java +++ b/src/main/java/im/rosetta/packet/Packet9DeviceNew.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet; +package im.rosetta.packet; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/base/PacketBaseDialog.java b/src/main/java/im/rosetta/packet/base/PacketBaseDialog.java similarity index 99% rename from src/main/java/com/rosetta/im/packet/base/PacketBaseDialog.java rename to src/main/java/im/rosetta/packet/base/PacketBaseDialog.java index b1f8dcf..cba8c48 100644 --- a/src/main/java/com/rosetta/im/packet/base/PacketBaseDialog.java +++ b/src/main/java/im/rosetta/packet/base/PacketBaseDialog.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.base; +package im.rosetta.packet.base; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/base/PacketBaseServer.java b/src/main/java/im/rosetta/packet/base/PacketBaseServer.java similarity index 95% rename from src/main/java/com/rosetta/im/packet/base/PacketBaseServer.java rename to src/main/java/im/rosetta/packet/base/PacketBaseServer.java index 5c97e2b..ad3d321 100644 --- a/src/main/java/com/rosetta/im/packet/base/PacketBaseServer.java +++ b/src/main/java/im/rosetta/packet/base/PacketBaseServer.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.base; +package im.rosetta.packet.base; import io.orprotocol.Stream; import io.orprotocol.packet.Packet; diff --git a/src/main/java/com/rosetta/im/packet/runtime/Attachment.java b/src/main/java/im/rosetta/packet/runtime/Attachment.java similarity index 96% rename from src/main/java/com/rosetta/im/packet/runtime/Attachment.java rename to src/main/java/im/rosetta/packet/runtime/Attachment.java index 67ecfe4..7e69d06 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/Attachment.java +++ b/src/main/java/im/rosetta/packet/runtime/Attachment.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Вложение в сообщении diff --git a/src/main/java/com/rosetta/im/packet/runtime/AttachmentType.java b/src/main/java/im/rosetta/packet/runtime/AttachmentType.java similarity index 94% rename from src/main/java/com/rosetta/im/packet/runtime/AttachmentType.java rename to src/main/java/im/rosetta/packet/runtime/AttachmentType.java index dfbe12c..7a397c9 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/AttachmentType.java +++ b/src/main/java/im/rosetta/packet/runtime/AttachmentType.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Тип вложения в сообщении diff --git a/src/main/java/com/rosetta/im/packet/runtime/DeviceSolution.java b/src/main/java/im/rosetta/packet/runtime/DeviceSolution.java similarity index 95% rename from src/main/java/com/rosetta/im/packet/runtime/DeviceSolution.java rename to src/main/java/im/rosetta/packet/runtime/DeviceSolution.java index d74e511..bd8fbce 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/DeviceSolution.java +++ b/src/main/java/im/rosetta/packet/runtime/DeviceSolution.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Решение по запросу на добавление устройства diff --git a/src/main/java/com/rosetta/im/packet/runtime/HandshakeStage.java b/src/main/java/im/rosetta/packet/runtime/HandshakeStage.java similarity index 96% rename from src/main/java/com/rosetta/im/packet/runtime/HandshakeStage.java rename to src/main/java/im/rosetta/packet/runtime/HandshakeStage.java index 74fc01b..b34d69c 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/HandshakeStage.java +++ b/src/main/java/im/rosetta/packet/runtime/HandshakeStage.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Этапы хэндшейка между клиентом и сервером. diff --git a/src/main/java/com/rosetta/im/packet/runtime/NetworkDevice.java b/src/main/java/im/rosetta/packet/runtime/NetworkDevice.java similarity index 97% rename from src/main/java/com/rosetta/im/packet/runtime/NetworkDevice.java rename to src/main/java/im/rosetta/packet/runtime/NetworkDevice.java index c8e8b5c..f54287d 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/NetworkDevice.java +++ b/src/main/java/im/rosetta/packet/runtime/NetworkDevice.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Обозначает подключенное к аккаунту устройство, с которого diff --git a/src/main/java/com/rosetta/im/packet/runtime/NetworkGroupStatus.java b/src/main/java/im/rosetta/packet/runtime/NetworkGroupStatus.java similarity index 97% rename from src/main/java/com/rosetta/im/packet/runtime/NetworkGroupStatus.java rename to src/main/java/im/rosetta/packet/runtime/NetworkGroupStatus.java index 2b3e2df..1fa675d 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/NetworkGroupStatus.java +++ b/src/main/java/im/rosetta/packet/runtime/NetworkGroupStatus.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Используется в Packet19GroupInviteInfo для указания статуса пользователя в группе. diff --git a/src/main/java/com/rosetta/im/packet/runtime/NetworkNotificationAction.java b/src/main/java/im/rosetta/packet/runtime/NetworkNotificationAction.java similarity index 96% rename from src/main/java/com/rosetta/im/packet/runtime/NetworkNotificationAction.java rename to src/main/java/im/rosetta/packet/runtime/NetworkNotificationAction.java index 9c64427..b353df4 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/NetworkNotificationAction.java +++ b/src/main/java/im/rosetta/packet/runtime/NetworkNotificationAction.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Используется в Packet16PushNotification для указания действия, которое нужно выполнить с токеном пуш уведомлений. diff --git a/src/main/java/com/rosetta/im/packet/runtime/NetworkStatus.java b/src/main/java/im/rosetta/packet/runtime/NetworkStatus.java similarity index 95% rename from src/main/java/com/rosetta/im/packet/runtime/NetworkStatus.java rename to src/main/java/im/rosetta/packet/runtime/NetworkStatus.java index 11a4852..4ab0086 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/NetworkStatus.java +++ b/src/main/java/im/rosetta/packet/runtime/NetworkStatus.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Статус пользователя в сети diff --git a/src/main/java/com/rosetta/im/packet/runtime/PKNetworkStatus.java b/src/main/java/im/rosetta/packet/runtime/PKNetworkStatus.java similarity index 95% rename from src/main/java/com/rosetta/im/packet/runtime/PKNetworkStatus.java rename to src/main/java/im/rosetta/packet/runtime/PKNetworkStatus.java index a1c2815..aa24f26 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/PKNetworkStatus.java +++ b/src/main/java/im/rosetta/packet/runtime/PKNetworkStatus.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; /** * Сущность для обозначения статуса сети diff --git a/src/main/java/com/rosetta/im/packet/runtime/ResultCode.java b/src/main/java/im/rosetta/packet/runtime/ResultCode.java similarity index 93% rename from src/main/java/com/rosetta/im/packet/runtime/ResultCode.java rename to src/main/java/im/rosetta/packet/runtime/ResultCode.java index 3cb69b0..5382893 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/ResultCode.java +++ b/src/main/java/im/rosetta/packet/runtime/ResultCode.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; public enum ResultCode { SUCCESS(0), diff --git a/src/main/java/com/rosetta/im/packet/runtime/SearchInfo.java b/src/main/java/im/rosetta/packet/runtime/SearchInfo.java similarity index 98% rename from src/main/java/com/rosetta/im/packet/runtime/SearchInfo.java rename to src/main/java/im/rosetta/packet/runtime/SearchInfo.java index 3e77bb0..b117135 100644 --- a/src/main/java/com/rosetta/im/packet/runtime/SearchInfo.java +++ b/src/main/java/im/rosetta/packet/runtime/SearchInfo.java @@ -1,4 +1,4 @@ -package com.rosetta.im.packet.runtime; +package im.rosetta.packet.runtime; import io.orprotocol.Stream; import io.orprotocol.serializer.Serializable; diff --git a/src/main/java/com/rosetta/im/service/Service.java b/src/main/java/im/rosetta/service/Service.java similarity index 96% rename from src/main/java/com/rosetta/im/service/Service.java rename to src/main/java/im/rosetta/service/Service.java index c73fa9f..d21e6a7 100644 --- a/src/main/java/com/rosetta/im/service/Service.java +++ b/src/main/java/im/rosetta/service/Service.java @@ -1,4 +1,4 @@ -package com.rosetta.im.service; +package im.rosetta.service; /** * Базовый класс для всех сервисов. Нужно чтобы унифицировать доступ к репозиториям, diff --git a/src/main/java/com/rosetta/im/service/dispatch/DeviceDispatcher.java b/src/main/java/im/rosetta/service/dispatch/DeviceDispatcher.java similarity index 89% rename from src/main/java/com/rosetta/im/service/dispatch/DeviceDispatcher.java rename to src/main/java/im/rosetta/service/dispatch/DeviceDispatcher.java index 81b42a0..f03c079 100644 --- a/src/main/java/com/rosetta/im/service/dispatch/DeviceDispatcher.java +++ b/src/main/java/im/rosetta/service/dispatch/DeviceDispatcher.java @@ -1,19 +1,19 @@ -package com.rosetta.im.service.dispatch; +package im.rosetta.service.dispatch; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIDevice; -import com.rosetta.im.database.entity.Device; -import com.rosetta.im.database.repository.DeviceRepository; -import com.rosetta.im.packet.Packet23DeviceList; -import com.rosetta.im.packet.runtime.DeviceSolution; -import com.rosetta.im.packet.runtime.NetworkDevice; -import com.rosetta.im.packet.runtime.NetworkStatus; -import com.rosetta.im.service.services.DeviceService; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIDevice; +import im.rosetta.database.entity.Device; +import im.rosetta.database.repository.DeviceRepository; +import im.rosetta.packet.Packet23DeviceList; +import im.rosetta.packet.runtime.DeviceSolution; +import im.rosetta.packet.runtime.NetworkDevice; +import im.rosetta.packet.runtime.NetworkStatus; +import im.rosetta.service.services.DeviceService; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/service/dispatch/MessageDispatcher.java b/src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java similarity index 93% rename from src/main/java/com/rosetta/im/service/dispatch/MessageDispatcher.java rename to src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java index 429462e..1dd5934 100644 --- a/src/main/java/com/rosetta/im/service/dispatch/MessageDispatcher.java +++ b/src/main/java/im/rosetta/service/dispatch/MessageDispatcher.java @@ -1,14 +1,14 @@ -package com.rosetta.im.service.dispatch; +package im.rosetta.service.dispatch; import java.util.List; -import com.rosetta.im.Failures; -import com.rosetta.im.client.ClientManager; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.repository.BufferRepository; -import com.rosetta.im.database.repository.GroupRepository; -import com.rosetta.im.packet.base.PacketBaseDialog; -import com.rosetta.im.service.services.BufferService; +import im.rosetta.Failures; +import im.rosetta.client.ClientManager; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.repository.BufferRepository; +import im.rosetta.database.repository.GroupRepository; +import im.rosetta.packet.base.PacketBaseDialog; +import im.rosetta.service.services.BufferService; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/service/services/BufferService.java b/src/main/java/im/rosetta/service/services/BufferService.java similarity index 93% rename from src/main/java/com/rosetta/im/service/services/BufferService.java rename to src/main/java/im/rosetta/service/services/BufferService.java index 3a3642d..6ff5a2a 100644 --- a/src/main/java/com/rosetta/im/service/services/BufferService.java +++ b/src/main/java/im/rosetta/service/services/BufferService.java @@ -1,15 +1,15 @@ -package com.rosetta.im.service.services; +package im.rosetta.service.services; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.QuerySession; -import com.rosetta.im.database.entity.Buffer; -import com.rosetta.im.database.repository.BufferRepository; -import com.rosetta.im.exception.UnauthorizedExeception; -import com.rosetta.im.service.Service; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.QuerySession; +import im.rosetta.database.entity.Buffer; +import im.rosetta.database.repository.BufferRepository; +import im.rosetta.exception.UnauthorizedExeception; +import im.rosetta.service.Service; import io.orprotocol.ProtocolException; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/service/services/DeviceService.java b/src/main/java/im/rosetta/service/services/DeviceService.java similarity index 88% rename from src/main/java/com/rosetta/im/service/services/DeviceService.java rename to src/main/java/im/rosetta/service/services/DeviceService.java index 8394c27..9b7ab41 100644 --- a/src/main/java/com/rosetta/im/service/services/DeviceService.java +++ b/src/main/java/im/rosetta/service/services/DeviceService.java @@ -1,11 +1,11 @@ -package com.rosetta.im.service.services; +package im.rosetta.service.services; import java.util.List; -import com.rosetta.im.database.entity.Device; -import com.rosetta.im.database.entity.User; -import com.rosetta.im.database.repository.DeviceRepository; -import com.rosetta.im.service.Service; +import im.rosetta.database.entity.Device; +import im.rosetta.database.entity.User; +import im.rosetta.database.repository.DeviceRepository; +import im.rosetta.service.Service; public class DeviceService extends Service { diff --git a/src/main/java/com/rosetta/im/service/services/UserService.java b/src/main/java/im/rosetta/service/services/UserService.java similarity index 93% rename from src/main/java/com/rosetta/im/service/services/UserService.java rename to src/main/java/im/rosetta/service/services/UserService.java index 6725de1..fc75d6b 100644 --- a/src/main/java/com/rosetta/im/service/services/UserService.java +++ b/src/main/java/im/rosetta/service/services/UserService.java @@ -1,13 +1,13 @@ -package com.rosetta.im.service.services; +package im.rosetta.service.services; import java.util.HashMap; import java.util.List; -import com.rosetta.im.client.tags.ECIAuthentificate; -import com.rosetta.im.database.QuerySession; -import com.rosetta.im.database.entity.User; -import com.rosetta.im.database.repository.UserRepository; -import com.rosetta.im.service.Service; +import im.rosetta.client.tags.ECIAuthentificate; +import im.rosetta.database.QuerySession; +import im.rosetta.database.entity.User; +import im.rosetta.database.repository.UserRepository; +import im.rosetta.service.Service; import io.orprotocol.client.Client; diff --git a/src/main/java/com/rosetta/im/util/RandomUtil.java b/src/main/java/im/rosetta/util/RandomUtil.java similarity index 97% rename from src/main/java/com/rosetta/im/util/RandomUtil.java rename to src/main/java/im/rosetta/util/RandomUtil.java index f3ca1fa..e39a33b 100644 --- a/src/main/java/com/rosetta/im/util/RandomUtil.java +++ b/src/main/java/im/rosetta/util/RandomUtil.java @@ -1,4 +1,4 @@ -package com.rosetta.im.util; +package im.rosetta.util; import java.util.Random; diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index dcc88de..748caa2 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -5,10 +5,10 @@ org.postgresql.Driver update - - - - + + + +