Merge pull request #5 from dynamiatools/3.x

upgrade to dynamia tools v5.1.x

Author: marioserrano09

README.md

@@ -25,24 +25,24 @@ Add the following dependencies to project classpath
 <dependency>
     <groupId>tools.dynamia.modules</groupId>
     <artifactId>tools.dynamia.modules.saas</artifactId>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
 </dependency>
 ```
 
 ```xml
 <dependency>
     <groupId>tools.dynamia.modules</groupId>
     <artifactId>tools.dynamia.modules.saas.ui</artifactId>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
 </dependency>
 
 ```
 
 **Gradle**
 
 ```groovy
-compile 'tools.dynamia.modules:tools.dynamia.modules.saas:3.0.0'
-compile 'tools.dynamia.modules:tools.dynamia.modules.saas.ui:3.0.0'
+compile 'tools.dynamia.modules:tools.dynamia.modules.saas:3.1.0'
+compile 'tools.dynamia.modules:tools.dynamia.modules.saas.ui:3.1.0'
 ```
 
 ## Usage
@@ -81,7 +81,7 @@ For your modules you only require the API dependency
 <dependency>
     <groupId>tools.dynamia.modules</groupId>
     <artifactId>tools.dynamia.modules.saas.api</artifactId>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
 </dependency>
 ```
 

sources/api/pom.xml

@@ -26,13 +26,13 @@
     <parent>
         <groupId>tools.dynamia.modules</groupId>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>tools.dynamia.modules.saas.api</artifactId>
 
     <name>DynamiaModules - SaaS API</name>
     <url>https://www.dynamia.tools/modules/saas</url>
-    <version>3.0.1</version>
+    <version>3.1.1</version>
 
     <build>
         <plugins>
@@ -43,7 +43,8 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
-                    <encoding>${source.encoding}</encoding>
+                     <encoding>${source.encoding}</encoding>
+                    <parameters>true</parameters>
                 </configuration>
             </plugin>
         </plugins>
