Commit 102c5fd5 authored by calocedre TAC's avatar calocedre TAC
Browse files

fix package fr.gouv.clea.clea.scoring to fr.gouv.clea.scoring

parent 30b11d12
......@@ -32,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import fr.gouv.clea.clea.scoring.configuration.risk.RiskConfiguration;
import fr.gouv.clea.dto.SinglePlaceCluster;
import fr.gouv.clea.dto.SinglePlaceExposedVisits;
import fr.gouv.clea.identification.ExposedVisitPartitioner;
......@@ -44,6 +43,7 @@ import fr.gouv.clea.indexation.model.output.ClusterFile;
import fr.gouv.clea.indexation.processors.IndexationProcessor;
import fr.gouv.clea.indexation.readers.IndexationReader;
import fr.gouv.clea.indexation.writers.IndexationWriter;
import fr.gouv.clea.scoring.configuration.risk.RiskConfiguration;
@Configuration
......
package fr.gouv.clea.identification;
import fr.gouv.clea.clea.scoring.configuration.risk.RiskConfiguration;
import fr.gouv.clea.clea.scoring.configuration.risk.RiskRule;
import fr.gouv.clea.config.BatchProperties;
import fr.gouv.clea.dto.ClusterPeriod;
import fr.gouv.clea.dto.SinglePlaceCluster;
import fr.gouv.clea.dto.SinglePlaceExposedVisits;
import fr.gouv.clea.entity.ExposedVisit;
import fr.gouv.clea.scoring.configuration.risk.RiskConfiguration;
import fr.gouv.clea.scoring.configuration.risk.RiskRule;
import fr.gouv.clea.utils.ExposedVisitComparator;
import org.springframework.batch.item.ItemProcessor;
......
......@@ -12,13 +12,13 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import fr.gouv.clea.clea.scoring.configuration.risk.RiskConfiguration;
import fr.gouv.clea.clea.scoring.configuration.risk.RiskRule;
import fr.gouv.clea.config.BatchProperties;
import fr.gouv.clea.dto.ClusterPeriod;
import fr.gouv.clea.dto.SinglePlaceCluster;
import fr.gouv.clea.dto.SinglePlaceExposedVisits;
import fr.gouv.clea.entity.ExposedVisit;
import fr.gouv.clea.scoring.configuration.risk.RiskConfiguration;
import fr.gouv.clea.scoring.configuration.risk.RiskRule;
@ExtendWith(MockitoExtension.class)
class SinglePlaceExposedVisitsProcessorTest {
......
package fr.gouv.clea.clea.scoring.configuration;
package fr.gouv.clea.scoring.configuration;
import fr.gouv.clea.clea.scoring.configuration.exceptions.NoScoringConfigurationFoundException;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Optional;
import fr.gouv.clea.scoring.configuration.exceptions.NoScoringConfigurationFoundException;
@Slf4j
public abstract class ScoringConfiguration {
......
package fr.gouv.clea.clea.scoring.configuration;
package fr.gouv.clea.scoring.configuration;
import javax.validation.Valid;
import javax.validation.constraints.Min;
import fr.gouv.clea.clea.scoring.configuration.validators.NoDuplicates;
import fr.gouv.clea.clea.scoring.configuration.validators.ValidateWildcards;
import fr.gouv.clea.scoring.configuration.validators.NoDuplicates;
import fr.gouv.clea.scoring.configuration.validators.ValidateWildcards;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
......
package fr.gouv.clea.clea.scoring.configuration.exposure;
package fr.gouv.clea.scoring.configuration.exposure;
import fr.gouv.clea.clea.scoring.configuration.ScoringConfiguration;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
import fr.gouv.clea.clea.scoring.configuration.validators.CheckDefaultRulePresence;
import lombok.Setter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.annotation.Validated;
import fr.gouv.clea.scoring.configuration.ScoringConfiguration;
import fr.gouv.clea.scoring.configuration.ScoringRule;
import fr.gouv.clea.scoring.configuration.validators.CheckDefaultRulePresence;
import javax.validation.constraints.NotEmpty;
import java.util.List;
......
package fr.gouv.clea.clea.scoring.configuration.exposure;
package fr.gouv.clea.scoring.configuration.exposure;
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
import org.springframework.core.convert.converter.Converter;
......
package fr.gouv.clea.clea.scoring.configuration.exposure;
package fr.gouv.clea.scoring.configuration.exposure;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
import lombok.Getter;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
......@@ -8,6 +7,8 @@ import lombok.experimental.SuperBuilder;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import fr.gouv.clea.scoring.configuration.ScoringRule;
@Valid
@SuperBuilder
@ToString(callSuper = true)
......
package fr.gouv.clea.clea.scoring.configuration.risk;
package fr.gouv.clea.scoring.configuration.risk;
import fr.gouv.clea.clea.scoring.configuration.ScoringConfiguration;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
import fr.gouv.clea.clea.scoring.configuration.validators.CheckDefaultRulePresence;
import lombok.Setter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.annotation.Validated;
import fr.gouv.clea.scoring.configuration.ScoringConfiguration;
import fr.gouv.clea.scoring.configuration.ScoringRule;
import fr.gouv.clea.scoring.configuration.validators.CheckDefaultRulePresence;
import javax.validation.constraints.NotEmpty;
import java.util.List;
......
package fr.gouv.clea.clea.scoring.configuration.risk;
package fr.gouv.clea.scoring.configuration.risk;
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
import org.springframework.core.convert.converter.Converter;
......
package fr.gouv.clea.clea.scoring.configuration.risk;
package fr.gouv.clea.scoring.configuration.risk;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
import lombok.Getter;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
......@@ -8,6 +7,8 @@ import lombok.experimental.SuperBuilder;
import javax.validation.Valid;
import javax.validation.constraints.Positive;
import fr.gouv.clea.scoring.configuration.ScoringRule;
@Valid
@SuperBuilder
@ToString(callSuper = true)
......
package fr.gouv.clea.clea.scoring.configuration.validators;
package fr.gouv.clea.scoring.configuration.validators;
import javax.validation.Constraint;
import javax.validation.Payload;
......
package fr.gouv.clea.clea.scoring.configuration.validators;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
package fr.gouv.clea.scoring.configuration.validators;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import fr.gouv.clea.scoring.configuration.ScoringRule;
import java.util.List;
public class CheckDefaultRulePresenceValidator implements ConstraintValidator<CheckDefaultRulePresence, List<? extends ScoringRule>> {
......
package fr.gouv.clea.clea.scoring.configuration.validators;
package fr.gouv.clea.scoring.configuration.validators;
import javax.validation.Constraint;
import javax.validation.Payload;
......
package fr.gouv.clea.clea.scoring.configuration.validators;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
package fr.gouv.clea.scoring.configuration.validators;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import fr.gouv.clea.scoring.configuration.ScoringRule;
import java.util.ArrayList;
import java.util.List;
......
package fr.gouv.clea.clea.scoring.configuration.validators;
package fr.gouv.clea.scoring.configuration.validators;
import javax.validation.Constraint;
import javax.validation.Payload;
......
package fr.gouv.clea.clea.scoring.configuration.validators;
import fr.gouv.clea.clea.scoring.configuration.ScoringRule;
package fr.gouv.clea.scoring.configuration.validators;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import fr.gouv.clea.scoring.configuration.ScoringRule;
public class VenueTypeValidator implements ConstraintValidator<ValidateWildcards, Object> {
@Override
......
package fr.gouv.clea.clea.scoring.configuration;
import fr.gouv.clea.clea.scoring.configuration.exposure.ExposureTimeConfiguration;
import fr.gouv.clea.clea.scoring.configuration.exposure.ExposureTimeConfigurationConverter;
import fr.gouv.clea.clea.scoring.configuration.exposure.ExposureTimeRule;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -12,6 +9,11 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import fr.gouv.clea.scoring.configuration.ScoringRule;
import fr.gouv.clea.scoring.configuration.exposure.ExposureTimeConfiguration;
import fr.gouv.clea.scoring.configuration.exposure.ExposureTimeConfigurationConverter;
import fr.gouv.clea.scoring.configuration.exposure.ExposureTimeRule;
import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment