From e684c267962fce252c276f3d539c402d0f73c5ac Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 24 Oct 2018 20:06:36 +0300 Subject: [PATCH] New Buffered Rate Limit implementation --- .../server/dao/nosql/CassandraBufferedRateExecutor.java | 4 ++-- .../thingsboard/server/dao/nosql/CassandraStatementTask.java | 2 +- .../dao/{nosql/tmp => util}/AbstractBufferedRateExecutor.java | 2 +- .../thingsboard/server/dao/{nosql/tmp => util}/AsyncTask.java | 2 +- .../server/dao/{nosql/tmp => util}/AsyncTaskContext.java | 2 +- .../server/dao/{nosql/tmp => util}/BufferedRateExecutor.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename dao/src/main/java/org/thingsboard/server/dao/{nosql/tmp => util}/AbstractBufferedRateExecutor.java (99%) rename dao/src/main/java/org/thingsboard/server/dao/{nosql/tmp => util}/AsyncTask.java (93%) rename dao/src/main/java/org/thingsboard/server/dao/{nosql/tmp => util}/AsyncTaskContext.java (95%) rename dao/src/main/java/org/thingsboard/server/dao/{nosql/tmp => util}/BufferedRateExecutor.java (94%) diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateExecutor.java index 478c76d5c0..c999ef4712 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateExecutor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateExecutor.java @@ -22,8 +22,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.thingsboard.server.dao.nosql.tmp.AbstractBufferedRateExecutor; -import org.thingsboard.server.dao.nosql.tmp.AsyncTaskContext; +import org.thingsboard.server.dao.util.AbstractBufferedRateExecutor; +import org.thingsboard.server.dao.util.AsyncTaskContext; import org.thingsboard.server.dao.util.NoSqlAnyDao; import javax.annotation.PreDestroy; diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraStatementTask.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraStatementTask.java index ea13679b7c..19e56402db 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraStatementTask.java +++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraStatementTask.java @@ -18,7 +18,7 @@ package org.thingsboard.server.dao.nosql; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; import lombok.Data; -import org.thingsboard.server.dao.nosql.tmp.AsyncTask; +import org.thingsboard.server.dao.util.AsyncTask; /** * Created by ashvayka on 24.10.18. diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AbstractBufferedRateExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java similarity index 99% rename from dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AbstractBufferedRateExecutor.java rename to dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java index 9ad8e18745..c5be08668d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AbstractBufferedRateExecutor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.nosql.tmp; +package org.thingsboard.server.dao.util; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AsyncTask.java b/dao/src/main/java/org/thingsboard/server/dao/util/AsyncTask.java similarity index 93% rename from dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AsyncTask.java rename to dao/src/main/java/org/thingsboard/server/dao/util/AsyncTask.java index a16568b6bd..672e4f4656 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AsyncTask.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/AsyncTask.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.nosql.tmp; +package org.thingsboard.server.dao.util; /** * Created by ashvayka on 24.10.18. diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AsyncTaskContext.java b/dao/src/main/java/org/thingsboard/server/dao/util/AsyncTaskContext.java similarity index 95% rename from dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AsyncTaskContext.java rename to dao/src/main/java/org/thingsboard/server/dao/util/AsyncTaskContext.java index c3c98ee361..593b3fb04c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/AsyncTaskContext.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/AsyncTaskContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.nosql.tmp; +package org.thingsboard.server.dao.util; import com.google.common.util.concurrent.SettableFuture; import lombok.Data; diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/BufferedRateExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateExecutor.java similarity index 94% rename from dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/BufferedRateExecutor.java rename to dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateExecutor.java index 7adc914885..21f4cd0493 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/nosql/tmp/BufferedRateExecutor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/BufferedRateExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.nosql.tmp; +package org.thingsboard.server.dao.util; import com.google.common.util.concurrent.ListenableFuture;