🔨 Refact: Add a completed callback in the Callback.

hanbings · Jan 8, 2023 · 07fa595 · 07fa595
1 parent bf78aec
commit 07fa595
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 42 deletions.
diff --git a/fluocean-common/build.gradle b/fluocean-common/build.gradle
@@ -2,6 +2,9 @@ dependencies {
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     implementation 'com.google.code.gson:gson:2.10'
 
+    // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
+    implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.1")
+
     // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 }
diff --git a/fluocean-common/src/main/java/io/hanbings/fluocean/common/OAuthCallback.java b/fluocean-common/src/main/java/io/hanbings/fluocean/common/OAuthCallback.java
@@ -1,6 +1,8 @@
 package io.hanbings.fluocean.common;
 
 import io.hanbings.fluocean.common.interfaces.Callback;
+import io.hanbings.fluocean.common.interfaces.Response;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
@@ -9,20 +11,22 @@ public class OAuthCallback {
     private OAuthCallback() {
     }
 
-    public static <D, W> Callback<D, W> response(String token, @Nullable D data, @Nullable W wrong) {
+    public static <D, W> Callback<D, W> response(
+            String token, @Nullable D data, @Nullable W wrong, @NotNull Response response
+    ) {
         return (data == null && wrong == null) ?
-                new OAuthCallback.Exception<>(token, new IllegalArgumentException()) :
+                new OAuthCallback.Exception<>(token, new IllegalArgumentException(), null) :
                 ((wrong == null) ?
-                        new OAuthCallback.Success<>(token, data) :
-                        new OAuthCallback.Failure<>(token, wrong)
+                        new OAuthCallback.Success<>(token, data, response) :
+                        new OAuthCallback.Failure<>(token, wrong, response)
                 );
     }
 
     public static <D, W> Callback<D, W> exception(String token, Throwable throwable) {
-        return new OAuthCallback.Exception<>(token, throwable);
+        return new OAuthCallback.Exception<>(token, throwable, null);
     }
 
-    record Success<D, W>(String token, D data) implements Callback<D, W> {
+    record Success<D, W>(String token, D data, Response response) implements Callback<D, W> {
 
         @Override
         public W wrong() {
@@ -41,6 +45,13 @@ public Callback<D, W> succeed(Consumer<D> data) {
             return this;
         }
 
+        @Override
+        public Callback<D, W> completed(Consumer<Response> response) {
+            response.accept(this.response);
+
+            return this;
+        }
+
         @Override
         public Callback<D, W> fail(Consumer<W> wrong) {
             return this;
@@ -57,7 +68,7 @@ public boolean success() {
         }
     }
 
-    record Failure<D, W>(String token, W wrong) implements Callback<D, W> {
+    record Failure<D, W>(String token, W wrong, Response response) implements Callback<D, W> {
         @Override
         public D data() {
             return null;
@@ -73,6 +84,13 @@ public Callback<D, W> succeed(Consumer<D> data) {
             return this;
         }
 
+        @Override
+        public Callback<D, W> completed(Consumer<Response> response) {
+            response.accept(this.response);
+
+            return this;
+        }
+
         @Override
         public Callback<D, W> fail(Consumer<W> wrong) {
             wrong.accept(this.wrong);
@@ -91,7 +109,7 @@ public boolean success() {
         }
     }
 
-    record Exception<D, W>(String token, Throwable throwable) implements Callback<D, W> {
+    record Exception<D, W>(String token, Throwable throwable, Response response) implements Callback<D, W> {
         @Override
         public D data() {
             return null;
@@ -107,6 +125,11 @@ public Callback<D, W> succeed(Consumer<D> data) {
             return this;
         }
 
+        @Override
+        public Callback<D, W> completed(Consumer<Response> response) {
+            return this;
+        }
+
         @Override
         public Callback<D, W> fail(Consumer<W> wrong) {
             return this;

diff --git a/fluocean-common/src/main/java/io/hanbings/fluocean/common/data/Email.java b/fluocean-common/src/main/java/io/hanbings/fluocean/common/data/Email.java
@@ -0,0 +1,11 @@
+package io.hanbings.fluocean.common.data;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+
+public record Email(
+        @JsonProperty("email")
+        @SerializedName("email")
+        String email
+) {
+}
diff --git a/fluocean-common/src/main/java/io/hanbings/fluocean/common/data/Openid.java b/fluocean-common/src/main/java/io/hanbings/fluocean/common/data/Openid.java
@@ -0,0 +1,11 @@
+package io.hanbings.fluocean.common.data;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+
+public record Openid(
+        @JsonProperty("openid")
+        @SerializedName("openid")
+        String openid
+) {
+}
diff --git a/...mmon/src/main/java/io/hanbings/fluocean/common/exception/NoResponseReceivedException.java b/...mmon/src/main/java/io/hanbings/fluocean/common/exception/NoResponseReceivedException.java
@@ -0,0 +1,5 @@
+package io.hanbings.fluocean.common.exception;
+
+@SuppressWarnings("unused")
+public class NoResponseReceivedException extends Exception {
+}
diff --git a/fluocean-common/src/main/java/io/hanbings/fluocean/common/interfaces/Callback.java b/fluocean-common/src/main/java/io/hanbings/fluocean/common/interfaces/Callback.java
@@ -7,12 +7,16 @@ public interface Callback<D, W> {
 
     W wrong();
 
+    Response response();
+
     String token();
 
     Throwable throwable();
 
     Callback<D, W> succeed(Consumer<D> data);
 
+    Callback<D, W> completed(Consumer<Response> response);
+
     Callback<D, W> fail(Consumer<W> wrong);
 
     Callback<D, W> except(Consumer<Throwable> throwable);

diff --git a/fluocean-common/src/main/java/io/hanbings/fluocean/common/interfaces/Profilable.java b/fluocean-common/src/main/java/io/hanbings/fluocean/common/interfaces/Profilable.java
diff --git a/fluocean-common/src/main/java/io/hanbings/fluocean/common/interfaces/Profile.java b/fluocean-common/src/main/java/io/hanbings/fluocean/common/interfaces/Profile.java
diff --git a/fluocean-discord/src/main/java/io/hanbings/fluocean/discord/DiscordOAuth.java b/fluocean-discord/src/main/java/io/hanbings/fluocean/discord/DiscordOAuth.java
@@ -111,7 +111,7 @@ public Callback<DiscordAccess, DiscordAccess.Wrong> token(String code, String st
                     .get()
                     .object(DiscordAccess.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -120,7 +120,7 @@ public Callback<DiscordAccess, DiscordAccess.Wrong> token(String code, String st
                     .get()
                     .object(DiscordAccess.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(
@@ -154,7 +154,7 @@ public Callback<DiscordAccess, DiscordAccess.Wrong> refresh(String token) {
                     .get()
                     .object(DiscordAccess.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -163,7 +163,7 @@ public Callback<DiscordAccess, DiscordAccess.Wrong> refresh(String token) {
                     .get()
                     .object(DiscordAccess.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(
@@ -196,7 +196,7 @@ public Callback<DiscordRevoke, DiscordRevoke.Wrong> revoke(String token) {
                     .get()
                     .object(DiscordRevoke.class, response.raw());
 
-            return OAuthCallback.response(null, access, null);
+            return OAuthCallback.response(null, access, null, response);
         }
 
         return OAuthCallback.exception(

diff --git a/fluocean-dropbox/src/main/java/io/hanbings/fluocean/dropbox/DropboxOAuth.java b/fluocean-dropbox/src/main/java/io/hanbings/fluocean/dropbox/DropboxOAuth.java
@@ -77,7 +77,7 @@ public Callback<DropboxAccess, DropboxAccess.Wrong> token(String code, String st
                     .get()
                     .object(DropboxAccess.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -86,7 +86,7 @@ public Callback<DropboxAccess, DropboxAccess.Wrong> token(String code, String st
                     .get()
                     .object(DropboxAccess.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(
@@ -119,7 +119,7 @@ public <K, V> Map<K, V> map(Class<K> key, Class<V> value, String raw) {
                     .get()
                     .object(DropboxRevoke.class, "{ }");
 
-            return OAuthCallback.response(null, access, null);
+            return OAuthCallback.response(null, access, null, response);
         }
 
         return OAuthCallback.exception(
@@ -153,7 +153,7 @@ public Callback<DropboxRefresh, DropboxRefresh.Wrong> refresh(String token) {
                     .get()
                     .object(DropboxRefresh.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -162,7 +162,7 @@ public Callback<DropboxRefresh, DropboxRefresh.Wrong> refresh(String token) {
                     .get()
                     .object(DropboxRefresh.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(

diff --git a/fluocean-github/src/main/java/io/hanbings/fluocean/github/GithubOAuth.java b/fluocean-github/src/main/java/io/hanbings/fluocean/github/GithubOAuth.java
@@ -54,13 +54,13 @@ public Callback<GithubAccess, GithubAccess.Wrong> token(String code, String stat
                         .get()
                         .object(GithubAccess.class, response.raw());
 
-                return OAuthCallback.response(access.accessToken(), access, null);
+                return OAuthCallback.response(access.accessToken(), access, null, response);
             } else {
                 GithubAccess.Wrong wrong = this.serialization()
                         .get()
                         .object(GithubAccess.Wrong.class, response.raw());
 
-                return OAuthCallback.response(null, null, wrong);
+                return OAuthCallback.response(null, null, wrong, response);
             }
         }
 

diff --git a/fluocean-google/src/main/java/io/hanbings/fluocean/google/GoogleOAuth.java b/fluocean-google/src/main/java/io/hanbings/fluocean/google/GoogleOAuth.java
@@ -66,7 +66,7 @@ public Callback<GoogleAccess, GoogleAccess.Wrong> token(String code, String stat
                     .get()
                     .object(GoogleAccess.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -75,7 +75,7 @@ public Callback<GoogleAccess, GoogleAccess.Wrong> token(String code, String stat
                     .get()
                     .object(GoogleAccess.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(

diff --git a/fluocean-microsoft/src/main/java/io/hanbings/fluocean/microsoft/MicrosoftOAuth.java b/fluocean-microsoft/src/main/java/io/hanbings/fluocean/microsoft/MicrosoftOAuth.java
@@ -79,7 +79,7 @@ public Callback<MicrosoftAccess, MicrosoftAccess.Wrong> token(String code, Strin
                     .get()
                     .object(MicrosoftAccess.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -88,7 +88,7 @@ public Callback<MicrosoftAccess, MicrosoftAccess.Wrong> token(String code, Strin
                     .get()
                     .object(MicrosoftAccess.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(
@@ -122,7 +122,7 @@ public Callback<MicrosoftAccess, MicrosoftAccess.Wrong> refresh(String token) {
                     .get()
                     .object(MicrosoftAccess.class, response.raw());
 
-            return OAuthCallback.response(access.accessToken(), access, null);
+            return OAuthCallback.response(access.accessToken(), access, null, response);
 
         }
 
@@ -131,7 +131,7 @@ public Callback<MicrosoftAccess, MicrosoftAccess.Wrong> refresh(String token) {
                     .get()
                     .object(MicrosoftAccess.Wrong.class, response.raw());
 
-            return OAuthCallback.response(null, null, wrong);
+            return OAuthCallback.response(null, null, wrong, response);
         }
 
         return OAuthCallback.exception(