From 7ea9b1a4d1bf862a4c3a00e14be87715b3b520ca Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Fri, 19 Jun 2020 16:03:36 +0300
Subject: [PATCH] Refactored OAuth2Dao

---
 .../dao/oauth2/OAuth2ClientRegistrationDao.java    |  4 ++--
 .../sql/oauth2/JpaOAuth2ClientRegistrationDao.java | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationDao.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationDao.java
index 25c68d58e4..dbdcd8f68b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientRegistrationDao.java
@@ -7,9 +7,9 @@ import java.util.List;
 public interface OAuth2ClientRegistrationDao {
     List<OAuth2ClientRegistration> find();
 
-    OAuth2ClientRegistration findById(String registrationId);
+    OAuth2ClientRegistration findByRegistrationId(String registrationId);
 
     OAuth2ClientRegistration save(OAuth2ClientRegistration clientRegistration);
 
-    boolean removeById(String registrationId);
+    boolean removeByRegistrationId(String registrationId);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java
index d2b951a072..98e1b8431a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationDao.java
@@ -16,29 +16,19 @@
 package org.thingsboard.server.dao.sql.oauth2;
 
 import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.oauth2.OAuth2ClientRegistration;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.OAuth2ClientRegistrationEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2ClientRegistrationDao;
-import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
-import static org.thingsboard.server.common.data.UUIDConverter.fromTimeUUID;
-
 @Slf4j
 @Component
 @SqlDao
@@ -68,14 +58,14 @@ public class JpaOAuth2ClientRegistrationDao implements OAuth2ClientRegistrationD
     }
 
     @Override
-    public OAuth2ClientRegistration findById(String registrationId) {
+    public OAuth2ClientRegistration findByRegistrationId(String registrationId) {
         log.debug("Get entity by registration id {}", registrationId);
         Optional<OAuth2ClientRegistrationEntity> entity = repository.findByRegistrationId(registrationId);
         return DaoUtil.getData(entity);
     }
 
     @Override
-    public boolean removeById(String registrationId) {
+    public boolean removeByRegistrationId(String registrationId) {
         repository.deleteByRegistrationId(registrationId);
         log.debug("Remove request: {}", registrationId);
         return !repository.existsByRegistrationId(registrationId);