[Major] Fixed builder methods with unclear names
This commit is contained in:
parent
f4162541be
commit
13dcc0fac6
|
@ -37,7 +37,7 @@ public class ActionBuilder extends PolicyContainerBuilder<ActionBuilder> impleme
|
|||
Action action = new Action(getId(), getName(), getType());
|
||||
action.setResourceId(this.resourceId);
|
||||
action.setResourceType(this.resourceType);
|
||||
build((PolicyContainer) action);
|
||||
applyPolicyContainer(action);
|
||||
return action;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -66,7 +66,7 @@ public class ActivityBuilder extends RootElementBuilder<ActivityBuilder> impleme
|
|||
@Override
|
||||
public Activity build() {
|
||||
Activity activity = new Activity(getId(), getName(), getType(), this.timeOrdering);
|
||||
super.build(activity);
|
||||
super.applyRootElement(activity);
|
||||
|
||||
this.builders.forEach(b -> activity.addElement(b.build()));
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ public class BagBuilder<T extends ParameterBagContainerBuilder<T>> {
|
|||
return this.builder;
|
||||
}
|
||||
|
||||
public void build(ParameterBagContainer element) {
|
||||
public void applyBag(ParameterBagContainer element) {
|
||||
ParameterBag bag = new ParameterBag(this.id, this.name, this.type);
|
||||
this.parameters.forEach(b -> bag.addParameter(b.build()));
|
||||
element.addParameterBag(bag);
|
||||
|
|
|
@ -27,7 +27,7 @@ public class OrderBuilder extends RootElementBuilder<OrderBuilder> {
|
|||
@Override
|
||||
public Order build() {
|
||||
Order order = new Order(getId(), getName(), getType());
|
||||
super.build(order);
|
||||
super.applyRootElement(order);
|
||||
order.setDate(ISO8601.EMPTY_VALUE_ZONED_DATE);
|
||||
order.setState(State.CREATED);
|
||||
return order;
|
||||
|
|
|
@ -143,9 +143,9 @@ public abstract class ParameterBagContainerBuilder<T extends ParameterBagContain
|
|||
throw new IllegalStateException("Mapping already exists for " + paramId);
|
||||
}
|
||||
|
||||
protected void build(ParameterBagContainer element) {
|
||||
protected void applyParameters(ParameterBagContainer element) {
|
||||
|
||||
this.parametersBags.values().forEach(bagBuilder -> bagBuilder.build(element));
|
||||
this.parametersBags.values().forEach(bagBuilder -> bagBuilder.applyBag(element));
|
||||
|
||||
this.singleRelations.forEach((paramId, keys) -> {
|
||||
ParameterBag relationsBag = getRelationsBag(element);
|
||||
|
|
|
@ -20,8 +20,8 @@ public class PolicyContainerBuilder<T extends ParameterBagContainerBuilder<T>> e
|
|||
return policies;
|
||||
}
|
||||
|
||||
protected void build(PolicyContainer element) {
|
||||
build((ParameterBagContainer) element);
|
||||
protected void applyPolicyContainer(PolicyContainer element) {
|
||||
applyParameters((ParameterBagContainer) element);
|
||||
|
||||
if (this.policies != null)
|
||||
this.policies.build(element);
|
||||
|
|
|
@ -74,7 +74,7 @@ public class ResourceBuilder extends RootElementBuilder<ResourceBuilder> {
|
|||
@Override
|
||||
public Resource build() {
|
||||
Resource resource = new Resource(getId(), getName(), getType());
|
||||
super.build(resource);
|
||||
super.applyRootElement(resource);
|
||||
this.timedStates.forEach(b -> resource.addTimedState(b.build()));
|
||||
return resource;
|
||||
}
|
||||
|
|
|
@ -9,8 +9,8 @@ public abstract class RootElementBuilder<T extends ParameterBagContainerBuilder<
|
|||
super(id, name, type);
|
||||
}
|
||||
|
||||
protected void build(StrolchRootElement element) {
|
||||
build((PolicyContainer) element);
|
||||
protected void applyRootElement(StrolchRootElement element) {
|
||||
applyPolicyContainer(element);
|
||||
}
|
||||
|
||||
public abstract StrolchRootElement build();
|
||||
|
|
|
@ -13,6 +13,6 @@ public class BooleanParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public BooleanParameter build() {
|
||||
return build(new BooleanParameter());
|
||||
return applyParameter(new BooleanParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ public class DateParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
@Override
|
||||
public DateParameter build() {
|
||||
DateParameter parameter = new DateParameter();
|
||||
build(parameter);
|
||||
applyParameter(parameter);
|
||||
if (this.valueZdt != null)
|
||||
parameter.setValueFromZonedDateTime(this.valueZdt);
|
||||
if (this.valueLdt != null)
|
||||
|
|
|
@ -14,6 +14,6 @@ public class DurationParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public DurationParameter build() {
|
||||
return build(new DurationParameter());
|
||||
return applyParameter(new DurationParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,6 +15,6 @@ public class FloatListParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public FloatListParameter build() {
|
||||
return build(new FloatListParameter());
|
||||
return applyParameter(new FloatListParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,6 @@ public class FloatParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public FloatParameter build() {
|
||||
return build(new FloatParameter());
|
||||
return applyParameter(new FloatParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,6 +15,6 @@ public class IntegerListParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public IntegerListParameter build() {
|
||||
return build(new IntegerListParameter());
|
||||
return applyParameter(new IntegerListParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,6 @@ public class IntegerParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public IntegerParameter build() {
|
||||
return build(new IntegerParameter());
|
||||
return applyParameter(new IntegerParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,6 +15,6 @@ public class LongListParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public LongListParameter build() {
|
||||
return build(new LongListParameter());
|
||||
return applyParameter(new LongListParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,6 @@ public class LongParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public LongParameter build() {
|
||||
return build(new LongParameter());
|
||||
return applyParameter(new LongParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ public abstract class ParameterBuilder<R, S extends Parameter<R>, T extends Para
|
|||
return this.builder;
|
||||
}
|
||||
|
||||
protected S build(S parameter) {
|
||||
protected S applyParameter(S parameter) {
|
||||
parameter.setId(this.id);
|
||||
parameter.setName(this.name);
|
||||
parameter.setHidden(this.hidden);
|
||||
|
|
|
@ -35,6 +35,6 @@ public class StringListParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public StringListParameter build() {
|
||||
return build(new StringListParameter());
|
||||
return applyParameter(new StringListParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,6 +40,6 @@ public class StringParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public StringParameter build() {
|
||||
return build(new StringParameter());
|
||||
return applyParameter(new StringParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,6 @@ public class TextParamBuilder<T extends ParameterBagContainerBuilder<T>>
|
|||
|
||||
@Override
|
||||
public TextParameter build() {
|
||||
return build(new TextParameter());
|
||||
return applyParameter(new TextParameter());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ public class BooleanStateBuilder extends TimedStateBuilder<BooleanTimedState> {
|
|||
@Override
|
||||
public BooleanTimedState build() {
|
||||
BooleanTimedState state = new BooleanTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new BooleanValue(false));
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ public class FloatListStateBuilder extends TimedStateBuilder<FloatListTimedState
|
|||
@Override
|
||||
public FloatListTimedState build() {
|
||||
FloatListTimedState state = new FloatListTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new FloatListValue());
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ public class FloatStateBuilder extends TimedStateBuilder<FloatTimedState> {
|
|||
@Override
|
||||
public FloatTimedState build() {
|
||||
FloatTimedState state = new FloatTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new FloatValue(0.0D));
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ public class IntegerListStateBuilder extends TimedStateBuilder<IntegerListTimedS
|
|||
@Override
|
||||
public IntegerListTimedState build() {
|
||||
IntegerListTimedState state = new IntegerListTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new IntegerListValue());
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ public class IntegerStateBuilder extends TimedStateBuilder<IntegerTimedState> {
|
|||
@Override
|
||||
public IntegerTimedState build() {
|
||||
IntegerTimedState state = new IntegerTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new IntegerValue(0));
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ public class LongStateBuilder extends TimedStateBuilder<LongTimedState> {
|
|||
@Override
|
||||
public LongTimedState build() {
|
||||
LongTimedState state = new LongTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new LongValue(0L));
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ public class StringSetStateBuilder extends TimedStateBuilder<StringSetTimedState
|
|||
@Override
|
||||
public StringSetTimedState build() {
|
||||
StringSetTimedState state = new StringSetTimedState();
|
||||
build(state);
|
||||
applyTimedState(state);
|
||||
state.getTimeEvolution().setValueAt(0L, new StringSetValue(emptySet()));
|
||||
return state;
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ public abstract class TimedStateBuilder<T extends StrolchTimedState<?>> {
|
|||
|
||||
public abstract T build();
|
||||
|
||||
protected T build(T state) {
|
||||
protected T applyTimedState(T state) {
|
||||
state.setId(this.id);
|
||||
state.setName(this.name);
|
||||
state.setHidden(this.hidden);
|
||||
|
|
Loading…
Reference in New Issue