some exporter refactoring

clearing-parent/account-service/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 spring.main.web-application-type=none
-account-service.hazelcast.cluster-members=127.0.0.1
+account-service.hazelcast.cluster-members=127.0.0.1:5071
 account-service.hazelcast.login=dev
 account-service.hazelcast.password=dev-pass
 

clearing-parent/balance-service/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 spring.main.web-application-type=none
-balance-service.hazelcast.cluster-members=127.0.0.1
+balance-service.hazelcast.cluster-members=127.0.0.1:5071
 balance-service.hazelcast.login=dev
 balance-service.hazelcast.password=dev-pass
 

clearing-parent/company-service/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 spring.main.web-application-type=none
-company-service.hazelcast.cluster-members=127.0.0.1
+company-service.hazelcast.cluster-members=127.0.0.1:5071
 company-service.hazelcast.login=dev
 company-service.hazelcast.password=dev-pass
 company-service.kafka.bootstrap-servers=localhost:9092

clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/controller/ExporterController.java

@@ -10,37 +10,23 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import ru.spcex.clearing.dbf.exporter.logic.data.IFilter;
-import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
 import ru.spcex.clearing.dbf.exporter.services.DBFExportService;
 
-import java.util.EnumMap;
-import java.util.Map;
-
 @Controller("/")
-public class DefaultController implements InitializingBean {
+public class ExporterController implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final DBFExportService dbfExportService;
 
-    public DefaultController(@Qualifier("dbfExportService") DBFExportService dbfExportService) {
+    public ExporterController(@Qualifier("dbfExportService") DBFExportService dbfExportService) {
         this.dbfExportService = dbfExportService;
     }
 
-    @RequestMapping(method = RequestMethod.GET, path = "/test", produces = MediaType.TEXT_PLAIN_VALUE)
-    @ResponseBody
-    public String processGet() {
-        log.info("Call test method for exporter controller");
-        return "exporter controller test method";
-    }
-
     @RequestMapping(method = RequestMethod.GET, path = "/export", produces = MediaType.TEXT_PLAIN_VALUE)
     @ResponseBody
     public String exportTables() {
         log.info("Call export method for exporter controller");
-        Map<Table, IFilter> tablesForExport = new EnumMap<>(Table.class);
+        dbfExportService.run();
-        for (Table table : Table.values()) tablesForExport.put(table, null);
+        return "export done";
-        dbfExportService.run(tablesForExport);
-        return "export done, see log";
     }
 
     @Override

clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/IFilter.java

@@ -1,8 +0,0 @@
-package ru.spcex.clearing.dbf.exporter.logic.data;
-
-/**
- * Фильтр записей для экспорта
- */
-public interface IFilter {
-
-}

clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java

@@ -11,15 +11,13 @@ import java.util.UUID;
 public class ResultContainer {
     private UUID uuid;
     private Table tableForExport;
-    private IFilter filter;
     private File fileForExport;
 
     protected ResultContainer() {}
 
-    public static ResultContainer createNewTask(Table tableForExport, IFilter filter) {
+    public static ResultContainer createNewTask(Table tableForExport) {
         ResultContainer container = new ResultContainer();
         container.tableForExport = tableForExport;
-        container.filter = filter;
         container.uuid = UUID.randomUUID();
         return container;
     }
@@ -32,14 +30,6 @@ public class ResultContainer {
         this.tableForExport = tableForExport;
     }
 
-    public IFilter getFilter() {
-        return filter;
-    }
-
-    public void setFilter(IFilter filter) {
-        this.filter = filter;
-    }
-
     public File getFileForExport() {
         return fileForExport;
     }

clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromHazelcast.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.sdf.*;
 import ru.spcex.clearing.dbf.exporter.exceptions.ConfigException;
-import ru.spcex.clearing.dbf.exporter.logic.data.IFilter;
 import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
 import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult;
 import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
@@ -63,8 +62,6 @@ public class ExportFromHazelcast extends Stage implements InitializingBean {
         Objects.requireNonNull(resultContainer.getFileForExport());
 
         Table table = resultContainer.getTableForExport();
-        IFilter filter = resultContainer.getFilter();
-
         Imdg<? extends SpcexObjectBase> map = imdgProvider.getImdg(table.getHazelcastMapName(), table.getEntityClass());
         File dbfFile = resultContainer.getFileForExport();
         boolean writeOk = false;

clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java

@@ -24,8 +24,8 @@ import java.util.Objects;
 public class PrepareDBFFile extends Stage implements InitializingBean {
     private static final String SECTION = "U";
     private static final String CODE_OF_MEMBER = null;
-    private static DateTimeFormatter tsFormatter = DateTimeFormatter.ofPattern("yyMMddHHmm");
+    private static final DateTimeFormatter tsFormatter = DateTimeFormatter.ofPattern("yyMMddHHmm");
-    private static DateTimeFormatter utilFormatter = DateTimeFormatter.ofPattern("yyMMdd");
+    private static final DateTimeFormatter utilFormatter = DateTimeFormatter.ofPattern("yyMMdd");
     private final AProperties properties;
     private String outDir;
 

clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/DBFExportService.java

@@ -3,13 +3,10 @@ package ru.spcex.clearing.dbf.exporter.services;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
-import ru.spcex.clearing.dbf.exporter.logic.data.IFilter;
 import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
 import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
 import ru.spcex.clearing.dbf.exporter.logic.stages.Processor;
 
-import java.util.Map;
-
 @Service("dbfExportService")
 public class DBFExportService {
     private final ThreadPoolTaskExecutor executor;
@@ -21,11 +18,9 @@ public class DBFExportService {
         this.processor = processor;
     }
 
-    public void run(Map<Table, IFilter> tablesForExport) {
+    public void run() {
-        for (Map.Entry<Table, IFilter> tableForExport : tablesForExport.entrySet()) {
+        for (Table tableForExport : Table.values()) {
-            Table table = tableForExport.getKey();
+            executor.submit(() -> processor.process(ResultContainer.createNewTask(tableForExport)));
-            IFilter filter = tableForExport.getValue();
-            executor.submit(() -> processor.process(ResultContainer.createNewTask(table, filter)));
         }
     }
 

clearing-parent/dbf-exporter/src/main/resources/application.properties

@@ -2,7 +2,7 @@ server.port=8080
 server.servlet.context-path=/exporter
 spring.main.web-application-type=servlet
 
-hazelcast.cluster-members=127.0.0.1:5701
+hazelcast.cluster-members=127.0.0.1:5071
 hazelcast.login=dev
 hazelcast.password=dev-pass
 

clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/ImporterController.java

@@ -21,13 +21,6 @@ public class ImporterController implements InitializingBean {
         this.importerService = importerService;
     }
 
-    @RequestMapping(method = RequestMethod.GET, path = "/test", produces = MediaType.TEXT_PLAIN_VALUE)
-    @ResponseBody
-    public String processGet() {
-        log.info("Call test method for importer controller");
-        return "importer controller test method";
-    }
-
     @RequestMapping(method = RequestMethod.GET, path = "/import", produces = MediaType.TEXT_PLAIN_VALUE)
     @ResponseBody
     public String checkFolder() {

clearing-parent/securities-service/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.main.web-application-type=none
 
-securities-service.hazelcast.cluster-members=127.0.0.1
+securities-service.hazelcast.cluster-members=127.0.0.1:5071
 securities-service.hazelcast.login=dev
 securities-service.hazelcast.password=dev-pass
 

clearing-parent/utility-service/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.main.web-application-type=none
 
-utility-service.hazelcast.cluster-members=127.0.0.1
+utility-service.hazelcast.cluster-members=127.0.0.1:5071
 utility-service.hazelcast.login=dev
 utility-service.hazelcast.password=dev-pass