@@ -55,6 +56,10 @@
             <artifactId>tools.dynamia.actions</artifactId>
             <version>${dynamiatools.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
     </dependencies>
 
 

sources/api/src/main/java/tools/dynamia/modules/saas/api/AccountAPIConfig.java

@@ -18,18 +18,38 @@
 package tools.dynamia.modules.saas.api;
 
 import org.springframework.beans.factory.config.CustomScopeConfigurer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import tools.dynamia.integration.ms.MessageService;
 
+/**
+ *  Default Account SaaS configuration
+ */
 @Configuration
 public class AccountAPIConfig {
 
 
-
+    /**
+     *   This bean is used to register the AccountScope in the application context.
+     * @return CustomScopeConfigurer
+     */
     @Bean
-    public static CustomScopeConfigurer accountScopeConfigurer() {
+    public CustomScopeConfigurer accountScopeConfigurer() {
         CustomScopeConfigurer configurer = new CustomScopeConfigurer();
         configurer.addScope("account", new AccountScope());
         return configurer;
     }
+
+    /**
+     * If no AccountServiceAPI is configured, this bean will be used as a default.
+     * This is useful for testing.
+     *
+     * @return NoOpAccountServiceAPI instance
+     */
+    @Bean
+    @ConditionalOnMissingBean(AccountServiceAPI.class)
+    public AccountServiceAPI noOpAccountServiceAPI() {
+        return new NoOpAccountServiceAPI();
+    }
 }

sources/jpa/src/main/java/tools/dynamia/modules/saas/jpa/NoOpAccountServiceAPI.java renamed to sources/api/src/main/java/tools/dynamia/modules/saas/api/NoOpAccountServiceAPI.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package tools.dynamia.modules.saas.jpa;
+package tools.dynamia.modules.saas.api;
 
-import tools.dynamia.domain.util.CrudServiceListenerAdapter;
-import tools.dynamia.modules.saas.api.AccountAware;
-import tools.dynamia.modules.saas.api.AccountServiceAPI;
+
+import tools.dynamia.commons.logger.LoggingService;
+import tools.dynamia.commons.logger.SLF4JLoggingService;
 import tools.dynamia.modules.saas.api.dto.AccountDTO;
 import tools.dynamia.modules.saas.api.dto.AccountLogDTO;
 import tools.dynamia.modules.saas.api.dto.AccountPaymentDTO;
@@ -28,7 +28,12 @@
 
 import java.util.*;
 
-public class NoOpAccountServiceAPI extends CrudServiceListenerAdapter<AccountAware> implements AccountServiceAPI {
+/**
+ * Default No operational {@link AccountServiceAPI} implementation. Useful for testing
+ */
+public class NoOpAccountServiceAPI implements AccountServiceAPI {
+
+    private final LoggingService logger = new SLF4JLoggingService(NoOpAccountServiceAPI.class);
 
     private static Long defaultAccountId = 1L;
     private static AccountDTO CURRENT_ACCOUNT;
@@ -96,19 +101,6 @@ public void updateAccountUsers(Long accountId, long users, long activedUsers) {
 
     }
 
-    @Override
-    public void beforeCreate(AccountAware entity) {
-        if (entity != null) {
-            entity.setAccountId(defaultAccountId);
-        }
-    }
-
-    @Override
-    public void afterUpdate(AccountAware entity) {
-        if (entity != null && entity.getAccountId() == null) {
-            entity.setAccountId(defaultAccountId);
-        }
-    }
 
     @Override
     public List<AccountPaymentDTO> getPayments(Long accountId) {
@@ -143,7 +135,7 @@ public List<Long> findAccountsIdByFeature(String featureId) {
 
     @Override
     public void log(Long accountId, String message) {
-        System.out.println("[LOG ACCOUNT " + accountId + "]  " + message);
+        logger.info("[ACCOUNT " + accountId + "]  " + message);
     }
 
     @Override

sources/core/pom.xml

@@ -22,10 +22,10 @@
     <parent>
         <groupId>tools.dynamia.modules</groupId>
         <artifactId>tools.dynamia.modules.saas.parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>tools.dynamia.modules.saas</artifactId>
-    <version>3.0.1</version>
+    <version>3.1.1</version>
     <name>DynamiaModules - SaaS Core</name>
     <url>https://www.dynamia.tools/modules/saas</url>
 
@@ -38,7 +38,8 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
-                    <encoding>${source.encoding}</encoding>
+                     <encoding>${source.encoding}</encoding>
+                    <parameters>true</parameters>
                 </configuration>
             </plugin>
         </plugins>
@@ -48,12 +49,12 @@
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas.api</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas.jpa</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

sources/core/src/main/java/tools/dynamia/modules/saas/AccountContext.java

@@ -18,7 +18,6 @@
 
 package tools.dynamia.modules.saas;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import tools.dynamia.commons.logger.LoggingService;
 import tools.dynamia.commons.logger.SLF4JLoggingService;
@@ -28,7 +27,6 @@
 import tools.dynamia.modules.saas.services.AccountService;
 import tools.dynamia.web.util.HttpUtils;
 
-import jakarta.annotation.PostConstruct;
 import java.util.List;
 
 /**
@@ -39,11 +37,13 @@ public class AccountContext {
 
     private final LoggingService logger = new SLF4JLoggingService(AccountContext.class);
 
-    @Autowired
-    private List<AccountResolver> resolvers;
+    private final AccountService service;
+    private final List<AccountResolver> resolvers;
 
-    @Autowired
-    private AccountService service;
+    public AccountContext(AccountService service, List<AccountResolver> resolvers) {
+        this.service = service;
+        this.resolvers = resolvers;
+    }
 
 
     public static AccountContext getCurrent() {

sources/core/src/main/java/tools/dynamia/modules/saas/AccountEntityFileProvider.java

@@ -30,8 +30,12 @@
 @Provider
 public class AccountEntityFileProvider implements EntityFileAccountProvider {
 
-    @Autowired
-    private AccountServiceAPI accountServiceAPI;
+
+    private final AccountServiceAPI accountServiceAPI;
+
+    public AccountEntityFileProvider(AccountServiceAPI accountServiceAPI) {
+        this.accountServiceAPI = accountServiceAPI;
+    }
 
     @Override
     public Long getAccountId() {

sources/core/src/main/java/tools/dynamia/modules/saas/AccountLocaleProvider.java

@@ -27,7 +27,7 @@
 @Provider
 public class AccountLocaleProvider implements LocaleProvider {
 
-    private LoggingService logger = new SLF4JLoggingService(AccountLocaleProvider.class);
+    private final LoggingService logger = new SLF4JLoggingService(AccountLocaleProvider.class);
 
     @Override
     public int getPriority() {

sources/core/src/main/java/tools/dynamia/modules/saas/AccountResolver.java

@@ -22,6 +22,7 @@
 import tools.dynamia.modules.saas.domain.Account;
 
 /**
+ * Account resolver api
  *
  * @author Mario Serrano Leones
  */

sources/core/src/main/java/tools/dynamia/modules/saas/AccountStatusCache.java

@@ -20,9 +20,12 @@
 import tools.dynamia.commons.SimpleCache;
 import tools.dynamia.modules.saas.domain.Account;
 
+/**
+ * Basic simple cache for account status. Internaylly use {@link SimpleCache} class
+ */
 public class AccountStatusCache {
 
-    private static SimpleCache<Long, Boolean> statusCache = new SimpleCache<>();
+    private static final SimpleCache<Long, Boolean> statusCache = new SimpleCache<>();
 
     public static boolean isStatusChanged(Account account) {
         if (account.getId() == null) {