Commit bd8f73de authored by Matthias Betz's avatar Matthias Betz
Browse files

quality ade 0.1.4

parent c0df41b0
...@@ -28,15 +28,23 @@ public class ParameterAdapter implements ObjectBuilder<Parameter>, ObjectSeriali ...@@ -28,15 +28,23 @@ public class ParameterAdapter implements ObjectBuilder<Parameter>, ObjectSeriali
} }
@Override @Override
public void buildChildObject(Parameter object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(Parameter object, QName name, Attributes attributes, XMLReader reader)
throws ObjectBuildException, XMLReadException {
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "name" -> reader.getTextContent().ifPresent(object::setName); case "name":
case "uom" -> reader.getTextContent().ifPresent(object::setUom); reader.getTextContent().ifPresent(object::setName);
case "value" -> reader.getTextContent().ifPresent(object::setValue); break;
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Parameter element"); case "uom":
reader.getTextContent().ifPresent(object::setUom);
break;
case "value":
reader.getTextContent().ifPresent(object::setValue);
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building Parameter element");
} }
} }
...@@ -46,7 +54,8 @@ public class ParameterAdapter implements ObjectBuilder<Parameter>, ObjectSeriali ...@@ -46,7 +54,8 @@ public class ParameterAdapter implements ObjectBuilder<Parameter>, ObjectSeriali
} }
@Override @Override
public void writeChildElements(Parameter object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { public void writeChildElements(Parameter object, Namespaces namespaces, XMLWriter writer)
throws ObjectSerializeException, XMLWriteException {
if (object.getName() != null) { if (object.getName() != null) {
writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "name").addTextContent(object.getName())); writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "name").addTextContent(object.getName()));
} }
......
...@@ -33,9 +33,14 @@ public class PlanarDistancePlaneErrorAdapter extends AbstractPolygonErrorAdapter ...@@ -33,9 +33,14 @@ public class PlanarDistancePlaneErrorAdapter extends AbstractPolygonErrorAdapter
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "vertex" -> object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); case "vertex":
case "distance" -> object.setDistance(reader.getObjectUsingBuilder(LengthAdapter.class)); object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
default -> super.buildChildObject(object, name, attributes, reader); break;
case "distance":
object.setDistance(reader.getObjectUsingBuilder(LengthAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -32,8 +32,11 @@ public class PlanarNormalsDeviationErrorAdapter extends AbstractPolygonErrorAdap ...@@ -32,8 +32,11 @@ public class PlanarNormalsDeviationErrorAdapter extends AbstractPolygonErrorAdap
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "deviation" -> object.setDeviation(reader.getObjectUsingBuilder(AngleAdapter.class)); case "deviation":
default -> super.buildChildObject(object, name, attributes, reader); object.setDeviation(reader.getObjectUsingBuilder(AngleAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -34,9 +34,11 @@ public class PolygonIdListAdapter implements ObjectBuilder<PolygonIdList>, Objec ...@@ -34,9 +34,11 @@ public class PolygonIdListAdapter implements ObjectBuilder<PolygonIdList>, Objec
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "polygonId" -> object.getPolygonIds().add(reader.getTextContent().get()); case "polygonId":
default -> throw new IllegalStateException( object.getPolygonIds().add(reader.getTextContent().get());
"Cannot handle name " + name + " when building PolygonIdList element"); break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building PolygonIdList element");
} }
} }
......
...@@ -32,8 +32,11 @@ public class PolygonWrongOrientationErrorAdapter extends AbstractSolidErrorAdapt ...@@ -32,8 +32,11 @@ public class PolygonWrongOrientationErrorAdapter extends AbstractSolidErrorAdapt
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "edges" -> object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); case "edges":
default -> super.buildChildObject(object, name, attributes, reader); object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -37,10 +37,17 @@ public class RequirementAdapter implements ObjectBuilder<Requirement>, ObjectSer ...@@ -37,10 +37,17 @@ public class RequirementAdapter implements ObjectBuilder<Requirement>, ObjectSer
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "enabled" -> reader.getTextContent().ifPresent(s -> object.setEnabled(Boolean.parseBoolean(s))); case "enabled":
case "requirementType" -> object.setRequirementType(RequirementId.valueOf(reader.getTextContent().get())); reader.getTextContent().ifPresent(s -> object.setEnabled(Boolean.parseBoolean(s)));
case "parameter" -> object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class)); break;
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Requirement element"); case "requirementType":
object.setRequirementType(RequirementId.valueOf(reader.getTextContent().get()));
break;
case "parameter":
object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building Requirement element");
} }
} }
......
...@@ -34,12 +34,23 @@ public class RingSelfIntersectionErrorAdapter extends AbstractRingErrorAdapter<R ...@@ -34,12 +34,23 @@ public class RingSelfIntersectionErrorAdapter extends AbstractRingErrorAdapter<R
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "type" -> reader.getTextContent().ifPresent(s -> object.setType(RingSelfIntType.valueOf(s))); case "type":
case "edge1" -> object.setEdge1(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); reader.getTextContent().ifPresent(s -> object.setType(RingSelfIntType.valueOf(s)));
case "edge2" -> object.setEdge2(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); break;
case "vertex1" -> object.setVertex1(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); case "edge1":
case "vertex2" -> object.setVertex2(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); object.setEdge1(reader.getObjectUsingBuilder(EdgePropertyAdapter.class));
default -> super.buildChildObject(object, name, attributes, reader); break;
case "edge2":
object.setEdge2(reader.getObjectUsingBuilder(EdgePropertyAdapter.class));
break;
case "vertex1":
object.setVertex1(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
break;
case "vertex2":
object.setVertex2(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -31,10 +31,17 @@ public class SemanticAttributeMissingErrorAdapter extends AbstractSemanticErrorA ...@@ -31,10 +31,17 @@ public class SemanticAttributeMissingErrorAdapter extends AbstractSemanticErrorA
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "childId" -> reader.getTextContent().ifPresent(object::setChildId); case "childId":
case "attributeName" -> reader.getTextContent().ifPresent(object::setAttributeName); reader.getTextContent().ifPresent(object::setChildId);
case "generic" -> reader.getTextContent().ifPresent(s -> object.setGeneric(Boolean.parseBoolean(s))); break;
default -> throw new IllegalStateException( case "attributeName":
reader.getTextContent().ifPresent(object::setAttributeName);
break;
case "generic":
reader.getTextContent().ifPresent(s -> object.setGeneric(Boolean.parseBoolean(s)));
break;
default:
throw new IllegalStateException(
"Cannot handle name " + name + " when building SemanticAttributeMissingError element"); "Cannot handle name " + name + " when building SemanticAttributeMissingError element");
} }
} }
......
...@@ -32,10 +32,17 @@ public class SemanticAttributeWrongValueErrorAdapter ...@@ -32,10 +32,17 @@ public class SemanticAttributeWrongValueErrorAdapter
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "childId" -> reader.getTextContent().ifPresent(object::setChildId); case "childId":
case "attributeName" -> reader.getTextContent().ifPresent(object::setAttributeName); reader.getTextContent().ifPresent(object::setChildId);
case "generic" -> reader.getTextContent().ifPresent(s -> object.setGeneric(Boolean.parseBoolean(s))); break;
default -> throw new IllegalStateException( case "attributeName":
reader.getTextContent().ifPresent(object::setAttributeName);
break;
case "generic":
reader.getTextContent().ifPresent(s -> object.setGeneric(Boolean.parseBoolean(s)));
break;
default:
throw new IllegalStateException(
"Cannot handle name " + name + " when building SemanticAttributeWrongValueError element"); "Cannot handle name " + name + " when building SemanticAttributeWrongValueError element");
} }
} }
......
...@@ -32,8 +32,11 @@ public class SolidNotClosedErrorAdapter extends AbstractSolidErrorAdapter<SolidN ...@@ -32,8 +32,11 @@ public class SolidNotClosedErrorAdapter extends AbstractSolidErrorAdapter<SolidN
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "edges" -> object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); case "edges":
default -> super.buildChildObject(object, name, attributes, reader); object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -31,10 +31,14 @@ public class SolidSelfIntersectionErrorAdapter extends AbstractSolidErrorAdapter ...@@ -31,10 +31,14 @@ public class SolidSelfIntersectionErrorAdapter extends AbstractSolidErrorAdapter
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "polygonId1" -> reader.getTextContent().ifPresent(object::setPolygonId1); case "polygonId1":
case "polygonId2" -> reader.getTextContent().ifPresent(object::setPolygonId2); reader.getTextContent().ifPresent(object::setPolygonId1);
break;
default -> super.buildChildObject(object, name, attributes, reader); case "polygonId2":
reader.getTextContent().ifPresent(object::setPolygonId2);
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -36,20 +36,29 @@ public class StatisticsAdapter implements ObjectBuilder<Statistics>, ObjectSeria ...@@ -36,20 +36,29 @@ public class StatisticsAdapter implements ObjectBuilder<Statistics>, ObjectSeria
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "numErrorBuildings" -> object case "numErrorBuildings":
.setNumErrorBuildings(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); object.setNumErrorBuildings(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class));
case "numErrorVegetation" -> object break;
.setNumErrorVegetation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); case "numErrorVegetation":
case "numErrorLandObjects" -> object object.setNumErrorVegetation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class));
.setNumErrorLandObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); break;
case "numErrorBridgeObjects" -> object case "numErrorLandObjects":
.setNumErrorBridgeObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); object.setNumErrorLandObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class));
case "numErrorWaterObjects" -> object break;
.setNumErrorWaterObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); case "numErrorBridgeObjects":
case "numErrorTransportation" -> object object.setNumErrorBridgeObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class));
.setNumErrorTransportation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); break;
case "error" -> object.getErrors().add(reader.getObjectUsingBuilder(ErrorPropertyAdapter.class)); case "numErrorWaterObjects":
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Statistics element"); object.setNumErrorWaterObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class));
break;
case "numErrorTransportation":
object.setNumErrorTransportation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class));
break;
case "error":
object.getErrors().add(reader.getObjectUsingBuilder(ErrorPropertyAdapter.class));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building Statistics element");
} }
} }
......
...@@ -36,13 +36,20 @@ public class ValidationAdapter extends AbstractFeatureAdapter<Validation> { ...@@ -36,13 +36,20 @@ public class ValidationAdapter extends AbstractFeatureAdapter<Validation> {
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "validationDate" -> reader.getTextContent() case "validationDate":
.ifPresent(s -> object.setValidationDate(DATE_TIME_ADAPTER.fromString(s))); reader.getTextContent().ifPresent(s -> object.setValidationDate(DATE_TIME_ADAPTER.fromString(s)));
case "validationSoftware" -> reader.getTextContent().ifPresent(object::setValidationSoftware); break;
case "statistics" -> object.setStatistics(reader.getObjectUsingBuilder(StatisticsPropertyAdapter.class)); case "validationSoftware":
case "validationPlan" -> object reader.getTextContent().ifPresent(object::setValidationSoftware);
.setValidationPlan(reader.getObjectUsingBuilder(ValidationPlanPropertyAdapter.class)); break;
default -> super.buildChildObject(object, name, attributes, reader); case "statistics":
object.setStatistics(reader.getObjectUsingBuilder(StatisticsPropertyAdapter.class));
break;
case "validationPlan":
object.setValidationPlan(reader.getObjectUsingBuilder(ValidationPlanPropertyAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -37,13 +37,17 @@ public class ValidationPlanAdapter implements ObjectBuilder<ValidationPlan>, Obj ...@@ -37,13 +37,17 @@ public class ValidationPlanAdapter implements ObjectBuilder<ValidationPlan>, Obj
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "globalParameters" -> object case "globalParameters":
.setGlobalParameters(reader.getObjectUsingBuilder(GlobalParametersPropertyAdapter.class)); object.setGlobalParameters(reader.getObjectUsingBuilder(GlobalParametersPropertyAdapter.class));
case "filter" -> object.setFilter(reader.getObjectUsingBuilder(FilterPropertyAdapter.class)); break;
case "requirement" -> object.getRequirements() case "filter":
.add(reader.getObjectUsingBuilder(RequirementPropertyAdapter.class)); object.setFilter(reader.getObjectUsingBuilder(FilterPropertyAdapter.class));
default -> throw new IllegalStateException( break;
"Cannot handle name " + name + " when building ValidationPlan element"); case "requirement":
object.getRequirements().add(reader.getObjectUsingBuilder(RequirementPropertyAdapter.class));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building ValidationPlan element");
} }
} }
......
...@@ -37,11 +37,17 @@ public class ValidationResultAdapter implements ObjectBuilder<ValidationResult>, ...@@ -37,11 +37,17 @@ public class ValidationResultAdapter implements ObjectBuilder<ValidationResult>,
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "validationPlanID" -> object.setValidationPlanID(reader.getObjectUsingBuilder(ReferenceAdapter.class)); case "validationPlanID":
case "error" -> object.getErrors().add(reader.getObjectUsingBuilder(AbstractErrorPropertyAdapter.class)); object.setValidationPlanID(reader.getObjectUsingBuilder(ReferenceAdapter.class));
case "resultType" -> reader.getTextContent().ifPresent(s -> object.setResultType(ResultType.valueOf(s))); break;
default -> throw new IllegalStateException( case "error":
"Cannot handle name " + name + " when building ValidationResult element"); object.getErrors().add(reader.getObjectUsingBuilder(AbstractErrorPropertyAdapter.class));
break;
case "resultType":
reader.getTextContent().ifPresent(s -> object.setResultType(ResultType.valueOf(s)));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building ValidationResult element");
} }
} }
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package de.hft.stuttgart.quality.model.properties; package de.hft.stuttgart.quality.model.properties;
import java.io.Serial;
import org.citygml4j.core.model.ade.ADEObject; import org.citygml4j.core.model.ade.ADEObject;
import org.xmlobjects.gml.model.base.AbstractInlineProperty; import org.xmlobjects.gml.model.base.AbstractInlineProperty;
...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractError; ...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractError;
public class AbstractErrorProperty extends AbstractInlineProperty<AbstractError> implements ADEObject { public class AbstractErrorProperty extends AbstractInlineProperty<AbstractError> implements ADEObject {
@Serial
private static final long serialVersionUID = 1411862623125946009L; private static final long serialVersionUID = 1411862623125946009L;
public AbstractErrorProperty() { public AbstractErrorProperty() {
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package de.hft.stuttgart.quality.model.properties; package de.hft.stuttgart.quality.model.properties;
import java.io.Serial;
import org.citygml4j.core.model.ade.ADEObject; import org.citygml4j.core.model.ade.ADEObject;
import org.xmlobjects.gml.model.base.AbstractInlineProperty; import org.xmlobjects.gml.model.base.AbstractInlineProperty;
...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractGeometryError; ...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractGeometryError;
public class AbstractGeometryErrorProperty extends AbstractInlineProperty<AbstractGeometryError> implements ADEObject { public class AbstractGeometryErrorProperty extends AbstractInlineProperty<AbstractGeometryError> implements ADEObject {
@Serial
private static final long serialVersionUID = 7034671234592671680L; private static final long serialVersionUID = 7034671234592671680L;
public AbstractGeometryErrorProperty() { public AbstractGeometryErrorProperty() {
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
package de.hft.stuttgart.quality.model.properties; package de.hft.stuttgart.quality.model.properties;
import java.io.Serial;
import org.citygml4j.core.model.ade.ADEObject; import org.citygml4j.core.model.ade.ADEObject;
import org.xmlobjects.gml.model.base.AbstractInlineProperty; import org.xmlobjects.gml.model.base.AbstractInlineProperty;
...@@ -24,7 +23,6 @@ import de.hft.stuttgart.quality.model.types.AbstractPolygonError; ...@@ -24,7 +23,6 @@ import de.hft.stuttgart.quality.model.types.AbstractPolygonError;
public class AbstractPolygonErrorProperty extends AbstractInlineProperty<AbstractPolygonError> implements ADEObject { public class AbstractPolygonErrorProperty extends AbstractInlineProperty<AbstractPolygonError> implements ADEObject {
@Serial
private static final long serialVersionUID = 70692012962059529L; private static final long serialVersionUID = 70692012962059529L;
public AbstractPolygonErrorProperty() { public AbstractPolygonErrorProperty() {
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package de.hft.stuttgart.quality.model.properties; package de.hft.stuttgart.quality.model.properties;
import java.io.Serial;
import org.citygml4j.core.model.ade.ADEObject; import org.citygml4j.core.model.ade.ADEObject;
import org.xmlobjects.gml.model.base.AbstractInlineProperty; import org.xmlobjects.gml.model.base.AbstractInlineProperty;
...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractRingError; ...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractRingError;
public class AbstractRingErrorProperty extends AbstractInlineProperty<AbstractRingError> implements ADEObject { public class AbstractRingErrorProperty extends AbstractInlineProperty<AbstractRingError> implements ADEObject {
@Serial
private static final long serialVersionUID = 6934180997181643185L; private static final long serialVersionUID = 6934180997181643185L;
public AbstractRingErrorProperty() { public AbstractRingErrorProperty() {
......
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package de.hft.stuttgart.quality.model.properties; package de.hft.stuttgart.quality.model.properties;
import java.io.Serial;
import org.citygml4j.core.model.ade.ADEObject; import org.citygml4j.core.model.ade.ADEObject;
import org.xmlobjects.gml.model.base.AbstractInlineProperty; import org.xmlobjects.gml.model.base.AbstractInlineProperty;
...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractSemanticError; ...@@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.AbstractSemanticError;
public class AbstractSemanticErrorProperty extends AbstractInlineProperty<AbstractSemanticError> implements ADEObject { public class AbstractSemanticErrorProperty extends AbstractInlineProperty<AbstractSemanticError> implements ADEObject {
@Serial
private static final long serialVersionUID = 8488922114751949334L; private static final long serialVersionUID = 8488922114751949334L;
public AbstractSemanticErrorProperty() { public AbstractSemanticErrorProperty() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment