Fixed readme dependencies version

Author: waileong

build.gradle

@@ -8,8 +8,7 @@ plugins {
 }
 
 group = 'io.github.waileong'
-version = '1.0.1'
-
+version = '1.0.2'
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)

readme.adoc

@@ -57,7 +57,7 @@ Add the following to your `build.gradle`:
 
 ----
 dependencies {
-    implementation 'io.github.waileong:spring-boot-fcm:1.0.1
+    implementation 'io.github.waileong:spring-boot-fcm:1.0.2
 }
 ----
 
@@ -70,7 +70,7 @@ Insert this dependency in your `pom.xml`:
     <dependency>
         <groupId>io.github.waileong</groupId>
         <artifactId>spring-boot-fcm</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </dependency>
 </dependencies>
 ----

src/main/java/io/github/waileong/fcm/authentication/FcmJwtTokenPooledObjectFactory.java

@@ -1,12 +1,12 @@
 package io.github.waileong.fcm.authentication;
 
+import io.github.waileong.fcm.config.FcmProperties;
+import io.github.waileong.fcm.util.RSAKeyPairUtil;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.apache.commons.pool2.BasePooledObjectFactory;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.impl.DefaultPooledObject;
-import io.github.waileong.fcm.config.FcmProperties;
-import io.github.waileong.fcm.util.RSAKeyPairUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +52,7 @@ public FcmJwtTokenPooledObjectFactory(FcmProperties.Credential credential) {
     @Override
     public FcmJwtToken create() throws Exception {
         Instant now = Instant.now();
-        Instant expiration = now.plusSeconds(3600);
+        Instant expiration = now.plus(credential.getJwtExpireDuration());
         String privateKeyId = credential.getPrivateKeyId();
         String clientEmail = credential.getClientEmail();
         String privateKey = credential.getPrivateKey();

src/main/java/io/github/waileong/fcm/config/FcmAutoConfiguration.java

@@ -1,6 +1,8 @@
 package io.github.waileong.fcm.config;
 
+import io.github.waileong.fcm.authentication.FcmJwtToken;
 import io.github.waileong.fcm.service.impl.FcmServiceImpl;
+import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -42,7 +44,8 @@ public class FcmAutoConfiguration {
      * @return An instance of {@link FcmServiceImpl}, ready to be used for FCM operations within the application.
      */
     @Bean
-    public FcmServiceImpl fcmService(@Qualifier("fcmRestClient") RestClient fcmRestClient) {
-        return new FcmServiceImpl(fcmRestClient);
+    public FcmServiceImpl fcmService(@Qualifier("fcmRestClient") RestClient fcmRestClient,
+                                     @Qualifier("fcmJwtTokenPool") GenericObjectPool<FcmJwtToken> googleFcmJwtTokenPool) {
+        return new FcmServiceImpl(fcmRestClient, googleFcmJwtTokenPool);
     }
 }

src/main/java/io/github/waileong/fcm/config/FcmConnectionConfiguration.java

@@ -2,8 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.waileong.fcm.authentication.FcmJwtToken;
-import org.apache.commons.pool2.impl.GenericObjectPool;
 import io.github.waileong.fcm.exception.FcmRestClientResponseErrorHandler;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -121,13 +119,11 @@ public FcmRestClientResponseErrorHandler fcmRestClientResponseErrorHandler(
 
     /**
      * Configures and provides a {@link RestClient} tailored for FCM communication. This REST client is configured
-     * with FCM-specific headers, message converters, error handlers, and a token-based authentication mechanism
-     * leveraging a JWT token pool. It is designed for sending messages to FCM services, using a base URL constructed
+     * with FCM-specific headers, message converters, and error handlers. It is designed for sending messages to FCM services, using a base URL constructed
      * from the provided FCM project ID.
      *
      * @param fcmClientHttpRequestFactory       The HTTP request factory for FCM.
      * @param fcmMessageConverter               The message converter for FCM.
-     * @param googleFcmJwtTokenPool             A pool of JWT tokens for FCM authentication.
      * @param fcmRestClientResponseErrorHandler The error handler for FCM responses.
      * @param fcmProperties                     Properties containing the FCM credential and project ID.
      * @return A configured {@link RestClient} instance for FCM communication.
@@ -136,7 +132,6 @@ public FcmRestClientResponseErrorHandler fcmRestClientResponseErrorHandler(
     public RestClient fcmRestClient(
             @Qualifier("fcmClientHttpRequestFactory") ClientHttpRequestFactory fcmClientHttpRequestFactory,
             @Qualifier("fcmMessageConverter") MappingJackson2HttpMessageConverter fcmMessageConverter,
-            @Qualifier("fcmJwtTokenPool") GenericObjectPool<FcmJwtToken> googleFcmJwtTokenPool,
             @Qualifier("fcmRestClientResponseErrorHandler") FcmRestClientResponseErrorHandler fcmRestClientResponseErrorHandler,
             FcmProperties fcmProperties) {
         String projectId = fcmProperties.getCredential().getProjectId();
@@ -149,7 +144,6 @@ public RestClient fcmRestClient(
                 .baseUrl("https://fcm.googleapis.com/v1/projects/" + projectId + "/messages:send")
                 .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
                 .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                .defaultHeaders(httpHeaders -> httpHeaders.setBearerAuth(getAccessToken(googleFcmJwtTokenPool)))
                 .requestFactory(fcmClientHttpRequestFactory)
                 .messageConverters(httpMessageConverters -> {
                     // override the default message converters
@@ -160,24 +154,5 @@ public RestClient fcmRestClient(
                 .build();
     }
 
-    /**
-     * Retrieves an access token from the JWT token pool for authenticating FCM requests. This method ensures
-     * that a valid token is always used for authentication by borrowing from and returning tokens to the pool.
-     *
-     * @param pool The pool of FCM JWT tokens.
-     * @return A valid JWT token string for FCM authentication.
-     */
-    private String getAccessToken(GenericObjectPool<FcmJwtToken> pool) {
-        FcmJwtToken fcmJwtToken = null;
-        try {
-            fcmJwtToken = pool.borrowObject();
-            return fcmJwtToken.token();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (fcmJwtToken != null) {
-                pool.returnObject(fcmJwtToken);
-            }
-        }
-    }
+
 }

src/main/java/io/github/waileong/fcm/config/FcmProperties.java

@@ -193,6 +193,10 @@ public static class Credential {
          * The client email associated with the Firebase service account, used for authentication.
          */
         private String clientEmail;
+        /**
+         * The time period a JWT token remains valid, set to 1 hour by default.
+         */
+        private Duration jwtExpireDuration = Duration.ofHours(1);
 
         /**
          * Gets the project ID of the Firebase service account.
@@ -265,6 +269,24 @@ public String getClientEmail() {
         public void setClientEmail(String clientEmail) {
             this.clientEmail = clientEmail;
         }
+
+        /**
+         * Gets the time period a JWT token remains valid.
+         *
+         * @return The duration a JWT token remains valid.
+         */
+        public Duration getJwtExpireDuration() {
+            return jwtExpireDuration;
+        }
+
+        /**
+         * Sets the time period a JWT token remains valid.
+         *
+         * @param jwtExpireDuration The duration a JWT token remains valid.
+         */
+        public void setJwtExpireDuration(Duration jwtExpireDuration) {
+            this.jwtExpireDuration = jwtExpireDuration;
+        }
     }
 
     /**

src/main/java/io/github/waileong/fcm/service/impl/FcmServiceImpl.java

@@ -1,9 +1,12 @@
 package io.github.waileong.fcm.service.impl;
 
+import io.github.waileong.fcm.authentication.FcmJwtToken;
 import io.github.waileong.fcm.service.FcmService;
 import io.github.waileong.fcm.service.domain.FcmError;
+import io.github.waileong.fcm.service.domain.FcmErrorResponse;
 import io.github.waileong.fcm.service.domain.FcmMessage;
 import io.github.waileong.fcm.service.domain.FcmSendRequest;
+import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
@@ -23,21 +26,47 @@
  *
  * @author Wai Leong
  */
-@RegisterReflectionForBinding({FcmSendRequest.class, FcmMessage.class, FcmError.class})
+@RegisterReflectionForBinding({FcmSendRequest.class, FcmMessage.class, FcmError.class, FcmErrorResponse.class})
 public class FcmServiceImpl implements FcmService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private final RestClient fcmRestClient;
+    private final GenericObjectPool<FcmJwtToken> fcmJwtTokenPool;
 
-    public FcmServiceImpl(RestClient fcmRestClient) {
+    public FcmServiceImpl(RestClient fcmRestClient,
+                          GenericObjectPool<FcmJwtToken> fcmJwtTokenPool) {
         this.fcmRestClient = fcmRestClient;
+        this.fcmJwtTokenPool = fcmJwtTokenPool;
     }
 
 
     @Override
     public FcmMessage send(FcmSendRequest sendRequest) {
         return this.fcmRestClient.post()
+                .headers(httpHeaders -> httpHeaders.setBearerAuth(getAccessToken(fcmJwtTokenPool)))
                 .body(sendRequest)
                 .retrieve()
                 .body(FcmMessage.class);
     }
+
+    /**
+     * Retrieves an access token from the JWT token pool for authenticating FCM requests. This method ensures
+     * that a valid token is always used for authentication by borrowing from and returning tokens to the pool.
+     *
+     * @param pool The pool of FCM JWT tokens.
+     * @return A valid JWT token string for FCM authentication.
+     */
+    private String getAccessToken(GenericObjectPool<FcmJwtToken> pool) {
+        FcmJwtToken fcmJwtToken = null;
+        try {
+            fcmJwtToken = pool.borrowObject();
+            return fcmJwtToken.token();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (fcmJwtToken != null) {
+                pool.returnObject(fcmJwtToken);
+            }
+        }
+    }
+
 }