From e4af9b30ea43ea9f1b8a06583f8a6b6d03ffa256 Mon Sep 17 00:00:00 2001
From: Mohamed Magdi-Abdelmonem <mohamed.magdi.abdelmonem@gmail.com>
Date: Wed, 4 Oct 2023 19:12:26 +0300
Subject: [PATCH] FINERACT-1932: Add stater configuration class for template
 module services

---
 .../service/JpaTemplateDomainService.java     |  8 ++--
 .../service/TemplateMergeService.java         |  2 -
 .../starter/TemplateConfiguration.java        | 45 +++++++++++++++++++
 3 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 fineract-provider/src/main/java/org/apache/fineract/template/starter/TemplateConfiguration.java

diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/JpaTemplateDomainService.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/JpaTemplateDomainService.java
index cb6e9efe4..9fe12fe1a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/template/service/JpaTemplateDomainService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/JpaTemplateDomainService.java
@@ -22,6 +22,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import java.util.ArrayList;
 import java.util.List;
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
@@ -31,11 +32,9 @@ import org.apache.fineract.template.domain.TemplateMapper;
 import org.apache.fineract.template.domain.TemplateRepository;
 import org.apache.fineract.template.domain.TemplateType;
 import org.apache.fineract.template.exception.TemplateNotFoundException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-@Service
+@RequiredArgsConstructor
 public class JpaTemplateDomainService implements TemplateDomainService {
 
     private static final String PROPERTY_NAME = "name";
@@ -44,8 +43,7 @@ public class JpaTemplateDomainService implements TemplateDomainService {
     private static final String PROPERTY_ENTITY = "entity";
     private static final String PROPERTY_TYPE = "type";
 
-    @Autowired
-    private TemplateRepository templateRepository;
+    private final TemplateRepository templateRepository;
 
     @Override
     public List<Template> getAll() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java
index cd4d808ec..a1836523e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java
@@ -48,11 +48,9 @@ import org.apache.fineract.template.domain.Template;
 import org.apache.fineract.template.domain.TemplateFunctions;
 import org.apache.fineract.template.exception.TemplateForbiddenException;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
 
 @Slf4j
 @RequiredArgsConstructor
-@Service
 public class TemplateMergeService {
 
     private final FineractProperties fineractProperties;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/starter/TemplateConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/template/starter/TemplateConfiguration.java
new file mode 100644
index 000000000..cde91780e
--- /dev/null
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/starter/TemplateConfiguration.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.template.starter;
+
+import org.apache.fineract.infrastructure.core.config.FineractProperties;
+import org.apache.fineract.template.domain.TemplateRepository;
+import org.apache.fineract.template.service.JpaTemplateDomainService;
+import org.apache.fineract.template.service.TemplateDomainService;
+import org.apache.fineract.template.service.TemplateMergeService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TemplateConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(TemplateDomainService.class)
+    public TemplateDomainService templateDomainService(TemplateRepository templateRepository) {
+        return new JpaTemplateDomainService(templateRepository);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(TemplateMergeService.class)
+    public TemplateMergeService templateMergeService(FineractProperties fineractProperties) {
+        return new TemplateMergeService(fineractProperties);
+    }
+
+}