fixes
This commit is contained in:
parent
769e18bbf6
commit
f19c8e77eb
|
@ -65,8 +65,8 @@ public class PlanStatusBuilder extends BaseBuilder<PlanStatus, PlanStatusEntity>
|
||||||
m.setHash(this.hashValue(d.getUpdatedAt()));
|
m.setHash(this.hashValue(d.getUpdatedAt()));
|
||||||
|
|
||||||
if (!definitionFields.isEmpty() && d.getDefinition() != null) {
|
if (!definitionFields.isEmpty() && d.getDefinition() != null) {
|
||||||
PlanStatusDefinitionEntity definition = this.xmlHandlingService.fromXmlSafe(PlanStatusDefinitionEntity.class, d.getDefinition());
|
PlanStatusDefinitionEntity definition = this.xmlHandlingService.fromXmlSafe(PlanStatusDefinitionEntity.class, d.getDefinition());
|
||||||
m.setDefinition(this.builderFactory.builder(PlanStatusDefinitionBuilder.class).authorize(this.authorize).build(definitionFields, definition));
|
m.setDefinition(this.builderFactory.builder(PlanStatusDefinitionBuilder.class).authorize(this.authorize).build(definitionFields, definition));
|
||||||
}
|
}
|
||||||
models.add(m);
|
models.add(m);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,14 @@ import org.opencdmp.convention.ConventionService;
|
||||||
import org.opencdmp.model.builder.BaseBuilder;
|
import org.opencdmp.model.builder.BaseBuilder;
|
||||||
import org.opencdmp.model.planstatus.PlanStatusDefinitionAuthorization;
|
import org.opencdmp.model.planstatus.PlanStatusDefinitionAuthorization;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
|
||||||
public class PlanStatusDefinitionAuthorizationBuilder extends BaseBuilder<PlanStatusDefinitionAuthorization, PlanStatusDefinitionAuthorizationEntity> {
|
public class PlanStatusDefinitionAuthorizationBuilder extends BaseBuilder<PlanStatusDefinitionAuthorization, PlanStatusDefinitionAuthorizationEntity> {
|
||||||
|
|
||||||
private final BuilderFactory builderFactory;
|
private final BuilderFactory builderFactory;
|
||||||
|
|
|
@ -11,9 +11,14 @@ import org.opencdmp.convention.ConventionService;
|
||||||
import org.opencdmp.model.builder.BaseBuilder;
|
import org.opencdmp.model.builder.BaseBuilder;
|
||||||
import org.opencdmp.model.planstatus.PlanStatusDefinition;
|
import org.opencdmp.model.planstatus.PlanStatusDefinition;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
|
||||||
public class PlanStatusDefinitionBuilder extends BaseBuilder<PlanStatusDefinition, PlanStatusDefinitionEntity> {
|
public class PlanStatusDefinitionBuilder extends BaseBuilder<PlanStatusDefinition, PlanStatusDefinitionEntity> {
|
||||||
|
|
||||||
private final BuilderFactory builderFactory;
|
private final BuilderFactory builderFactory;
|
||||||
|
|
Loading…
Reference in New Issue