From cd7a7ce4250ffd6b895cbbb4f9e5dbc982f0494d Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Fri, 2 Oct 2020 10:21:30 +0300
Subject: [PATCH] Renamed domainDtos to domainParams

---
 .../server/common/data/oauth2/OAuth2ClientsParams.java      | 2 +-
 .../thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java    | 6 +++---
 .../server/dao/service/BaseOAuth2ServiceTest.java           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientsParams.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientsParams.java
index 3cb3b863fd..ee20021aca 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientsParams.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientsParams.java
@@ -26,5 +26,5 @@ import java.util.Set;
 @AllArgsConstructor
 public class OAuth2ClientsParams {
     private boolean enabled;
-    private Set<OAuth2ClientsDomainParams> oAuth2DomainDtos;
+    private Set<OAuth2ClientsDomainParams> domainsParams;
 }
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
index fab4c559d3..dd287f0755 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
@@ -72,7 +72,7 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
         clientParamsValidator.accept(oauth2Params);
         clientRegistrationDao.deleteAll();
         clientRegistrationInfoDao.deleteAll();
-        oauth2Params.getOAuth2DomainDtos().forEach(domainParams -> {
+        oauth2Params.getDomainsParams().forEach(domainParams -> {
             domainParams.getClientRegistrations().forEach(clientRegistrationDto -> {
                 OAuth2ClientRegistrationInfo oAuth2ClientRegistrationInfo = OAuth2Utils.toClientRegistrationInfo(oauth2Params.isEnabled(), clientRegistrationDto);
                 OAuth2ClientRegistrationInfo savedClientRegistrationInfo = clientRegistrationInfoDao.save(TenantId.SYS_TENANT_ID, oAuth2ClientRegistrationInfo);
@@ -107,10 +107,10 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
 
     private final Consumer<OAuth2ClientsParams> clientParamsValidator = oauth2Params -> {
         if (oauth2Params == null
-                || oauth2Params.getOAuth2DomainDtos() == null) {
+                || oauth2Params.getDomainsParams() == null) {
             throw new DataValidationException("Domain params should be specified!");
         }
-        for (OAuth2ClientsDomainParams domainParams : oauth2Params.getOAuth2DomainDtos()) {
+        for (OAuth2ClientsDomainParams domainParams : oauth2Params.getDomainsParams()) {
             if (domainParams.getDomainInfos() == null
                     || domainParams.getDomainInfos().isEmpty()) {
                 throw new DataValidationException("List of domain configuration should be specified!");
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
index fd5b5752cb..2daa0cb337 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java
@@ -42,7 +42,7 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
     public void after() {
         oAuth2Service.saveOAuth2Params(EMPTY_PARAMS);
         Assert.assertTrue(oAuth2Service.findAllClientRegistrationInfos().isEmpty());
-        Assert.assertTrue(oAuth2Service.findOAuth2Params().getOAuth2DomainDtos().isEmpty());
+        Assert.assertTrue(oAuth2Service.findOAuth2Params().getDomainsParams().isEmpty());
     }
 
     @Test
@@ -322,7 +322,7 @@ public class BaseOAuth2ServiceTest extends AbstractServiceTest {
         oAuth2Service.saveOAuth2Params(clientsParams);
         List<OAuth2ClientRegistrationInfo> foundClientRegistrationInfos = oAuth2Service.findAllClientRegistrationInfos();
         Assert.assertEquals(6, foundClientRegistrationInfos.size());
-        clientsParams.getOAuth2DomainDtos().stream()
+        clientsParams.getDomainsParams().stream()
                 .flatMap(domainParams -> domainParams.getClientRegistrations().stream())
                 .forEach(clientRegistrationDto ->
                         Assert.assertTrue(