Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Sort elements before SAX writing

This commit is contained in:
Robert von Burg 2023-06-12 14:28:42 +02:00
parent 625fdfadd7
commit 63bf2faff0
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
model/src/main/java/li/strolch/model/xml/StrolchElementToSaxWriterVisitor.java
View File

@ -15,16 +15,6 @@
*/
package li.strolch.model.xml;
import static li.strolch.model.StrolchModelConstants.INTERPRETATION_NONE;
import static li.strolch.model.StrolchModelConstants.UOM_NONE;
import static li.strolch.utils.helper.StringHelper.isNotEmpty;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import java.text.MessageFormat;
import java.util.*;
import java.util.Map.Entry;
import li.strolch.exception.StrolchException;
import li.strolch.model.*;
import li.strolch.model.activity.Action;
@ -41,6 +31,18 @@ import li.strolch.model.timevalue.IValueChange;
import li.strolch.model.visitor.StrolchRootElementVisitor;
import li.strolch.utils.iso8601.ISO8601;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import java.text.MessageFormat;
import java.util.*;
import java.util.Map.Entry;
import static java.util.Comparator.comparing;
import static java.util.Comparator.comparingInt;
import static li.strolch.model.StrolchModelConstants.INTERPRETATION_NONE;
import static li.strolch.model.StrolchModelConstants.UOM_NONE;
import static li.strolch.utils.helper.StringHelper.isNotEmpty;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@ -98,8 +100,8 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
}
protected void writeElement(Resource resource) throws XMLStreamException {
boolean empty = !resource.hasVersion() && !resource.hasParameterBags() && !resource.hasTimedStates()
&& !resource.hasPolicyDefs();
boolean empty = !resource.hasVersion() && !resource.hasParameterBags() && !resource.hasTimedStates() &&
!resource.hasPolicyDefs();
writeStartStrolchElement(Tags.RESOURCE, empty, resource);
@ -140,8 +142,8 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
}
protected void writeElement(Activity activity) throws XMLStreamException {
boolean empty = !activity.hasVersion() && !activity.hasParameterBags() && !activity.hasElements()
&& !activity.hasPolicyDefs();
boolean empty = !activity.hasVersion() && !activity.hasParameterBags() && !activity.hasElements() &&
!activity.hasPolicyDefs();
writeStartStrolchElement(Tags.ACTIVITY, empty, activity);
this.writer.writeAttribute(Tags.TIME_ORDERING, activity.getTimeOrdering().getName());
@ -220,7 +222,9 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
return;
this.writer.writeStartElement(Tags.POLICIES);
for (String type : policyDefs.getPolicyTypes()) {
List<String> policyTypes = new ArrayList<>(policyDefs.getPolicyTypes());
policyTypes.sort(String::compareTo);
for (String type : policyTypes) {
PolicyDef policyDef = policyDefs.getPolicyDef(type);
this.writer.writeEmptyElement(Tags.POLICY);
@ -232,6 +236,7 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
protected void writeTimedStates(Resource resource) throws XMLStreamException {
List<StrolchTimedState<? extends IValue<?>>> timedStates = resource.getTimedStates();
timedStates.sort(comparing(StrolchTimedState::getId));
for (StrolchTimedState<? extends IValue<?>> timedState : timedStates) {
ITimeVariable<? extends IValue<?>> timeEvolution = timedState.getTimeEvolution();
SortedSet<? extends ITimeValue<? extends IValue<?>>> values = timeEvolution.getValues();
@ -271,7 +276,8 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
}
protected void writeParameterBags(GroupedParameterizedElement element) throws XMLStreamException {
Set<String> bagKeySet = new TreeSet<>(element.getParameterBagKeySet());
Set<String> bagKeySet = new TreeSet<>(String::compareTo);
bagKeySet.addAll(element.getParameterBagKeySet());
for (String bagKey : bagKeySet) {
ParameterBag parameterBag = element.getParameterBag(bagKey);
boolean isEmpty = !parameterBag.hasParameters();
@ -286,7 +292,7 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
protected void writeParameters(ParameterizedElement element) throws XMLStreamException {
List<Parameter<?>> parameters = new ArrayList<>(element.getParameters());
parameters.sort(Comparator.comparingInt(Parameter::getIndex));
parameters.sort(comparingInt(Parameter::getIndex));
for (Parameter<?> parameter : parameters) {
boolean isTextParam = parameter.getValueType() == StrolchValueType.TEXT;
writeStartStrolchElement(Tags.PARAMETER, !isTextParam, parameter);