Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 993693f2 by tchemit at 2019-08-06T20:38:35Z Use DecoratorServiceSupport from toolkit - - - - - 1 changed file: - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -22,16 +22,8 @@ package fr.ird.observe.dto.decoration; * #L% */ -import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.DtoReference; -import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; -import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorProvider; - -import java.util.Objects; +import fr.ird.observe.spi.model.initializer.ObserveGlobalModelInitializer; /** @@ -40,60 +32,23 @@ import java.util.Objects; * @author Tony Chemit - dev@tchemit.fr * @since 1.3 */ -public class DecoratorService extends DecoratorProvider { +public class DecoratorService extends DecoratorServiceSupport<DecoratorServiceInitializer> { public static final String HAULING_IDENTIFIER = "haulingIdentifier"; public static final String TRIP_CONTEXT = "Trip"; public static final String WITH_URL = "WithUrl"; - private final DecoratorServiceInitializer initializer; - private ReferentialLocale referentialLocale; - public DecoratorService(ReferentialLocale referentialLocale) { - this.referentialLocale = Objects.requireNonNull(referentialLocale); - this.initializer = new DecoratorServiceInitializer(this); - loadDecorators(); - } - - public ReferentialLocale getReferentialLocale() { - return referentialLocale; - } - - public void setReferentialLocale(ReferentialLocale referentialLocale) { - this.referentialLocale = referentialLocale; + super(referentialLocale); } @Override - protected void loadDecorators() { - if (referentialLocale == null) { - // on n'enregistre pas les décorateur tant que la locale n'est pas - // positionnée - return; - } - DecoratorServiceInitializer.run(initializer); - } - - public <T extends ReferentialDtoReference> ReferentialReferenceDecorator<T> getReferentialReferenceDecorator(Class<T> referenceType) { - return (ReferentialReferenceDecorator) getDecoratorByType(referenceType); + protected DecoratorServiceInitializer createDecoratorServiceInitializer() { + return new DecoratorServiceInitializer(this); } - public <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType) { - return (DataReferenceDecorator) getDecoratorByType(referenceType); - } - - public <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType, String context) { - return (DataReferenceDecorator) getDecoratorByType(referenceType, context); - } - - public <R extends DtoReference> Decorator<R> getReferenceDecorator(Class<R> referenceType) { - Decorator<R> decorator; - - if (DataDtoReference.class.isAssignableFrom(referenceType)) { - decorator = getDataReferenceDecorator((Class) referenceType); - } else { - decorator = getReferentialReferenceDecorator((Class) referenceType); - } - - return decorator; + @Override + protected void init(DecoratorServiceInitializer initializer) { + ObserveGlobalModelInitializer.run(initializer); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/993693f25d43ccbfbf7a491a976c... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/993693f25d43ccbfbf7a491a976c... You're receiving this email because of your account on gitlab.com.