Skip to content

Commit

Permalink
Fix : renommage des package pour build docker, optimisation de code
Browse files Browse the repository at this point in the history
  • Loading branch information
@pierre-maraval
pierre-maraval committed Apr 18, 2024
1 parent 11eeab5 commit 65b6ab6
Show file tree
Hide file tree
Showing 175 changed files with 915 additions and 1,270 deletions.
7 changes: 1 addition & 6 deletions batch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@
<artifactId>spring-retry</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.224</version>
</dependency>
</dependencies>
<!-- =========================================================== -->
<!-- Configuration de la compilation -->
Expand All @@ -88,7 +83,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.5.RELEASE</version>
<configuration>
<mainClass>fr.abes.item.Application</mainClass>
<mainClass>fr.abes.item.batch.Application</mainClass>
</configuration>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/fr/abes/item/Application.java → .../java/fr/abes/item/batch/Application.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.abes.item;
package fr.abes.item.batch;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
45 changes: 27 additions & 18 deletions ...n/java/fr/abes/item/JobConfiguration.java → .../fr/abes/item/batch/JobConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package fr.abes.item;

import fr.abes.item.configuration.BaseXMLConfiguration;
import fr.abes.item.constant.Constant;
import fr.abes.item.traitement.*;
import fr.abes.item.traitement.model.LigneFichierDto;
import fr.abes.item.traitement.model.LigneFichierDtoExemp;
import fr.abes.item.traitement.model.LigneFichierDtoModif;
import fr.abes.item.traitement.model.LigneFichierDtoRecouv;
import fr.abes.item.traitement.traiterlignesfichierchunk.LignesFichierProcessor;
import fr.abes.item.traitement.traiterlignesfichierchunk.LignesFichierReader;
import fr.abes.item.traitement.traiterlignesfichierchunk.LignesFichierWriter;
import fr.abes.item.webstats.ExportStatistiquesTasklet;
import fr.abes.item.webstats.VerifierParamsTasklet;
package fr.abes.item.batch;

import fr.abes.item.batch.traitement.*;
import fr.abes.item.batch.traitement.model.LigneFichierDto;
import fr.abes.item.batch.traitement.model.LigneFichierDtoExemp;
import fr.abes.item.batch.traitement.model.LigneFichierDtoModif;
import fr.abes.item.batch.traitement.model.LigneFichierDtoRecouv;
import fr.abes.item.batch.traitement.traiterlignesfichierchunk.LignesFichierProcessor;
import fr.abes.item.batch.traitement.traiterlignesfichierchunk.LignesFichierReader;
import fr.abes.item.batch.traitement.traiterlignesfichierchunk.LignesFichierWriter;
import fr.abes.item.batch.webstats.ExportStatistiquesTasklet;
import fr.abes.item.batch.webstats.VerifierParamsTasklet;
import fr.abes.item.core.configuration.BaseXMLConfiguration;
import fr.abes.item.core.configuration.factory.StrategyFactory;
import fr.abes.item.core.constant.Constant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobParametersIncrementer;
Expand All @@ -36,20 +37,28 @@
@Configuration
@EnableRetry
@ComponentScans(value = {
@ComponentScan(basePackages = {"fr.abes.item.repository.item"}),
@ComponentScan(basePackages = {"fr.abes.item.configuration"},
@ComponentScan(basePackages = {"fr.abes.item.core.repository.item"}),
@ComponentScan(basePackages = {"fr.abes.item.core.configuration"},
excludeFilters = {
@ComponentScan.Filter(type = FilterType.ANNOTATION, classes = BaseXMLConfiguration.class)
})
})
@EntityScan("fr.abes.item.entities.item")
@EntityScan("fr.abes.item.core.entities.item")
public class JobConfiguration {
private final StrategyFactory strategyFactory;

private final ProxyRetry proxyRetry;
@Value("${batch.min.hour}")
int minHour;

@Value("${batch.max.hour}")
int maxHour;

public JobConfiguration(StrategyFactory strategyFactory, ProxyRetry proxyRetry) {
this.strategyFactory = strategyFactory;
this.proxyRetry = proxyRetry;
}


@Bean
public ExecutionContextSerializer configureSerializer() {
Expand All @@ -63,7 +72,7 @@ public LignesFichierReader reader() {
}
@Bean
public LignesFichierProcessor processor() {
return new LignesFichierProcessor();
return new LignesFichierProcessor(strategyFactory, proxyRetry);
}
@Bean
public LignesFichierWriter writer() {
Expand Down
4 changes: 2 additions & 2 deletions ...h/src/main/java/fr/abes/item/LogTime.java → ...main/java/fr/abes/item/batch/LogTime.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.abes.item;
package fr.abes.item.batch;

import fr.abes.item.constant.Constant;
import fr.abes.item.core.constant.Constant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.StepExecution;

Expand Down
2 changes: 1 addition & 1 deletion ...in/java/fr/abes/item/TimeIncrementer.java → ...a/fr/abes/item/batch/TimeIncrementer.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.abes.item;
package fr.abes.item.batch;

import jakarta.annotation.Nullable;
import org.springframework.batch.core.JobParameters;
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/fr/abes/item/mail/IMailer.java → ...java/fr/abes/item/batch/mail/IMailer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.abes.item.mail;
package fr.abes.item.batch.mail;

import fr.abes.item.entities.item.Demande;
import fr.abes.item.core.entities.item.Demande;

import java.io.File;
import java.time.LocalDateTime;
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/fr/abes/item/mail/MailDto.java → ...java/fr/abes/item/batch/mail/MailDto.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fr.abes.item.mail;
package fr.abes.item.batch.mail;

import lombok.Getter;
import lombok.Setter;
Expand Down
6 changes: 3 additions & 3 deletions ...n/java/fr/abes/item/mail/impl/Mailer.java → .../fr/abes/item/batch/mail/impl/Mailer.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.abes.item.mail.impl;
package fr.abes.item.batch.mail.impl;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import fr.abes.item.constant.Constant;
import fr.abes.item.mail.MailDto;
import fr.abes.item.batch.mail.MailDto;
import fr.abes.item.core.constant.Constant;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpPost;
Expand Down
16 changes: 8 additions & 8 deletions ...a/fr/abes/item/mail/impl/MailerExemp.java → ...bes/item/batch/mail/impl/MailerExemp.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package fr.abes.item.mail.impl;
package fr.abes.item.batch.mail.impl;


import fr.abes.item.constant.Constant;
import fr.abes.item.constant.TYPE_DEMANDE;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeExemp;
import fr.abes.item.mail.IMailer;
import fr.abes.item.service.factory.Strategy;
import fr.abes.item.service.impl.LigneFichierExempService;
import fr.abes.item.batch.mail.IMailer;
import fr.abes.item.core.configuration.factory.Strategy;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.constant.TYPE_DEMANDE;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeExemp;
import fr.abes.item.core.service.impl.LigneFichierExempService;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;

Expand Down
14 changes: 7 additions & 7 deletions ...a/fr/abes/item/mail/impl/MailerModif.java → ...bes/item/batch/mail/impl/MailerModif.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package fr.abes.item.mail.impl;
package fr.abes.item.batch.mail.impl;

import fr.abes.item.constant.Constant;
import fr.abes.item.constant.TYPE_DEMANDE;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.mail.IMailer;
import fr.abes.item.service.factory.Strategy;
import fr.abes.item.service.impl.LigneFichierModifService;
import fr.abes.item.batch.mail.IMailer;
import fr.abes.item.core.configuration.factory.Strategy;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.constant.TYPE_DEMANDE;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.service.impl.LigneFichierModifService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
Expand Down
14 changes: 7 additions & 7 deletions .../fr/abes/item/mail/impl/MailerRecouv.java → ...es/item/batch/mail/impl/MailerRecouv.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package fr.abes.item.mail.impl;
package fr.abes.item.batch.mail.impl;

import fr.abes.item.constant.Constant;
import fr.abes.item.constant.TYPE_DEMANDE;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.mail.IMailer;
import fr.abes.item.service.factory.Strategy;
import fr.abes.item.service.impl.LigneFichierRecouvService;
import fr.abes.item.batch.mail.IMailer;
import fr.abes.item.core.configuration.factory.Strategy;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.constant.TYPE_DEMANDE;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.service.impl.LigneFichierRecouvService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.env.Environment;

Expand Down
16 changes: 8 additions & 8 deletions ...aitement/AuthentifierSurSudocTasklet.java → ...aitement/AuthentifierSurSudocTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.cbs.exception.CBSException;
import fr.abes.item.constant.Constant;
import fr.abes.item.constant.TYPE_DEMANDE;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.mail.IMailer;
import fr.abes.item.service.IDemandeService;
import fr.abes.item.service.factory.StrategyFactory;
import fr.abes.item.traitement.model.LigneFichierDto;
import fr.abes.item.batch.mail.IMailer;
import fr.abes.item.batch.traitement.model.LigneFichierDto;
import fr.abes.item.core.configuration.factory.StrategyFactory;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.constant.TYPE_DEMANDE;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.service.IDemandeService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
12 changes: 6 additions & 6 deletions ...inishedForMoreThanThreeMonthsTasklet.java → ...inishedForMoreThanThreeMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeExemp;
import fr.abes.item.exception.DemandeCheckingException;
import fr.abes.item.service.impl.DemandeExempService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeExemp;
import fr.abes.item.core.exception.DemandeCheckingException;
import fr.abes.item.core.service.impl.DemandeExempService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
12 changes: 6 additions & 6 deletions ...inishedForMoreThanThreeMonthsTasklet.java → ...inishedForMoreThanThreeMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeModif;
import fr.abes.item.exception.DemandeCheckingException;
import fr.abes.item.service.impl.DemandeModifService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeModif;
import fr.abes.item.core.exception.DemandeCheckingException;
import fr.abes.item.core.service.impl.DemandeModifService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
12 changes: 6 additions & 6 deletions ...inishedForMoreThanThreeMonthsTasklet.java → ...inishedForMoreThanThreeMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeRecouv;
import fr.abes.item.exception.DemandeCheckingException;
import fr.abes.item.service.impl.DemandeRecouvService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeRecouv;
import fr.abes.item.core.exception.DemandeCheckingException;
import fr.abes.item.core.service.impl.DemandeRecouvService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
12 changes: 6 additions & 6 deletions ...inishedForMoreThanThreeMonthsTasklet.java → ...inishedForMoreThanThreeMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeExemp;
import fr.abes.item.exception.DemandeCheckingException;
import fr.abes.item.service.impl.DemandeExempService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeExemp;
import fr.abes.item.core.exception.DemandeCheckingException;
import fr.abes.item.core.service.impl.DemandeExempService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
12 changes: 6 additions & 6 deletions ...inishedForMoreThanThreeMonthsTasklet.java → ...inishedForMoreThanThreeMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeModif;
import fr.abes.item.exception.DemandeCheckingException;
import fr.abes.item.service.impl.DemandeModifService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeModif;
import fr.abes.item.core.exception.DemandeCheckingException;
import fr.abes.item.core.service.impl.DemandeModifService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
12 changes: 6 additions & 6 deletions ...inishedForMoreThanThreeMonthsTasklet.java → ...inishedForMoreThanThreeMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeRecouv;
import fr.abes.item.exception.DemandeCheckingException;
import fr.abes.item.service.impl.DemandeRecouvService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeRecouv;
import fr.abes.item.core.exception.DemandeCheckingException;
import fr.abes.item.core.service.impl.DemandeRecouvService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
10 changes: 5 additions & 5 deletions ...dStatusForMoreThanSevenMonthsTasklet.java → ...dStatusForMoreThanSevenMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeExemp;
import fr.abes.item.service.impl.DemandeExempService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeExemp;
import fr.abes.item.core.service.impl.DemandeExempService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
10 changes: 5 additions & 5 deletions ...dStatusForMoreThanSevenMonthsTasklet.java → ...dStatusForMoreThanSevenMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeModif;
import fr.abes.item.service.impl.DemandeModifService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeModif;
import fr.abes.item.core.service.impl.DemandeModifService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
10 changes: 5 additions & 5 deletions ...dStatusForMoreThanSevenMonthsTasklet.java → ...dStatusForMoreThanSevenMonthsTasklet.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fr.abes.item.traitement;
package fr.abes.item.batch.traitement;

import fr.abes.item.constant.Constant;
import fr.abes.item.entities.item.Demande;
import fr.abes.item.entities.item.DemandeRecouv;
import fr.abes.item.service.impl.DemandeRecouvService;
import fr.abes.item.core.constant.Constant;
import fr.abes.item.core.entities.item.Demande;
import fr.abes.item.core.entities.item.DemandeRecouv;
import fr.abes.item.core.service.impl.DemandeRecouvService;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.batch.core.ExitStatus;
Expand Down
Loading

0 comments on commit 65b6ab6

Please sign in to comment.