Replace LinkUserTemplate in api module (#112)

* Replace LinkUserTemplate#of with LinkUser#of * Remove LinkUserTemplate * Remove unnecessary field declaration in AccountLinkAdapter
bivashy · Nov 4, 2023 · f52bc7b · f52bc7b
1 parent 787f500
commit f52bc7b
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 57 deletions.
diff --git a/api/src/main/java/com/bivashy/auth/api/account/Account.java b/api/src/main/java/com/bivashy/auth/api/account/Account.java
@@ -10,7 +10,6 @@
 import com.bivashy.auth.api.crypto.HashedPassword;
 import com.bivashy.auth.api.link.LinkType;
 import com.bivashy.auth.api.link.user.LinkUser;
-import com.bivashy.auth.api.link.user.LinkUserTemplate;
 import com.bivashy.auth.api.link.user.info.LinkUserInfo;
 import com.bivashy.auth.api.model.PlayerIdSupplier;
 import com.bivashy.auth.api.server.player.ServerPlayer;
@@ -76,7 +75,7 @@ default LinkUser findFirstLinkUserOrCreate(Predicate<LinkUser> filter, LinkUser
     }
 
     default LinkUser findFirstLinkUserOrNew(Predicate<LinkUser> filter, LinkType linkType) {
-        return findFirstLinkUserOrCreate(filter, LinkUserTemplate.of(linkType, this, LinkUserInfo.of(linkType.getDefaultIdentificator())));
+        return findFirstLinkUserOrCreate(filter, LinkUser.of(linkType, this, LinkUserInfo.of(linkType.getDefaultIdentificator())));
     }
 
     @Deprecated
@@ -152,5 +151,4 @@ default Optional<ServerPlayer> getPlayer() {
     default boolean isRegistered() {
         return getPasswordHash().getHash() != null;
     }
-
 }
diff --git a/api/src/main/java/com/bivashy/auth/api/link/user/LinkUser.java b/api/src/main/java/com/bivashy/auth/api/link/user/LinkUser.java
@@ -7,6 +7,26 @@
 import com.bivashy.auth.api.link.user.info.LinkUserInfo;
 
 public interface LinkUser {
+
+    static LinkUser of(LinkType linkType, Account account, LinkUserInfo userInfo) {
+        return new LinkUser() {
+            @Override
+            public LinkType getLinkType() {
+                return linkType;
+            }
+
+            @Override
+            public Account getAccount() {
+                return account;
+            }
+
+            @Override
+            public LinkUserInfo getLinkUserInfo() {
+                return userInfo;
+            }
+        };
+    }
+
     /**
      * @return link type, for example link type of VK, link type of DISCORD,link
      * type of TELEGRAM.
@@ -29,4 +49,5 @@ default boolean isIdentifierDefaultOrNull() {
                 .map(identificator -> identificator.equals(getLinkType().getDefaultIdentificator()) || identificator.asString() == null)
                 .orElse(true);
     }
+
 }
diff --git a/api/src/main/java/com/bivashy/auth/api/link/user/LinkUserTemplate.java b/api/src/main/java/com/bivashy/auth/api/link/user/LinkUserTemplate.java
diff --git a/core/src/main/java/me/mastercapexd/auth/link/user/AccountLinkAdapter.java b/core/src/main/java/me/mastercapexd/auth/link/user/AccountLinkAdapter.java
@@ -2,24 +2,23 @@
 
 import com.bivashy.auth.api.AuthPlugin;
 import com.bivashy.auth.api.account.Account;
+import com.bivashy.auth.api.link.LinkType;
 import com.bivashy.auth.api.link.user.info.LinkUserIdentificator;
 import com.bivashy.auth.api.link.user.info.LinkUserInfo;
 
 import me.mastercapexd.auth.database.model.AccountLink;
 
 public class AccountLinkAdapter extends LinkUserTemplate {
-    private final LinkUserInfo linkUserInfo;
 
     public AccountLinkAdapter(AccountLink accountLink, Account account) {
-        super(AuthPlugin.instance()
+        super(findLinkType(accountLink), account, LinkUserInfo.of(LinkUserIdentificator.ofParsed(accountLink.getLinkUserId()), accountLink.isLinkEnabled()));
+    }
+
+    private static LinkType findLinkType(AccountLink accountLink) {
+        return AuthPlugin.instance()
                 .getLinkTypeProvider()
                 .getLinkType(accountLink.getLinkType())
-                .orElseThrow(() -> new IllegalArgumentException("Link type " + accountLink.getLinkType() + " not exists!")), account);
-        this.linkUserInfo = LinkUserInfo.of(LinkUserIdentificator.ofParsed(accountLink.getLinkUserId()), accountLink.isLinkEnabled());
+                .orElseThrow(() -> new IllegalArgumentException("Link type " + accountLink.getLinkType() + " not exists!"));
     }
 
-    @Override
-    public LinkUserInfo getLinkUserInfo() {
-        return linkUserInfo;
-    }
 }
diff --git a/core/src/main/java/me/mastercapexd/auth/link/user/LinkUserTemplate.java b/core/src/main/java/me/mastercapexd/auth/link/user/LinkUserTemplate.java
@@ -5,13 +5,15 @@
 import com.bivashy.auth.api.link.user.LinkUser;
 import com.bivashy.auth.api.link.user.info.LinkUserInfo;
 
-public abstract class LinkUserTemplate implements LinkUser {
-    protected final LinkType linkType;
-    protected final Account account;
+public class LinkUserTemplate implements LinkUser {
+    private final LinkType linkType;
+    private final Account account;
+    private final LinkUserInfo linkUserInfo;
 
-    public LinkUserTemplate(LinkType linkType, Account account) {
+    public LinkUserTemplate(LinkType linkType, Account account, LinkUserInfo linkUserInfo) {
         this.linkType = linkType;
         this.account = account;
+        this.linkUserInfo = linkUserInfo;
     }
 
     @Override
@@ -24,12 +26,12 @@ public Account getAccount() {
         return account;
     }
 
+    @Override
+    public LinkUserInfo getLinkUserInfo() {
+        return linkUserInfo;
+    }
+
     public static LinkUser of(LinkType linkType, Account account, LinkUserInfo linkUserInfo) {
-        return new LinkUserTemplate(linkType, account) {
-            @Override
-            public LinkUserInfo getLinkUserInfo() {
-                return linkUserInfo;
-            }
-        };
+        return new LinkUserTemplate(linkType, account, linkUserInfo);
     }
 }
diff --git a/core/src/main/java/me/mastercapexd/auth/link/user/entry/BaseLinkEntryUser.java b/core/src/main/java/me/mastercapexd/auth/link/user/entry/BaseLinkEntryUser.java
@@ -13,7 +13,7 @@ public class BaseLinkEntryUser extends LinkUserTemplate implements LinkEntryUser
     protected boolean confirmed = false;
 
     public BaseLinkEntryUser(LinkType linkType, Account account, LinkUserInfo linkUserInfo) {
-        super(linkType, account);
+        super(linkType, account, linkUserInfo);
         this.linkUserInfo = linkUserInfo;
     }
 

diff --git a/core/src/main/java/me/mastercapexd/auth/server/commands/GoogleCommand.java b/core/src/main/java/me/mastercapexd/auth/server/commands/GoogleCommand.java
@@ -7,13 +7,13 @@
 import com.bivashy.auth.api.config.message.Messages;
 import com.bivashy.auth.api.database.AccountDatabase;
 import com.bivashy.auth.api.link.user.LinkUser;
-import com.bivashy.auth.api.link.user.LinkUserTemplate;
 import com.bivashy.auth.api.link.user.info.LinkUserIdentificator;
 import com.bivashy.auth.api.link.user.info.LinkUserInfo;
 import com.bivashy.auth.api.server.message.ServerComponent;
 import com.bivashy.auth.api.server.player.ServerPlayer;
 
 import me.mastercapexd.auth.link.google.GoogleLinkType;
+import me.mastercapexd.auth.link.user.LinkUserTemplate;
 import me.mastercapexd.auth.server.commands.annotations.GoogleUse;
 import me.mastercapexd.auth.shared.commands.annotation.CommandCooldown;
 import revxrsal.commands.annotation.Command;