From b26e018d241ef303f519074176960b9e859592d8 Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Wed, 18 Mar 2026 15:18:45 +0200 Subject: [PATCH] Rename JavaClientTest classes to ApiClientTest --- ...AIModelJavaClientTest.java => AIModelApiClientTest.java} | 2 +- ...stractJavaClientTest.java => AbstractApiClientTest.java} | 6 +++--- .../{AdminJavaClientTest.java => AdminApiClientTest.java} | 2 +- .../{AlarmJavaClientTest.java => AlarmApiClientTest.java} | 2 +- ...ntJavaClientTest.java => AlarmCommentApiClientTest.java} | 2 +- .../{AssetJavaClientTest.java => AssetApiClientTest.java} | 2 +- ...leJavaClientTest.java => AssetProfileApiClientTest.java} | 2 +- ...avaClientTest.java => CalculatedFieldApiClientTest.java} | 2 +- ...stomerJavaClientTest.java => CustomerApiClientTest.java} | 4 ++-- ...boardJavaClientTest.java => DashboardApiClientTest.java} | 2 +- .../{DeviceJavaClientTest.java => DeviceApiClientTest.java} | 2 +- ...ClientTest.java => DeviceConnectivityApiClientTest.java} | 2 +- ...eJavaClientTest.java => DeviceProfileApiClientTest.java} | 2 +- .../{DomainJavaClientTest.java => DomainApiClientTest.java} | 2 +- .../{EdgeJavaClientTest.java => EdgeApiClientTest.java} | 2 +- ...eryJavaClientTest.java => EntityQueryApiClientTest.java} | 2 +- ...JavaClientTest.java => EntityRelationApiClientTest.java} | 2 +- ...ViewJavaClientTest.java => EntityViewApiClientTest.java} | 2 +- ...leAppJavaClientTest.java => MobileAppApiClientTest.java} | 2 +- ...onJavaClientTest.java => NotificationApiClientTest.java} | 2 +- .../{Oauth2JavaClientTest.java => Oauth2ApiClientTest.java} | 2 +- ...kageJavaClientTest.java => OtaPackageApiClientTest.java} | 2 +- .../{RpcV1JavaClientTest.java => RpcV1ApiClientTest.java} | 2 +- .../{RpcV2JavaClientTest.java => RpcV2ApiClientTest.java} | 2 +- ...ChainJavaClientTest.java => RuleChainApiClientTest.java} | 2 +- ...TbImageJavaClientTest.java => TbImageApiClientTest.java} | 2 +- ...urceJavaClientTest.java => TbResourceApiClientTest.java} | 2 +- ...metryJavaClientTest.java => TelemetryApiClientTest.java} | 2 +- .../{TenantJavaClientTest.java => TenantApiClientTest.java} | 2 +- ...eJavaClientTest.java => TenantProfileApiClientTest.java} | 2 +- ...hJavaClientTest.java => TwoFactorAuthApiClientTest.java} | 2 +- .../{UserJavaClientTest.java => UserApiClientTest.java} | 2 +- ...TypeJavaClientTest.java => WidgetTypeApiClientTest.java} | 2 +- 33 files changed, 36 insertions(+), 36 deletions(-) rename application/src/test/java/org/thingsboard/server/client/{AIModelJavaClientTest.java => AIModelApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{AbstractJavaClientTest.java => AbstractApiClientTest.java} (95%) rename application/src/test/java/org/thingsboard/server/client/{AdminJavaClientTest.java => AdminApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{AlarmJavaClientTest.java => AlarmApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{AlarmCommentJavaClientTest.java => AlarmCommentApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{AssetJavaClientTest.java => AssetApiClientTest.java} (97%) rename application/src/test/java/org/thingsboard/server/client/{AssetProfileJavaClientTest.java => AssetProfileApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{CalculatedFieldJavaClientTest.java => CalculatedFieldApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{CustomerJavaClientTest.java => CustomerApiClientTest.java} (97%) rename application/src/test/java/org/thingsboard/server/client/{DashboardJavaClientTest.java => DashboardApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{DeviceJavaClientTest.java => DeviceApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{DeviceConnectivityJavaClientTest.java => DeviceConnectivityApiClientTest.java} (96%) rename application/src/test/java/org/thingsboard/server/client/{DeviceProfileJavaClientTest.java => DeviceProfileApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{DomainJavaClientTest.java => DomainApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{EdgeJavaClientTest.java => EdgeApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{EntityQueryJavaClientTest.java => EntityQueryApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{EntityRelationJavaClientTest.java => EntityRelationApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{EntityViewJavaClientTest.java => EntityViewApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{MobileAppJavaClientTest.java => MobileAppApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{NotificationJavaClientTest.java => NotificationApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{Oauth2JavaClientTest.java => Oauth2ApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{OtaPackageJavaClientTest.java => OtaPackageApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{RpcV1JavaClientTest.java => RpcV1ApiClientTest.java} (97%) rename application/src/test/java/org/thingsboard/server/client/{RpcV2JavaClientTest.java => RpcV2ApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{RuleChainJavaClientTest.java => RuleChainApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{TbImageJavaClientTest.java => TbImageApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{TbResourceJavaClientTest.java => TbResourceApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{TelemetryJavaClientTest.java => TelemetryApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{TenantJavaClientTest.java => TenantApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{TenantProfileJavaClientTest.java => TenantProfileApiClientTest.java} (99%) rename application/src/test/java/org/thingsboard/server/client/{TwoFactorAuthJavaClientTest.java => TwoFactorAuthApiClientTest.java} (97%) rename application/src/test/java/org/thingsboard/server/client/{UserJavaClientTest.java => UserApiClientTest.java} (98%) rename application/src/test/java/org/thingsboard/server/client/{WidgetTypeJavaClientTest.java => WidgetTypeApiClientTest.java} (98%) diff --git a/application/src/test/java/org/thingsboard/server/client/AIModelJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AIModelApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/AIModelJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AIModelApiClientTest.java index 5a0963aa3f..59314378aa 100644 --- a/application/src/test/java/org/thingsboard/server/client/AIModelJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AIModelApiClientTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class AIModelJavaClientTest extends AbstractJavaClientTest { +public class AIModelApiClientTest extends AbstractApiClientTest { private static final String AI_PREFIX = "AiTest_"; diff --git a/application/src/test/java/org/thingsboard/server/client/AbstractJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AbstractApiClientTest.java similarity index 95% rename from application/src/test/java/org/thingsboard/server/client/AbstractJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AbstractApiClientTest.java index 8323915184..6bbda65a59 100644 --- a/application/src/test/java/org/thingsboard/server/client/AbstractJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AbstractApiClientTest.java @@ -33,13 +33,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @Slf4j -public abstract class AbstractJavaClientTest extends AbstractControllerTest { +public abstract class AbstractApiClientTest extends AbstractControllerTest { protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); protected static final ObjectMapper MAPPER = new ObjectMapper(); - protected static final String TEST_PREFIX = "JavaClientTestDevice_"; - protected static final String TEST_PREFIX_2 = "JavaClientTestDevice2_"; + protected static final String TEST_PREFIX = "ApiClientTestDevice_"; + protected static final String TEST_PREFIX_2 = "ApiClientTestDevice2_"; protected static final String CUSTOMER_USERNAME = "javaClientCustomer@thingsboard.org"; protected static final String TENANT_ADMIN_USERNAME = "javaClientTenant@thingsboard.org"; protected static final String TEST_PASSWORD = "password123"; diff --git a/application/src/test/java/org/thingsboard/server/client/AdminJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AdminApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/AdminJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AdminApiClientTest.java index 8cfba21af2..4d11bf3fbe 100644 --- a/application/src/test/java/org/thingsboard/server/client/AdminJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AdminApiClientTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class AdminJavaClientTest extends AbstractJavaClientTest { +public class AdminApiClientTest extends AbstractApiClientTest { @Test public void testAdminSettingsLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/AlarmJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AlarmApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/AlarmJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AlarmApiClientTest.java index 61666297dc..0ebc247018 100644 --- a/application/src/test/java/org/thingsboard/server/client/AlarmJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AlarmApiClientTest.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class AlarmJavaClientTest extends AbstractJavaClientTest { +public class AlarmApiClientTest extends AbstractApiClientTest { @Test public void testAlarmLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/AlarmCommentJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AlarmCommentApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/AlarmCommentJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AlarmCommentApiClientTest.java index 6b519d5fd0..31da96b7b4 100644 --- a/application/src/test/java/org/thingsboard/server/client/AlarmCommentJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AlarmCommentApiClientTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class AlarmCommentJavaClientTest extends AbstractJavaClientTest { +public class AlarmCommentApiClientTest extends AbstractApiClientTest { @Test public void testAlarmComments() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/AssetJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AssetApiClientTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/client/AssetJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AssetApiClientTest.java index 27cde622a4..070470ac2a 100644 --- a/application/src/test/java/org/thingsboard/server/client/AssetJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AssetApiClientTest.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class AssetJavaClientTest extends AbstractJavaClientTest { +public class AssetApiClientTest extends AbstractApiClientTest { @Test public void testAssetLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/AssetProfileJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/AssetProfileApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/AssetProfileJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/AssetProfileApiClientTest.java index 7825a047bd..7f6a2f667b 100644 --- a/application/src/test/java/org/thingsboard/server/client/AssetProfileJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/AssetProfileApiClientTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class AssetProfileJavaClientTest extends AbstractJavaClientTest { +public class AssetProfileApiClientTest extends AbstractApiClientTest { @Test public void testAssetProfileLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/CalculatedFieldJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/CalculatedFieldApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/CalculatedFieldJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/CalculatedFieldApiClientTest.java index 6f79f0d347..d17dd9d0f6 100644 --- a/application/src/test/java/org/thingsboard/server/client/CalculatedFieldJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/CalculatedFieldApiClientTest.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class CalculatedFieldJavaClientTest extends AbstractJavaClientTest { +public class CalculatedFieldApiClientTest extends AbstractApiClientTest { @Test public void testCalculatedFieldLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/CustomerJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/CustomerApiClientTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/client/CustomerJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/CustomerApiClientTest.java index dbfe1faf56..fff3670c85 100644 --- a/application/src/test/java/org/thingsboard/server/client/CustomerJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/CustomerApiClientTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class CustomerJavaClientTest extends AbstractJavaClientTest { +public class CustomerApiClientTest extends AbstractApiClientTest { @Test public void testCustomerLifecycle() throws Exception { @@ -52,7 +52,7 @@ public class CustomerJavaClientTest extends AbstractJavaClientTest { createdCustomers.add(createdCustomer); } - // find all, check count (includes savedClientCustomer from AbstractJavaClientTest setup) + // find all, check count (includes savedClientCustomer from AbstractApiClientTest setup) PageDataCustomer allCustomers = client.getCustomers(100, 0, null, null, null); assertNotNull(allCustomers); assertNotNull(allCustomers.getData()); diff --git a/application/src/test/java/org/thingsboard/server/client/DashboardJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/DashboardApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/DashboardJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/DashboardApiClientTest.java index 5d1fa871c8..386e2db84f 100644 --- a/application/src/test/java/org/thingsboard/server/client/DashboardJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/DashboardApiClientTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class DashboardJavaClientTest extends AbstractJavaClientTest { +public class DashboardApiClientTest extends AbstractApiClientTest { @Test public void testDashboardLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/DeviceJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/DeviceApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/DeviceJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/DeviceApiClientTest.java index c141565c42..f3695b9fc1 100644 --- a/application/src/test/java/org/thingsboard/server/client/DeviceJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/DeviceApiClientTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class DeviceJavaClientTest extends AbstractJavaClientTest { +public class DeviceApiClientTest extends AbstractApiClientTest { @Test public void testDeviceLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/DeviceConnectivityJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/DeviceConnectivityApiClientTest.java similarity index 96% rename from application/src/test/java/org/thingsboard/server/client/DeviceConnectivityJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/DeviceConnectivityApiClientTest.java index 2ca2d622e7..d8204cab41 100644 --- a/application/src/test/java/org/thingsboard/server/client/DeviceConnectivityJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/DeviceConnectivityApiClientTest.java @@ -25,7 +25,7 @@ import java.util.UUID; import static org.junit.Assert.assertEquals; @DaoSqlTest -public class DeviceConnectivityJavaClientTest extends AbstractJavaClientTest { +public class DeviceConnectivityApiClientTest extends AbstractApiClientTest { @Test public void testGetDevicePublishTelemetryCommands() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/DeviceProfileJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/DeviceProfileApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/DeviceProfileJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/DeviceProfileApiClientTest.java index 6008c85653..e8fcb4ffd1 100644 --- a/application/src/test/java/org/thingsboard/server/client/DeviceProfileJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/DeviceProfileApiClientTest.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class DeviceProfileJavaClientTest extends AbstractJavaClientTest { +public class DeviceProfileApiClientTest extends AbstractApiClientTest { @Test public void testDeviceProfileLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/DomainJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/DomainApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/DomainJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/DomainApiClientTest.java index fb8bb9b44f..bd10a3deca 100644 --- a/application/src/test/java/org/thingsboard/server/client/DomainJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/DomainApiClientTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class DomainJavaClientTest extends AbstractJavaClientTest { +public class DomainApiClientTest extends AbstractApiClientTest { List createdDomains = new ArrayList<>(); diff --git a/application/src/test/java/org/thingsboard/server/client/EdgeJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/EdgeApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/EdgeJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/EdgeApiClientTest.java index 1400ead0b1..6aeb7f0ef6 100644 --- a/application/src/test/java/org/thingsboard/server/client/EdgeJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/EdgeApiClientTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class EdgeJavaClientTest extends AbstractJavaClientTest { +public class EdgeApiClientTest extends AbstractApiClientTest { @Test public void testEdgeLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/EntityQueryJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/EntityQueryApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/EntityQueryJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/EntityQueryApiClientTest.java index 5c075f0777..2571306eb6 100644 --- a/application/src/test/java/org/thingsboard/server/client/EntityQueryJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/EntityQueryApiClientTest.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class EntityQueryJavaClientTest extends AbstractJavaClientTest { +public class EntityQueryApiClientTest extends AbstractApiClientTest { private static final String QUERY_TEST_PREFIX = "QueryTest_"; diff --git a/application/src/test/java/org/thingsboard/server/client/EntityRelationJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/EntityRelationApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/EntityRelationJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/EntityRelationApiClientTest.java index 5113dc380b..1792ba9ff1 100644 --- a/application/src/test/java/org/thingsboard/server/client/EntityRelationJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/EntityRelationApiClientTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class EntityRelationJavaClientTest extends AbstractJavaClientTest { +public class EntityRelationApiClientTest extends AbstractApiClientTest { @Test public void testEntityRelationLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/EntityViewJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/EntityViewApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/EntityViewJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/EntityViewApiClientTest.java index 453420f784..60c0e86662 100644 --- a/application/src/test/java/org/thingsboard/server/client/EntityViewJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/EntityViewApiClientTest.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class EntityViewJavaClientTest extends AbstractJavaClientTest { +public class EntityViewApiClientTest extends AbstractApiClientTest { private static final String EV_PREFIX = "EvTest_"; diff --git a/application/src/test/java/org/thingsboard/server/client/MobileAppJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/MobileAppApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/MobileAppJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/MobileAppApiClientTest.java index f3f8c2900d..fd448eaee1 100644 --- a/application/src/test/java/org/thingsboard/server/client/MobileAppJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/MobileAppApiClientTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class MobileAppJavaClientTest extends AbstractJavaClientTest { +public class MobileAppApiClientTest extends AbstractApiClientTest { @Test public void testMobileAppLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/NotificationJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/NotificationApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/NotificationJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/NotificationApiClientTest.java index 027849d153..026b8784ef 100644 --- a/application/src/test/java/org/thingsboard/server/client/NotificationJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/NotificationApiClientTest.java @@ -48,7 +48,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class NotificationJavaClientTest extends AbstractJavaClientTest { +public class NotificationApiClientTest extends AbstractApiClientTest { @Test public void testNotificationLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/Oauth2JavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/Oauth2ApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/Oauth2JavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/Oauth2ApiClientTest.java index 835b5fc64e..63f05710ae 100644 --- a/application/src/test/java/org/thingsboard/server/client/Oauth2JavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/Oauth2ApiClientTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class Oauth2JavaClientTest extends AbstractJavaClientTest { +public class Oauth2ApiClientTest extends AbstractApiClientTest { private OAuth2Client createOAuth2Client(String title, String clientId, String clientSecret) { OAuth2BasicMapperConfig basicConfig = new OAuth2BasicMapperConfig(); diff --git a/application/src/test/java/org/thingsboard/server/client/OtaPackageJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/OtaPackageApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/OtaPackageJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/OtaPackageApiClientTest.java index ebd6413b65..c71f2cb2e3 100644 --- a/application/src/test/java/org/thingsboard/server/client/OtaPackageJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/OtaPackageApiClientTest.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class OtaPackageJavaClientTest extends AbstractJavaClientTest { +public class OtaPackageApiClientTest extends AbstractApiClientTest { private static final String OTA_PREFIX = "OtaTest_"; diff --git a/application/src/test/java/org/thingsboard/server/client/RpcV1JavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/RpcV1ApiClientTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/client/RpcV1JavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/RpcV1ApiClientTest.java index 399ecd4df9..80719052d1 100644 --- a/application/src/test/java/org/thingsboard/server/client/RpcV1JavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/RpcV1ApiClientTest.java @@ -23,7 +23,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest; import static org.junit.Assert.assertEquals; @DaoSqlTest -public class RpcV1JavaClientTest extends AbstractJavaClientTest { +public class RpcV1ApiClientTest extends AbstractApiClientTest { private static final String ONE_WAY_BODY = "{\"method\":\"setGpio\",\"params\":{\"pin\":7,\"value\":1},\"persistent\":true}"; diff --git a/application/src/test/java/org/thingsboard/server/client/RpcV2JavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/RpcV2ApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/RpcV2JavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/RpcV2ApiClientTest.java index 43669c1620..02b7e0f0ba 100644 --- a/application/src/test/java/org/thingsboard/server/client/RpcV2JavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/RpcV2ApiClientTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class RpcV2JavaClientTest extends AbstractJavaClientTest { +public class RpcV2ApiClientTest extends AbstractApiClientTest { private static final String PERSISTENT_BODY = "{\"method\":\"setGpio\",\"params\":{\"pin\":7,\"value\":1},\"persistent\":true}"; diff --git a/application/src/test/java/org/thingsboard/server/client/RuleChainJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/RuleChainApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/RuleChainJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/RuleChainApiClientTest.java index 95b5301d9f..8adcecaf24 100644 --- a/application/src/test/java/org/thingsboard/server/client/RuleChainJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/RuleChainApiClientTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class RuleChainJavaClientTest extends AbstractJavaClientTest { +public class RuleChainApiClientTest extends AbstractApiClientTest { @Test public void testRuleChainAndNodeLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/TbImageJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/TbImageApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/TbImageJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/TbImageApiClientTest.java index 5dbe358991..2a06549554 100644 --- a/application/src/test/java/org/thingsboard/server/client/TbImageJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/TbImageApiClientTest.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class TbImageJavaClientTest extends AbstractJavaClientTest { +public class TbImageApiClientTest extends AbstractApiClientTest { private File createTempImage(String name, Color color) throws IOException { BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB); diff --git a/application/src/test/java/org/thingsboard/server/client/TbResourceJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/TbResourceApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/TbResourceJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/TbResourceApiClientTest.java index 156667fecd..0651ce6cc3 100644 --- a/application/src/test/java/org/thingsboard/server/client/TbResourceJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/TbResourceApiClientTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class TbResourceJavaClientTest extends AbstractJavaClientTest { +public class TbResourceApiClientTest extends AbstractApiClientTest { @Test public void testResourceLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/TelemetryJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/TelemetryApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/TelemetryJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/TelemetryApiClientTest.java index 8028c66682..a2dbe0eda4 100644 --- a/application/src/test/java/org/thingsboard/server/client/TelemetryJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/TelemetryApiClientTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class TelemetryJavaClientTest extends AbstractJavaClientTest { +public class TelemetryApiClientTest extends AbstractApiClientTest { @Test public void testTelemetryLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/TenantJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/TenantApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/TenantJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/TenantApiClientTest.java index 4ab0f2710e..150486eb8c 100644 --- a/application/src/test/java/org/thingsboard/server/client/TenantJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/TenantApiClientTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class TenantJavaClientTest extends AbstractJavaClientTest { +public class TenantApiClientTest extends AbstractApiClientTest { @Test public void testTenantLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/TenantProfileJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/TenantProfileApiClientTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/client/TenantProfileJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/TenantProfileApiClientTest.java index e8c110a004..68dd5f7c0e 100644 --- a/application/src/test/java/org/thingsboard/server/client/TenantProfileJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/TenantProfileApiClientTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class TenantProfileJavaClientTest extends AbstractJavaClientTest { +public class TenantProfileApiClientTest extends AbstractApiClientTest { @Test public void testTenantProfileLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/TwoFactorAuthJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/TwoFactorAuthApiClientTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/client/TwoFactorAuthJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/TwoFactorAuthApiClientTest.java index 972049d44c..5f371b5d82 100644 --- a/application/src/test/java/org/thingsboard/server/client/TwoFactorAuthJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/TwoFactorAuthApiClientTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @DaoSqlTest -public class TwoFactorAuthJavaClientTest extends AbstractJavaClientTest { +public class TwoFactorAuthApiClientTest extends AbstractApiClientTest { @Test public void testTwoFactorAuthLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/UserJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/UserApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/UserJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/UserApiClientTest.java index 378f48846f..154858405f 100644 --- a/application/src/test/java/org/thingsboard/server/client/UserJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/UserApiClientTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class UserJavaClientTest extends AbstractJavaClientTest { +public class UserApiClientTest extends AbstractApiClientTest { @Test public void testUserLifecycle() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/client/WidgetTypeJavaClientTest.java b/application/src/test/java/org/thingsboard/server/client/WidgetTypeApiClientTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/client/WidgetTypeJavaClientTest.java rename to application/src/test/java/org/thingsboard/server/client/WidgetTypeApiClientTest.java index 503c8efcf5..ee3984bb4b 100644 --- a/application/src/test/java/org/thingsboard/server/client/WidgetTypeJavaClientTest.java +++ b/application/src/test/java/org/thingsboard/server/client/WidgetTypeApiClientTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @DaoSqlTest -public class WidgetTypeJavaClientTest extends AbstractJavaClientTest { +public class WidgetTypeApiClientTest extends AbstractApiClientTest { private JsonNode createDescriptor(String type) { return OBJECT_MAPPER.createObjectNode()