bump db-model +

- refactors value-conversion to TreeSet into the SOS to avoid messing
with Hibernate entity dirty checking

related to:
52North/sensorweb-server-db-model@fefd765

handler/src/main/java/org/n52/sos/ds/observation/SweAbstractDataComponentCreator.java

@@ -29,6 +29,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.TreeSet;
 
 import org.n52.janmayen.NcName;
 import org.n52.series.db.beans.BlobDataEntity;
@@ -148,7 +149,7 @@ public SweCategory visit(CategoryDataEntity o) throws CodedException {
  public SweDataRecord visit(ComplexDataEntity o)
  throws OwsExceptionReport {
  SweDataRecord record = new SweDataRecord();
- for (DataEntity<?> sub : o.getValue()) {
+ for (DataEntity<?> sub : new TreeSet<>(o.getValue())) {
  String fieldName = getFieldName(sub);
  record.addField(new SweField(fieldName, this.visit(sub)));
  }

handler/src/main/java/org/n52/sos/ds/utils/ResultHandlingHelper.java

@@ -37,6 +37,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
 import org.hibernate.Session;
 import org.joda.time.DateTime;
@@ -166,23 +167,24 @@ private String createResultValuesFromObservations(final Collection<DataEntity<?>
  .next() instanceof TrajectoryDataEntity) {
  size = 0;
  for (DataEntity<?> observation : observations) {
- size += ((TrajectoryDataEntity) observation).getValue()
- .size();
+ size += ((TrajectoryDataEntity) observation).getValue().size();
  }
  }
  addElementCount(builder, size, blockSeparator);
  }
  for (final DataEntity<?> obs : observations) {
  DataEntity<?> observation = unproxy(obs, session);
  if (observation instanceof ProfileDataEntity) {
- builder.append(createResultValuesFromObservations(((ProfileDataEntity) observation).getValue(),
+ TreeSet<DataEntity<?>> val = new TreeSet<>(((ProfileDataEntity) observation).getValue());
+ builder.append(createResultValuesFromObservations(val,
  sosResultEncoding, sosResultStructure, noDataPlaceholder, valueOrder, false,
  ((ProfileDataEntity) observation).getDataset()
  .getVerticalMetadata(),
  session));
  builder.append(blockSeparator);
  } else if (observation instanceof TrajectoryDataEntity) {
- builder.append(createResultValuesFromObservations(((TrajectoryDataEntity) observation).getValue(),
+ TreeSet<DataEntity<?>> val = new TreeSet<>(((TrajectoryDataEntity) observation).getValue());
+ builder.append(createResultValuesFromObservations(val,
  sosResultEncoding, sosResultStructure, noDataPlaceholder, valueOrder, false, null,
  session));
  builder.append(blockSeparator);

pom.xml

@@ -90,7 +90,7 @@
  <version.n52.common.xml>2.7.0</version.n52.common.xml>
  <version.arctic-sea>10.1.1</version.arctic-sea>
  <version.helgoland.api>3.5.1</version.helgoland.api>
- <version.db-model>4.0.1</version.db-model>
+ <version.db-model>4.0.3</version.db-model>
  <version.dao-impl>4.0.5</version.dao-impl>
  <version.helgoland-adapters>2.0.1</version.helgoland-adapters>
  <version.springframework>5.3.24</version.springframework>