Showing
8 changed files
with
10 additions
and
8 deletions
dao/src/main/java/org/thingsboard/server/dao/queue/db/MsgAck.java
renamed from
dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/MsgAck.java
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | -package org.thingsboard.server.dao.queue.db.nosql; | |
16 | +package org.thingsboard.server.dao.queue.db; | |
17 | 17 | |
18 | 18 | import lombok.Data; |
19 | 19 | import lombok.EqualsAndHashCode; | ... | ... |
dao/src/main/java/org/thingsboard/server/dao/queue/db/UnprocessedMsgFilter.java
renamed from
dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilter.java
... | ... | @@ -13,10 +13,11 @@ |
13 | 13 | * See the License for the specific language governing permissions and |
14 | 14 | * limitations under the License. |
15 | 15 | */ |
16 | -package org.thingsboard.server.dao.queue.db.nosql; | |
16 | +package org.thingsboard.server.dao.queue.db; | |
17 | 17 | |
18 | 18 | import org.springframework.stereotype.Component; |
19 | 19 | import org.thingsboard.server.common.msg.TbMsg; |
20 | +import org.thingsboard.server.dao.queue.db.MsgAck; | |
20 | 21 | |
21 | 22 | import java.util.Collection; |
22 | 23 | import java.util.List; | ... | ... |
... | ... | @@ -26,6 +26,8 @@ import org.springframework.stereotype.Component; |
26 | 26 | import org.thingsboard.server.common.data.id.TenantId; |
27 | 27 | import org.thingsboard.server.common.msg.TbMsg; |
28 | 28 | import org.thingsboard.server.dao.queue.MsgQueue; |
29 | +import org.thingsboard.server.dao.queue.db.MsgAck; | |
30 | +import org.thingsboard.server.dao.queue.db.UnprocessedMsgFilter; | |
29 | 31 | import org.thingsboard.server.dao.queue.db.repository.AckRepository; |
30 | 32 | import org.thingsboard.server.dao.queue.db.repository.MsgRepository; |
31 | 33 | import org.thingsboard.server.dao.util.NoSqlDao; | ... | ... |
... | ... | @@ -22,7 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture; |
22 | 22 | import org.springframework.beans.factory.annotation.Value; |
23 | 23 | import org.springframework.stereotype.Component; |
24 | 24 | import org.thingsboard.server.dao.nosql.CassandraAbstractDao; |
25 | -import org.thingsboard.server.dao.queue.db.nosql.MsgAck; | |
25 | +import org.thingsboard.server.dao.queue.db.MsgAck; | |
26 | 26 | import org.thingsboard.server.dao.queue.db.repository.AckRepository; |
27 | 27 | import org.thingsboard.server.dao.util.NoSqlDao; |
28 | 28 | ... | ... |
... | ... | @@ -16,7 +16,7 @@ |
16 | 16 | package org.thingsboard.server.dao.queue.db.repository; |
17 | 17 | |
18 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
19 | -import org.thingsboard.server.dao.queue.db.nosql.MsgAck; | |
19 | +import org.thingsboard.server.dao.queue.db.MsgAck; | |
20 | 20 | |
21 | 21 | import java.util.List; |
22 | 22 | import java.util.UUID; | ... | ... |
... | ... | @@ -18,8 +18,8 @@ package org.thingsboard.server.dao.queue.db.nosql; |
18 | 18 | import com.google.common.collect.Lists; |
19 | 19 | import org.junit.Test; |
20 | 20 | import org.thingsboard.server.common.msg.TbMsg; |
21 | -import org.thingsboard.server.dao.queue.db.nosql.MsgAck; | |
22 | -import org.thingsboard.server.dao.queue.db.nosql.UnprocessedMsgFilter; | |
21 | +import org.thingsboard.server.dao.queue.db.MsgAck; | |
22 | +import org.thingsboard.server.dao.queue.db.UnprocessedMsgFilter; | |
23 | 23 | |
24 | 24 | import java.util.Collection; |
25 | 25 | import java.util.List; | ... | ... |
... | ... | @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
23 | 23 | import org.springframework.test.util.ReflectionTestUtils; |
24 | 24 | import org.thingsboard.server.dao.service.AbstractServiceTest; |
25 | 25 | import org.thingsboard.server.dao.service.DaoNoSqlTest; |
26 | -import org.thingsboard.server.dao.queue.db.nosql.MsgAck; | |
26 | +import org.thingsboard.server.dao.queue.db.MsgAck; | |
27 | 27 | |
28 | 28 | import java.util.List; |
29 | 29 | import java.util.UUID; | ... | ... |