dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DB Msg queue refactor.

Browse Source
This commit is contained in:
Igor Kulikov 2018-05-17 10:20:08 +03:00
parent 9bcb38bc13
commit 084907dfc4
8 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/MsgAck.java → dao/src/main/java/org/thingsboard/server/dao/queue/db/MsgAck.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.dao.queue.db.nosql; package org.thingsboard.server.dao.queue.db;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

3
dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilter.java → dao/src/main/java/org/thingsboard/server/dao/queue/db/UnprocessedMsgFilter.java
View File

@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.thingsboard.server.dao.queue.db.nosql; package org.thingsboard.server.dao.queue.db;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;
import org.thingsboard.server.dao.queue.db.MsgAck;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/CassandraMsgQueue.java
View File

@ -26,6 +26,8 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;
import org.thingsboard.server.dao.queue.MsgQueue; import org.thingsboard.server.dao.queue.MsgQueue;
import org.thingsboard.server.dao.queue.db.MsgAck;
import org.thingsboard.server.dao.queue.db.UnprocessedMsgFilter;
import org.thingsboard.server.dao.queue.db.repository.AckRepository; import org.thingsboard.server.dao.queue.db.repository.AckRepository;
import org.thingsboard.server.dao.queue.db.repository.MsgRepository; import org.thingsboard.server.dao.queue.db.repository.MsgRepository;
import org.thingsboard.server.dao.util.NoSqlDao; import org.thingsboard.server.dao.util.NoSqlDao;

2
dao/src/main/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepository.java
View File

@ -22,7 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.thingsboard.server.dao.nosql.CassandraAbstractDao; import org.thingsboard.server.dao.nosql.CassandraAbstractDao;
import org.thingsboard.server.dao.queue.db.nosql.MsgAck; import org.thingsboard.server.dao.queue.db.MsgAck;
import org.thingsboard.server.dao.queue.db.repository.AckRepository; import org.thingsboard.server.dao.queue.db.repository.AckRepository;
import org.thingsboard.server.dao.util.NoSqlDao; import org.thingsboard.server.dao.util.NoSqlDao;

2
dao/src/main/java/org/thingsboard/server/dao/queue/db/repository/AckRepository.java
View File

@ -16,7 +16,7 @@
package org.thingsboard.server.dao.queue.db.repository; package org.thingsboard.server.dao.queue.db.repository;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import org.thingsboard.server.dao.queue.db.nosql.MsgAck; import org.thingsboard.server.dao.queue.db.MsgAck;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

4
dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/UnprocessedMsgFilterTest.java
View File

@ -18,8 +18,8 @@ package org.thingsboard.server.dao.queue.db.nosql;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.Test; import org.junit.Test;
import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;
import org.thingsboard.server.dao.queue.db.nosql.MsgAck; import org.thingsboard.server.dao.queue.db.MsgAck;
import org.thingsboard.server.dao.queue.db.nosql.UnprocessedMsgFilter; import org.thingsboard.server.dao.queue.db.UnprocessedMsgFilter;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

2
dao/src/test/java/org/thingsboard/server/dao/queue/db/nosql/repository/CassandraAckRepositoryTest.java
View File

@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
import org.thingsboard.server.dao.service.AbstractServiceTest; import org.thingsboard.server.dao.service.AbstractServiceTest;
import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.DaoNoSqlTest;
import org.thingsboard.server.dao.queue.db.nosql.MsgAck; import org.thingsboard.server.dao.queue.db.MsgAck;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

1
dao/src/test/resources/application-test.properties
View File

@ -30,4 +30,3 @@ redis.connection.db=0
redis.connection.password= redis.connection.password=
rule.queue.type=memory rule.queue.type=memory
rule.queue.max_size=10000