From bd8f73de82527c6b8638263030d901df2758c98c Mon Sep 17 00:00:00 2001 From: Matthias Betz Date: Fri, 11 Nov 2022 14:42:28 +0100 Subject: [PATCH] quality ade 0.1.4 --- citygml4j-quality-ade/pom.xml | 4 +- .../types/AbstractPolygonErrorAdapter.java | 42 +- .../types/AbstractRingErrorAdapter.java | 37 +- .../types/AbstractSolidErrorAdapter.java | 38 +- .../adapter/types/CheckingAdapter.java | 8 +- .../types/CityObjectPropertiesAdapter.java | 50 +- .../ConsecutivePointsSameErrorAdapter.java | 13 +- .../quality/adapter/types/EdgeAdapter.java | 71 +- .../adapter/types/EdgeListAdapter.java | 12 +- .../quality/adapter/types/ErrorAdapter.java | 13 +- .../types/FeatureStatisticsAdapter.java | 14 +- .../quality/adapter/types/FilterAdapter.java | 7 +- .../types/GlobalParametersAdapter.java | 8 +- .../types/HoleOutsideErrorAdapter.java | 11 +- .../types/InnerRingsNestedErrorAdapter.java | 11 +- .../types/IntersectingRingsErrorAdapter.java | 15 +- .../types/MultipleComponentsErrorAdapter.java | 7 +- .../types/NonManifoldEdgeErrorAdapter.java | 7 +- .../types/NonManifoldVertexErrorAdapter.java | 62 +- .../OrientationRingsSameErrorAdapter.java | 9 +- .../adapter/types/ParameterAdapter.java | 79 ++- .../PlanarDistancePlaneErrorAdapter.java | 11 +- .../PlanarNormalsDeviationErrorAdapter.java | 7 +- .../adapter/types/PolygonIdListAdapter.java | 10 +- .../PolygonWrongOrientationErrorAdapter.java | 7 +- .../adapter/types/RequirementAdapter.java | 15 +- .../RingSelfIntersectionErrorAdapter.java | 23 +- .../SemanticAttributeMissingErrorAdapter.java | 19 +- ...manticAttributeWrongValueErrorAdapter.java | 19 +- .../types/SolidNotClosedErrorAdapter.java | 7 +- .../SolidSelfIntersectionErrorAdapter.java | 12 +- .../adapter/types/StatisticsAdapter.java | 37 +- .../adapter/types/ValidationAdapter.java | 25 +- .../adapter/types/ValidationPlanAdapter.java | 20 +- .../types/ValidationResultAdapter.java | 18 +- .../properties/AbstractErrorProperty.java | 25 +- .../AbstractGeometryErrorProperty.java | 25 +- .../AbstractPolygonErrorProperty.java | 2 - .../properties/AbstractRingErrorProperty.java | 25 +- .../AbstractSemanticErrorProperty.java | 25 +- .../AbstractSolidErrorProperty.java | 25 +- .../model/properties/CheckingProperty.java | 25 +- .../model/properties/EdgeListProperty.java | 25 +- .../model/properties/EdgeProperty.java | 25 +- .../model/properties/ErrorProperty.java | 25 +- .../properties/FeatureStatisticsProperty.java | 25 +- .../model/properties/FilterProperty.java | 25 +- .../properties/GlobalParametersProperty.java | 25 +- .../model/properties/ParameterProperty.java | 25 +- .../properties/PolygonIdListProperty.java | 25 +- .../model/properties/RequirementProperty.java | 2 - .../model/properties/StatisticsProperty.java | 3 - .../properties/ValidationPlanProperty.java | 25 +- .../model/properties/ValidationProperty.java | 32 +- .../properties/ValidationResultProperty.java | 31 +- .../quality/model/types/AbstractError.java | 2 - .../model/types/AbstractGeometryError.java | 17 +- .../model/types/AbstractPolygonError.java | 9 +- .../model/types/AbstractRingError.java | 11 +- .../model/types/AbstractSemanticError.java | 3 - .../model/types/AbstractSolidError.java | 3 - .../types/AllPolygonsOrientedWrongError.java | 17 +- .../quality/model/types/Checking.java | 9 +- .../model/types/CityObjectProperties.java | 19 +- .../types/ConsecutivePointsSameError.java | 5 +- .../stuttgart/quality/model/types/Edge.java | 3 - .../quality/model/types/EdgeList.java | 8 +- .../stuttgart/quality/model/types/Error.java | 3 - .../model/types/FeatureStatistics.java | 5 +- .../stuttgart/quality/model/types/Filter.java | 2 - .../quality/model/types/GlobalParameters.java | 2 - .../quality/model/types/HoleOutsideError.java | 5 +- .../model/types/InnerRingsNestedError.java | 5 +- .../types/InteriorDisconnectedError.java | 8 +- .../model/types/IntersectingRingsError.java | 5 +- .../model/types/MultipleComponentsError.java | 4 +- .../model/types/NonManifoldEdgeError.java | 5 +- .../model/types/NonManifoldVertexError.java | 9 +- .../types/OrientationRingsSameError.java | 5 +- .../quality/model/types/Parameter.java | 3 - .../model/types/PlanarDistancePlaneError.java | 5 +- .../types/PlanarNormalsDeviationError.java | 5 +- .../quality/model/types/PolygonIdList.java | 8 +- .../types/PolygonWrongOrientationError.java | 5 +- .../quality/model/types/Requirement.java | 2 - .../model/types/RingNotClosedError.java | 2 - .../types/RingSelfIntersectionError.java | 2 - .../model/types/RingTooFewPointsError.java | 9 +- .../types/SemanticAttributeMissingError.java | 5 +- .../SemanticAttributeWrongValueError.java | 8 +- .../model/types/SolidNotClosedError.java | 5 +- .../types/SolidSelfIntersectionError.java | 5 +- .../model/types/SolidTooFewPolygonsError.java | 7 +- .../quality/model/types/Statistics.java | 18 +- .../quality/model/types/Validation.java | 2 - .../quality/model/types/ValidationPlan.java | 2 - .../quality/model/types/ValidationResult.java | 2 - public/0.1.4/qualityAde.xsd | 658 ++++++++++++++++++ 98 files changed, 1387 insertions(+), 723 deletions(-) create mode 100644 public/0.1.4/qualityAde.xsd diff --git a/citygml4j-quality-ade/pom.xml b/citygml4j-quality-ade/pom.xml index a03fbca..64d7909 100644 --- a/citygml4j-quality-ade/pom.xml +++ b/citygml4j-quality-ade/pom.xml @@ -8,8 +8,8 @@ UTF-8 - 17 - 17 + 11 + 11 diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractPolygonErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractPolygonErrorAdapter.java index de1d806..dbdcc9e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractPolygonErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractPolygonErrorAdapter.java @@ -15,23 +15,31 @@ import org.xmlobjects.xml.Namespaces; import de.hft.stuttgart.quality.QualityADEModule; import de.hft.stuttgart.quality.model.types.AbstractPolygonError; -public abstract class AbstractPolygonErrorAdapter extends AbstractGeometryErrorAdapter { +public abstract class AbstractPolygonErrorAdapter + extends AbstractGeometryErrorAdapter { - @Override - public void buildChildObject(AbstractPolygonError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "polygonId" -> reader.getTextContent().ifPresent(object::setPolygonId); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building AbstractPolygonError element"); - } - } + @Override + public void buildChildObject(AbstractPolygonError object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "polygonId": + reader.getTextContent().ifPresent(object::setPolygonId); + break; + default: + throw new IllegalStateException( + "Cannot handle name " + name + " when building AbstractPolygonError element"); + } + } - @Override - public void writeChildElements(AbstractPolygonError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - if (object.getPolygonId() != null) { - writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "polygonId").addTextContent(object.getPolygonId())); - } - } + @Override + public void writeChildElements(AbstractPolygonError object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + if (object.getPolygonId() != null) { + writer.writeElement( + Element.of(QualityADEModule.NAMESPACE_URI, "polygonId").addTextContent(object.getPolygonId())); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractRingErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractRingErrorAdapter.java index a72c626..ae355bc 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractRingErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractRingErrorAdapter.java @@ -15,22 +15,27 @@ import org.xmlobjects.xml.Namespaces; import de.hft.stuttgart.quality.QualityADEModule; import de.hft.stuttgart.quality.model.types.AbstractRingError; -public abstract class AbstractRingErrorAdapter extends AbstractGeometryErrorAdapter { +public abstract class AbstractRingErrorAdapter extends AbstractGeometryErrorAdapter { - @Override - public void buildChildObject(AbstractRingError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "linearRingId" -> reader.getTextContent().ifPresent(object::setLinearRingId); - } - } + @Override + public void buildChildObject(AbstractRingError object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "linearRingId": + reader.getTextContent().ifPresent(object::setLinearRingId); + break; + } + } - @Override - public void writeChildElements(AbstractRingError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - if (object.getLinearRingId() != null) { - writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId").addTextContent(object.getLinearRingId())); - } - } + @Override + public void writeChildElements(AbstractRingError object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + if (object.getLinearRingId() != null) { + writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId") + .addTextContent(object.getLinearRingId())); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractSolidErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractSolidErrorAdapter.java index e7255e8..41171ca 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractSolidErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/AbstractSolidErrorAdapter.java @@ -17,21 +17,27 @@ import de.hft.stuttgart.quality.model.types.AbstractSolidError; public abstract class AbstractSolidErrorAdapter extends AbstractGeometryErrorAdapter { - @Override - public void buildChildObject(AbstractSolidError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "geometryId" -> reader.getTextContent().ifPresent(object::setGeometryId); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building AbstractSolidError element"); - } - } + @Override + public void buildChildObject(AbstractSolidError object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "geometryId": + reader.getTextContent().ifPresent(object::setGeometryId); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building AbstractSolidError element"); + } + } - @Override - public void writeChildElements(AbstractSolidError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - if (object.getGeometryId() != null) { - writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "geometryId").addTextContent(object.getGeometryId())); - } - } + @Override + public void writeChildElements(AbstractSolidError object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + if (object.getGeometryId() != null) { + writer.writeElement( + Element.of(QualityADEModule.NAMESPACE_URI, "geometryId").addTextContent(object.getGeometryId())); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CheckingAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CheckingAdapter.java index 7926131..a9af100 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CheckingAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CheckingAdapter.java @@ -35,9 +35,11 @@ public class CheckingAdapter implements ObjectBuilder, ObjectSerialize return; } switch (name.getLocalPart()) { - case "featureType" -> reader.getTextContent() - .ifPresent(s -> object.setFeatureType(TopLevelFeatureType.valueOf(s))); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Checking element"); + case "featureType": + reader.getTextContent().ifPresent(s -> object.setFeatureType(TopLevelFeatureType.valueOf(s))); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building Checking element"); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CityObjectPropertiesAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CityObjectPropertiesAdapter.java index a67e63e..f981bc5 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CityObjectPropertiesAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/CityObjectPropertiesAdapter.java @@ -20,28 +20,36 @@ import de.hft.stuttgart.quality.adapter.properties.ValidationResultPropertyAdapt import de.hft.stuttgart.quality.model.types.CityObjectProperties; @XMLElement(name = "validationResult", namespaceURI = QualityADEModule.NAMESPACE_URI) -public class CityObjectPropertiesAdapter implements ObjectBuilder, ObjectSerializer { +public class CityObjectPropertiesAdapter + implements ObjectBuilder, ObjectSerializer { - @Override - public CityObjectProperties createObject(QName name, Object parent) throws ObjectBuildException { - return new CityObjectProperties(); - } + @Override + public CityObjectProperties createObject(QName name, Object parent) throws ObjectBuildException { + return new CityObjectProperties(); + } - @Override - public void buildChildObject(CityObjectProperties object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "ValidationResult" -> object.setValidationResult(reader.getObjectUsingBuilder(ValidationResultPropertyAdapter.class)); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building CityObjectProperties element"); - } - } + @Override + public void buildChildObject(CityObjectProperties object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "ValidationResult": + object.setValidationResult(reader.getObjectUsingBuilder(ValidationResultPropertyAdapter.class)); + break; + default: + throw new IllegalStateException( + "Cannot handle name " + name + " when building CityObjectProperties element"); + } + } - @Override - public void writeChildElements(CityObjectProperties object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - if (object.getValidationResult() != null) { - writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "validationResult"), object.getValidationResult(), ValidationResultPropertyAdapter.class, namespaces); - } - } + @Override + public void writeChildElements(CityObjectProperties object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + if (object.getValidationResult() != null) { + writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "validationResult"), + object.getValidationResult(), ValidationResultPropertyAdapter.class, namespaces); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ConsecutivePointsSameErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ConsecutivePointsSameErrorAdapter.java index 36c407a..9f923fb 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ConsecutivePointsSameErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ConsecutivePointsSameErrorAdapter.java @@ -32,12 +32,17 @@ public class ConsecutivePointsSameErrorAdapter extends AbstractRingErrorAdapter< return; } switch (name.getLocalPart()) { - case "vertex1" -> object.setVertex1(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - case "vertex2" -> object.setVertex2(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + 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); } } - + @Override public Element createElement(ConsecutivePointsSameError object, Namespaces namespaces) throws ObjectSerializeException { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeAdapter.java index 0558c40..285418c 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeAdapter.java @@ -22,35 +22,44 @@ import de.hft.stuttgart.quality.model.types.Edge; @XMLElement(name = "Edge", namespaceURI = QualityADEModule.NAMESPACE_URI) public class EdgeAdapter implements ObjectBuilder, ObjectSerializer { - @Override - public Edge createObject(QName name, Object parent) throws ObjectBuildException { - return new Edge(); - } - - @Override - public void buildChildObject(Edge object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "from" -> object.setFrom(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - case "to" -> object.setTo(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Edge element"); - } - } - - @Override - public Element createElement(Edge object, Namespaces namespaces) throws ObjectSerializeException { - return Element.of(QualityADEModule.NAMESPACE_URI, "Edge"); - } - - @Override - public void writeChildElements(Edge object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - if (object.getFrom() != null) { - writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "from"), object.getFrom(), DirectPositionAdapter.class, namespaces); - } - if (object.getTo() != null) { - writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "to"), object.getTo(), DirectPositionAdapter.class, namespaces); - } - } + @Override + public Edge createObject(QName name, Object parent) throws ObjectBuildException { + return new Edge(); + } + + @Override + public void buildChildObject(Edge object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "from": + object.setFrom(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); + break; + case "to": + object.setTo(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building Edge element"); + } + } + + @Override + public Element createElement(Edge object, Namespaces namespaces) throws ObjectSerializeException { + return Element.of(QualityADEModule.NAMESPACE_URI, "Edge"); + } + + @Override + public void writeChildElements(Edge object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + if (object.getFrom() != null) { + writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "from"), object.getFrom(), + DirectPositionAdapter.class, namespaces); + } + if (object.getTo() != null) { + writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "to"), object.getTo(), + DirectPositionAdapter.class, namespaces); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeListAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeListAdapter.java index 60e23c8..3ddbcd0 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeListAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/EdgeListAdapter.java @@ -35,11 +35,14 @@ public class EdgeListAdapter implements ObjectBuilder, ObjectSerialize return; } switch (name.getLocalPart()) { - case "edge" -> object.getEdges().add(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building EdgeList element"); + case "edge": + object.getEdges().add(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building EdgeList element"); } } - + @Override public Element createElement(EdgeList object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "EdgeList"); @@ -49,7 +52,8 @@ public class EdgeListAdapter implements ObjectBuilder, ObjectSerialize public void writeChildElements(EdgeList object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { for (EdgeProperty edgeProp : object.getEdges()) { - writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "edge"), edgeProp, EdgePropertyAdapter.class, namespaces); + writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "edge"), edgeProp, + EdgePropertyAdapter.class, namespaces); } } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ErrorAdapter.java index 5fb6c4e..7b5d0ca 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ErrorAdapter.java @@ -34,12 +34,17 @@ public class ErrorAdapter implements ObjectBuilder, ObjectSerializer reader.getTextContent().ifPresent(s -> object.setOccurrences(Integer.parseInt(s))); - case "name" -> reader.getTextContent().ifPresent(s -> object.setName(ErrorId.valueOf(s))); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Error element"); + case "occurrences": + reader.getTextContent().ifPresent(s -> object.setOccurrences(Integer.parseInt(s))); + break; + case "name": + reader.getTextContent().ifPresent(s -> object.setName(ErrorId.valueOf(s))); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building Error element"); } } - + @Override public Element createElement(Error object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "Error"); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FeatureStatisticsAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FeatureStatisticsAdapter.java index 2041159..2169b7f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FeatureStatisticsAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FeatureStatisticsAdapter.java @@ -34,13 +34,17 @@ public class FeatureStatisticsAdapter implements ObjectBuilder reader.getTextContent().ifPresent(s -> object.setNumChecked(Integer.parseInt(s))); - case "numErrors" -> reader.getTextContent().ifPresent(s -> object.setNumErrors(Integer.parseInt(s))); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building FeatureStatistics element"); + case "numChecked": + reader.getTextContent().ifPresent(s -> object.setNumChecked(Integer.parseInt(s))); + break; + case "numErrors": + reader.getTextContent().ifPresent(s -> object.setNumErrors(Integer.parseInt(s))); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building FeatureStatistics element"); } } - + @Override public Element createElement(FeatureStatistics object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "FeatureStatistics"); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FilterAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FilterAdapter.java index dd38819..bebe70f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FilterAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/FilterAdapter.java @@ -35,8 +35,11 @@ public class FilterAdapter implements ObjectBuilder, ObjectSerializer object.getChecking().add(reader.getObjectUsingBuilder(CheckingPropertyAdapter.class)); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Filter element"); + case "checking": + object.getChecking().add(reader.getObjectUsingBuilder(CheckingPropertyAdapter.class)); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building Filter element"); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/GlobalParametersAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/GlobalParametersAdapter.java index 2eb7fe3..0708065 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/GlobalParametersAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/GlobalParametersAdapter.java @@ -35,9 +35,11 @@ public class GlobalParametersAdapter implements ObjectBuilder, return; } switch (name.getLocalPart()) { - case "parameter" -> object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class)); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building GlobalParameters element"); + case "parameter": + object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class)); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building GlobalParameters element"); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/HoleOutsideErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/HoleOutsideErrorAdapter.java index 03cc18f..0b7a3a2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/HoleOutsideErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/HoleOutsideErrorAdapter.java @@ -31,11 +31,14 @@ public class HoleOutsideErrorAdapter extends AbstractPolygonErrorAdapter reader.getTextContent().ifPresent(object::setLinearRingId); - default -> super.buildChildObject(object, name, attributes, reader); + case "linearRingId": + reader.getTextContent().ifPresent(object::setLinearRingId); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } - + @Override public Element createElement(HoleOutsideError object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "GE_P_HOLE_OUTSIDE"); @@ -45,7 +48,7 @@ public class HoleOutsideErrorAdapter extends AbstractPolygonErrorAdapter reader.getTextContent().ifPresent(object::setLinearRingId1); - case "linearRingId2" -> reader.getTextContent().ifPresent(object::setLinearRingId2); - default -> super.buildChildObject(object, name, attributes, reader); + case "linearRingId1": + reader.getTextContent().ifPresent(object::setLinearRingId1); + break; + case "linearRingId2": + reader.getTextContent().ifPresent(object::setLinearRingId2); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/IntersectingRingsErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/IntersectingRingsErrorAdapter.java index e99c910..3fd59f0 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/IntersectingRingsErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/IntersectingRingsErrorAdapter.java @@ -31,12 +31,17 @@ public class IntersectingRingsErrorAdapter extends AbstractPolygonErrorAdapter reader.getTextContent().ifPresent(object::setLinearRingId1); - case "linearRingId2" -> reader.getTextContent().ifPresent(object::setLinearRingId2); - default -> super.buildChildObject(object, name, attributes, reader); + case "linearRingId1": + reader.getTextContent().ifPresent(object::setLinearRingId1); + break; + case "linearRingId2": + reader.getTextContent().ifPresent(object::setLinearRingId2); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } - + @Override public Element createElement(IntersectingRingsError object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "GE_P_INTERSECTING_RINGS"); @@ -46,7 +51,7 @@ public class IntersectingRingsErrorAdapter extends AbstractPolygonErrorAdapter object.getComponents().add(reader.getObjectUsingBuilder(PolygonIdListPropertyAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "component": + object.getComponents().add(reader.getObjectUsingBuilder(PolygonIdListPropertyAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldEdgeErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldEdgeErrorAdapter.java index 3ed6e7b..e9ab81c 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldEdgeErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldEdgeErrorAdapter.java @@ -32,8 +32,11 @@ public class NonManifoldEdgeErrorAdapter extends AbstractSolidErrorAdapter object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "edges": + object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldVertexErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldVertexErrorAdapter.java index 79dfb5a..2dcf8bc 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldVertexErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/NonManifoldVertexErrorAdapter.java @@ -20,32 +20,38 @@ import de.hft.stuttgart.quality.model.types.NonManifoldVertexError; @XMLElement(name = "GE_S_NON_MANIFOLD_VERTEX", namespaceURI = QualityADEModule.NAMESPACE_URI) public class NonManifoldVertexErrorAdapter extends AbstractSolidErrorAdapter { - @Override - public NonManifoldVertexError createObject(QName name, Object parent) throws ObjectBuildException { - return new NonManifoldVertexError(); - } - - @Override - public void buildChildObject(NonManifoldVertexError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "vertex" -> object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); - } - } - - @Override - public Element createElement(NonManifoldVertexError object, Namespaces namespaces) throws ObjectSerializeException { - return Element.of(QualityADEModule.NAMESPACE_URI, "GE_S_NON_MANIFOLD_VERTEX"); - } - - @Override - public void writeChildElements(NonManifoldVertexError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - super.writeChildElements(object, namespaces, writer); - if (object.getVertex() != null) { - writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "vertex"), object.getVertex(), DirectPositionAdapter.class, namespaces); - } - } + @Override + public NonManifoldVertexError createObject(QName name, Object parent) throws ObjectBuildException { + return new NonManifoldVertexError(); + } + + @Override + public void buildChildObject(NonManifoldVertexError object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "vertex": + object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); + } + } + + @Override + public Element createElement(NonManifoldVertexError object, Namespaces namespaces) throws ObjectSerializeException { + return Element.of(QualityADEModule.NAMESPACE_URI, "GE_S_NON_MANIFOLD_VERTEX"); + } + + @Override + public void writeChildElements(NonManifoldVertexError object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + super.writeChildElements(object, namespaces, writer); + if (object.getVertex() != null) { + writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "vertex"), object.getVertex(), + DirectPositionAdapter.class, namespaces); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/OrientationRingsSameErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/OrientationRingsSameErrorAdapter.java index ad8263c..ebf8ffa 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/OrientationRingsSameErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/OrientationRingsSameErrorAdapter.java @@ -31,11 +31,14 @@ public class OrientationRingsSameErrorAdapter extends AbstractPolygonErrorAdapte return; } switch (name.getLocalPart()) { - case "linearRingId" -> reader.getTextContent().ifPresent(object::setLinearRing); - default -> super.buildChildObject(object, name, attributes, reader); + case "linearRingId": + reader.getTextContent().ifPresent(object::setLinearRing); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } - + @Override public Element createElement(OrientationRingsSameError object, Namespaces namespaces) throws ObjectSerializeException { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ParameterAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ParameterAdapter.java index 3f31231..89c91c2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ParameterAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ParameterAdapter.java @@ -22,39 +22,48 @@ import javax.xml.namespace.QName; @XMLElement(name = "Parameter", namespaceURI = QualityADEModule.NAMESPACE_URI) public class ParameterAdapter implements ObjectBuilder, ObjectSerializer { - @Override - public Parameter createObject(QName name, Object parent) throws ObjectBuildException { - return new Parameter(); - } - - @Override - public void buildChildObject(Parameter object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { - if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { - return; - } - switch (name.getLocalPart()) { - case "name" -> reader.getTextContent().ifPresent(object::setName); - case "uom" -> reader.getTextContent().ifPresent(object::setUom); - case "value" -> reader.getTextContent().ifPresent(object::setValue); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Parameter element"); - } - } - - @Override - public Element createElement(Parameter object, Namespaces namespaces) throws ObjectSerializeException { - return Element.of(QualityADEModule.NAMESPACE_URI, "Parameter"); - } - - @Override - public void writeChildElements(Parameter object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { - if (object.getName() != null) { - writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "name").addTextContent(object.getName())); - } - if (object.getUom() != null) { - writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "uom").addTextContent(object.getUom())); - } - if (object.getValue() != null) { - writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "value").addTextContent(object.getValue())); - } - } + @Override + public Parameter createObject(QName name, Object parent) throws ObjectBuildException { + return new Parameter(); + } + + @Override + public void buildChildObject(Parameter object, QName name, Attributes attributes, XMLReader reader) + throws ObjectBuildException, XMLReadException { + if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { + return; + } + switch (name.getLocalPart()) { + case "name": + reader.getTextContent().ifPresent(object::setName); + break; + 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"); + } + } + + @Override + public Element createElement(Parameter object, Namespaces namespaces) throws ObjectSerializeException { + return Element.of(QualityADEModule.NAMESPACE_URI, "Parameter"); + } + + @Override + public void writeChildElements(Parameter object, Namespaces namespaces, XMLWriter writer) + throws ObjectSerializeException, XMLWriteException { + if (object.getName() != null) { + writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "name").addTextContent(object.getName())); + } + if (object.getUom() != null) { + writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "uom").addTextContent(object.getUom())); + } + if (object.getValue() != null) { + writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "value").addTextContent(object.getValue())); + } + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarDistancePlaneErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarDistancePlaneErrorAdapter.java index acbd568..38aa520 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarDistancePlaneErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarDistancePlaneErrorAdapter.java @@ -33,9 +33,14 @@ public class PlanarDistancePlaneErrorAdapter extends AbstractPolygonErrorAdapter return; } switch (name.getLocalPart()) { - case "vertex" -> object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - case "distance" -> object.setDistance(reader.getObjectUsingBuilder(LengthAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "vertex": + object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); + break; + case "distance": + object.setDistance(reader.getObjectUsingBuilder(LengthAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarNormalsDeviationErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarNormalsDeviationErrorAdapter.java index 647f331..c0d2130 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarNormalsDeviationErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PlanarNormalsDeviationErrorAdapter.java @@ -32,8 +32,11 @@ public class PlanarNormalsDeviationErrorAdapter extends AbstractPolygonErrorAdap return; } switch (name.getLocalPart()) { - case "deviation" -> object.setDeviation(reader.getObjectUsingBuilder(AngleAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "deviation": + object.setDeviation(reader.getObjectUsingBuilder(AngleAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonIdListAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonIdListAdapter.java index e481d70..f031f38 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonIdListAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonIdListAdapter.java @@ -34,12 +34,14 @@ public class PolygonIdListAdapter implements ObjectBuilder, Objec return; } switch (name.getLocalPart()) { - case "polygonId" -> object.getPolygonIds().add(reader.getTextContent().get()); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building PolygonIdList element"); + case "polygonId": + object.getPolygonIds().add(reader.getTextContent().get()); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building PolygonIdList element"); } } - + @Override public Element createElement(PolygonIdList object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "PolygonIdList"); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonWrongOrientationErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonWrongOrientationErrorAdapter.java index 1bf61a2..4a67fc1 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonWrongOrientationErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/PolygonWrongOrientationErrorAdapter.java @@ -32,8 +32,11 @@ public class PolygonWrongOrientationErrorAdapter extends AbstractSolidErrorAdapt return; } switch (name.getLocalPart()) { - case "edges" -> object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "edges": + object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RequirementAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RequirementAdapter.java index 4d28b45..9c4ea09 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RequirementAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RequirementAdapter.java @@ -37,10 +37,17 @@ public class RequirementAdapter implements ObjectBuilder, ObjectSer return; } switch (name.getLocalPart()) { - case "enabled" -> reader.getTextContent().ifPresent(s -> object.setEnabled(Boolean.parseBoolean(s))); - case "requirementType" -> object.setRequirementType(RequirementId.valueOf(reader.getTextContent().get())); - case "parameter" -> object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class)); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Requirement element"); + case "enabled": + reader.getTextContent().ifPresent(s -> object.setEnabled(Boolean.parseBoolean(s))); + break; + 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"); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RingSelfIntersectionErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RingSelfIntersectionErrorAdapter.java index 3051336..7598322 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RingSelfIntersectionErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/RingSelfIntersectionErrorAdapter.java @@ -34,12 +34,23 @@ public class RingSelfIntersectionErrorAdapter extends AbstractRingErrorAdapter reader.getTextContent().ifPresent(s -> object.setType(RingSelfIntType.valueOf(s))); - case "edge1" -> object.setEdge1(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); - case "edge2" -> object.setEdge2(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); - case "vertex1" -> object.setVertex1(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - case "vertex2" -> object.setVertex2(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "type": + reader.getTextContent().ifPresent(s -> object.setType(RingSelfIntType.valueOf(s))); + break; + case "edge1": + object.setEdge1(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); + 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); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeMissingErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeMissingErrorAdapter.java index 9694a09..c47bcfc 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeMissingErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeMissingErrorAdapter.java @@ -31,14 +31,21 @@ public class SemanticAttributeMissingErrorAdapter extends AbstractSemanticErrorA return; } switch (name.getLocalPart()) { - case "childId" -> reader.getTextContent().ifPresent(object::setChildId); - case "attributeName" -> reader.getTextContent().ifPresent(object::setAttributeName); - case "generic" -> reader.getTextContent().ifPresent(s -> object.setGeneric(Boolean.parseBoolean(s))); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building SemanticAttributeMissingError element"); + case "childId": + reader.getTextContent().ifPresent(object::setChildId); + break; + 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"); } } - + @Override public Element createElement(SemanticAttributeMissingError object, Namespaces namespaces) throws ObjectSerializeException { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeWrongValueErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeWrongValueErrorAdapter.java index 6ccbb2b..923bf5e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeWrongValueErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SemanticAttributeWrongValueErrorAdapter.java @@ -32,14 +32,21 @@ public class SemanticAttributeWrongValueErrorAdapter return; } switch (name.getLocalPart()) { - case "childId" -> reader.getTextContent().ifPresent(object::setChildId); - case "attributeName" -> reader.getTextContent().ifPresent(object::setAttributeName); - case "generic" -> reader.getTextContent().ifPresent(s -> object.setGeneric(Boolean.parseBoolean(s))); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building SemanticAttributeWrongValueError element"); + case "childId": + reader.getTextContent().ifPresent(object::setChildId); + break; + 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"); } } - + @Override public Element createElement(SemanticAttributeWrongValueError object, Namespaces namespaces) throws ObjectSerializeException { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidNotClosedErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidNotClosedErrorAdapter.java index 7f03206..54c7760 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidNotClosedErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidNotClosedErrorAdapter.java @@ -32,8 +32,11 @@ public class SolidNotClosedErrorAdapter extends AbstractSolidErrorAdapter object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "edges": + object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidSelfIntersectionErrorAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidSelfIntersectionErrorAdapter.java index e719eca..e0491cf 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidSelfIntersectionErrorAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/SolidSelfIntersectionErrorAdapter.java @@ -31,10 +31,14 @@ public class SolidSelfIntersectionErrorAdapter extends AbstractSolidErrorAdapter return; } switch (name.getLocalPart()) { - case "polygonId1" -> reader.getTextContent().ifPresent(object::setPolygonId1); - case "polygonId2" -> reader.getTextContent().ifPresent(object::setPolygonId2); - - default -> super.buildChildObject(object, name, attributes, reader); + case "polygonId1": + reader.getTextContent().ifPresent(object::setPolygonId1); + break; + case "polygonId2": + reader.getTextContent().ifPresent(object::setPolygonId2); + break; + default: + super.buildChildObject(object, name, attributes, reader); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/StatisticsAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/StatisticsAdapter.java index 4ee3eff..faa53f6 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/StatisticsAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/StatisticsAdapter.java @@ -36,20 +36,29 @@ public class StatisticsAdapter implements ObjectBuilder, ObjectSeria return; } switch (name.getLocalPart()) { - case "numErrorBuildings" -> object - .setNumErrorBuildings(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); - case "numErrorVegetation" -> object - .setNumErrorVegetation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); - case "numErrorLandObjects" -> object - .setNumErrorLandObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); - case "numErrorBridgeObjects" -> object - .setNumErrorBridgeObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); - case "numErrorWaterObjects" -> object - .setNumErrorWaterObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); - case "numErrorTransportation" -> object - .setNumErrorTransportation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); - case "error" -> object.getErrors().add(reader.getObjectUsingBuilder(ErrorPropertyAdapter.class)); - default -> throw new IllegalStateException("Cannot handle name " + name + " when building Statistics element"); + case "numErrorBuildings": + object.setNumErrorBuildings(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); + break; + case "numErrorVegetation": + object.setNumErrorVegetation(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); + break; + case "numErrorLandObjects": + object.setNumErrorLandObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); + break; + case "numErrorBridgeObjects": + object.setNumErrorBridgeObjects(reader.getObjectUsingBuilder(FeatureStatisticsPropertyAdapter.class)); + break; + case "numErrorWaterObjects": + 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"); } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationAdapter.java index 77ece23..bd347f0 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationAdapter.java @@ -20,7 +20,7 @@ import de.hft.stuttgart.quality.adapter.properties.ValidationPlanPropertyAdapter import de.hft.stuttgart.quality.model.types.Validation; @XMLElement(name = "Validation", namespaceURI = QualityADEModule.NAMESPACE_URI) -public class ValidationAdapter extends AbstractFeatureAdapter { +public class ValidationAdapter extends AbstractFeatureAdapter { private static final ZonedDateTimeAdapter DATE_TIME_ADAPTER = new ZonedDateTimeAdapter(); @@ -36,16 +36,23 @@ public class ValidationAdapter extends AbstractFeatureAdapter { return; } switch (name.getLocalPart()) { - case "validationDate" -> reader.getTextContent() - .ifPresent(s -> object.setValidationDate(DATE_TIME_ADAPTER.fromString(s))); - case "validationSoftware" -> reader.getTextContent().ifPresent(object::setValidationSoftware); - case "statistics" -> object.setStatistics(reader.getObjectUsingBuilder(StatisticsPropertyAdapter.class)); - case "validationPlan" -> object - .setValidationPlan(reader.getObjectUsingBuilder(ValidationPlanPropertyAdapter.class)); - default -> super.buildChildObject(object, name, attributes, reader); + case "validationDate": + reader.getTextContent().ifPresent(s -> object.setValidationDate(DATE_TIME_ADAPTER.fromString(s))); + break; + case "validationSoftware": + reader.getTextContent().ifPresent(object::setValidationSoftware); + break; + 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); } } - + @Override public Element createElement(Validation object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "Validation"); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationPlanAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationPlanAdapter.java index 245bc01..b84f85e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationPlanAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationPlanAdapter.java @@ -37,16 +37,20 @@ public class ValidationPlanAdapter implements ObjectBuilder, Obj return; } switch (name.getLocalPart()) { - case "globalParameters" -> object - .setGlobalParameters(reader.getObjectUsingBuilder(GlobalParametersPropertyAdapter.class)); - case "filter" -> object.setFilter(reader.getObjectUsingBuilder(FilterPropertyAdapter.class)); - case "requirement" -> object.getRequirements() - .add(reader.getObjectUsingBuilder(RequirementPropertyAdapter.class)); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building ValidationPlan element"); + case "globalParameters": + object.setGlobalParameters(reader.getObjectUsingBuilder(GlobalParametersPropertyAdapter.class)); + break; + case "filter": + object.setFilter(reader.getObjectUsingBuilder(FilterPropertyAdapter.class)); + break; + case "requirement": + object.getRequirements().add(reader.getObjectUsingBuilder(RequirementPropertyAdapter.class)); + break; + default: + throw new IllegalStateException("Cannot handle name " + name + " when building ValidationPlan element"); } } - + @Override public Element createElement(ValidationPlan object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "ValidationPlan"); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationResultAdapter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationResultAdapter.java index 68f5b8d..6e65ca9 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationResultAdapter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/adapter/types/ValidationResultAdapter.java @@ -37,14 +37,20 @@ public class ValidationResultAdapter implements ObjectBuilder, return; } switch (name.getLocalPart()) { - case "validationPlanID" -> object.setValidationPlanID(reader.getObjectUsingBuilder(ReferenceAdapter.class)); - case "error" -> object.getErrors().add(reader.getObjectUsingBuilder(AbstractErrorPropertyAdapter.class)); - case "resultType" -> reader.getTextContent().ifPresent(s -> object.setResultType(ResultType.valueOf(s))); - default -> throw new IllegalStateException( - "Cannot handle name " + name + " when building ValidationResult element"); + case "validationPlanID": + object.setValidationPlanID(reader.getObjectUsingBuilder(ReferenceAdapter.class)); + break; + case "error": + 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"); } } - + @Override public Element createElement(ValidationResult object, Namespaces namespaces) throws ObjectSerializeException { return Element.of(QualityADEModule.NAMESPACE_URI, "ValidationResult"); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractErrorProperty.java index 154f16d..fddacc2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractErrorProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.AbstractError; public class AbstractErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 1411862623125946009L; + private static final long serialVersionUID = 1411862623125946009L; - public AbstractErrorProperty() { - super(); - } + public AbstractErrorProperty() { + super(); + } - public AbstractErrorProperty(AbstractError ae) { - super(ae); - } + public AbstractErrorProperty(AbstractError ae) { + super(ae); + } - @Override - public Class getTargetType() { - return AbstractError.class; - } + @Override + public Class getTargetType() { + return AbstractError.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractGeometryErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractGeometryErrorProperty.java index 66789ee..152fe5c 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractGeometryErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractGeometryErrorProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.AbstractGeometryError; public class AbstractGeometryErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 7034671234592671680L; + private static final long serialVersionUID = 7034671234592671680L; - public AbstractGeometryErrorProperty() { - super(); - } + public AbstractGeometryErrorProperty() { + super(); + } - public AbstractGeometryErrorProperty(AbstractGeometryError age) { - super(age); - } + public AbstractGeometryErrorProperty(AbstractGeometryError age) { + super(age); + } - @Override - public Class getTargetType() { - return AbstractGeometryError.class; - } + @Override + public Class getTargetType() { + return AbstractGeometryError.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractPolygonErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractPolygonErrorProperty.java index 90dd4b0..5e55fa6 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractPolygonErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractPolygonErrorProperty.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,7 +23,6 @@ import de.hft.stuttgart.quality.model.types.AbstractPolygonError; public class AbstractPolygonErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial private static final long serialVersionUID = 70692012962059529L; public AbstractPolygonErrorProperty() { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractRingErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractRingErrorProperty.java index bd93ccb..6d7fa81 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractRingErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractRingErrorProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.AbstractRingError; public class AbstractRingErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 6934180997181643185L; + private static final long serialVersionUID = 6934180997181643185L; - public AbstractRingErrorProperty() { - super(); - } + public AbstractRingErrorProperty() { + super(); + } - public AbstractRingErrorProperty(AbstractRingError are) { - super(are); - } + public AbstractRingErrorProperty(AbstractRingError are) { + super(are); + } - @Override - public Class getTargetType() { - return AbstractRingError.class; - } + @Override + public Class getTargetType() { + return AbstractRingError.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSemanticErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSemanticErrorProperty.java index 1cb46ca..de05ae8 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSemanticErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSemanticErrorProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.AbstractSemanticError; public class AbstractSemanticErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 8488922114751949334L; + private static final long serialVersionUID = 8488922114751949334L; - public AbstractSemanticErrorProperty() { - super(); - } + public AbstractSemanticErrorProperty() { + super(); + } - public AbstractSemanticErrorProperty(AbstractSemanticError ase) { - super(ase); - } + public AbstractSemanticErrorProperty(AbstractSemanticError ase) { + super(ase); + } - @Override - public Class getTargetType() { - return AbstractSemanticError.class; - } + @Override + public Class getTargetType() { + return AbstractSemanticError.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSolidErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSolidErrorProperty.java index bdee7d6..cee12b8 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSolidErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSolidErrorProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.AbstractSolidError; public class AbstractSolidErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 4191279461525842687L; + private static final long serialVersionUID = 4191279461525842687L; - public AbstractSolidErrorProperty() { - super(); - } + public AbstractSolidErrorProperty() { + super(); + } - public AbstractSolidErrorProperty(AbstractSolidError ase) { - super(ase); - } + public AbstractSolidErrorProperty(AbstractSolidError ase) { + super(ase); + } - @Override - public Class getTargetType() { - return AbstractSolidError.class; - } + @Override + public Class getTargetType() { + return AbstractSolidError.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/CheckingProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/CheckingProperty.java index c6c4f10..7512dbe 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/CheckingProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/CheckingProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.Checking; public class CheckingProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 2275964563754871682L; + private static final long serialVersionUID = 2275964563754871682L; - public CheckingProperty() { - super(); - } + public CheckingProperty() { + super(); + } - public CheckingProperty(Checking c) { - super(c); - } + public CheckingProperty(Checking c) { + super(c); + } - @Override - public Class getTargetType() { - return Checking.class; - } + @Override + public Class getTargetType() { + return Checking.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeListProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeListProperty.java index fce97f5..5573394 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeListProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeListProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.EdgeList; public class EdgeListProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 2336457353379630637L; + private static final long serialVersionUID = 2336457353379630637L; - public EdgeListProperty() { - super(); - } + public EdgeListProperty() { + super(); + } - public EdgeListProperty(EdgeList el) { - super(el); - } + public EdgeListProperty(EdgeList el) { + super(el); + } - @Override - public Class getTargetType() { - return EdgeList.class; - } + @Override + public Class getTargetType() { + return EdgeList.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeProperty.java index efdd34c..1eb7302 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.Edge; public class EdgeProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 3087019382945722678L; + private static final long serialVersionUID = 3087019382945722678L; - public EdgeProperty() { - super(); - } + public EdgeProperty() { + super(); + } - public EdgeProperty(Edge e) { - super(e); - } + public EdgeProperty(Edge e) { + super(e); + } - @Override - public Class getTargetType() { - return Edge.class; - } + @Override + public Class getTargetType() { + return Edge.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ErrorProperty.java index ca747db..0d005f4 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ErrorProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ErrorProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.Error; public class ErrorProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 1405693040162674820L; + private static final long serialVersionUID = 1405693040162674820L; - public ErrorProperty() { - super(); - } + public ErrorProperty() { + super(); + } - public ErrorProperty(Error e) { - super(e); - } + public ErrorProperty(Error e) { + super(e); + } - @Override - public Class getTargetType() { - return Error.class; - } + @Override + public Class getTargetType() { + return Error.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FeatureStatisticsProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FeatureStatisticsProperty.java index 5d31a9b..8a165de 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FeatureStatisticsProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FeatureStatisticsProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.FeatureStatistics; public class FeatureStatisticsProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 4725452691563906950L; + private static final long serialVersionUID = 4725452691563906950L; - public FeatureStatisticsProperty() { - super(); - } + public FeatureStatisticsProperty() { + super(); + } - public FeatureStatisticsProperty(FeatureStatistics fs) { - super(fs); - } + public FeatureStatisticsProperty(FeatureStatistics fs) { + super(fs); + } - @Override - public Class getTargetType() { - return FeatureStatistics.class; - } + @Override + public Class getTargetType() { + return FeatureStatistics.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FilterProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FilterProperty.java index 8342179..b3b4630 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FilterProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FilterProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.Filter; public class FilterProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 2202767186145199981L; + private static final long serialVersionUID = 2202767186145199981L; - public FilterProperty() { - super(); - } + public FilterProperty() { + super(); + } - public FilterProperty(Filter f) { - super(f); - } + public FilterProperty(Filter f) { + super(f); + } - @Override - public Class getTargetType() { - return Filter.class; - } + @Override + public Class getTargetType() { + return Filter.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/GlobalParametersProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/GlobalParametersProperty.java index eba5b1a..3c1e3af 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/GlobalParametersProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/GlobalParametersProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.GlobalParameters; public class GlobalParametersProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 4688667898762529244L; + private static final long serialVersionUID = 4688667898762529244L; - public GlobalParametersProperty() { - super(); - } + public GlobalParametersProperty() { + super(); + } - public GlobalParametersProperty(GlobalParameters gp) { - super(gp); - } + public GlobalParametersProperty(GlobalParameters gp) { + super(gp); + } - @Override - public Class getTargetType() { - return GlobalParameters.class; - } + @Override + public Class getTargetType() { + return GlobalParameters.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ParameterProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ParameterProperty.java index 25e07d1..60fe0a1 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ParameterProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ParameterProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.Parameter; public class ParameterProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 3826499653407209573L; + private static final long serialVersionUID = 3826499653407209573L; - public ParameterProperty() { - super(); - } + public ParameterProperty() { + super(); + } - public ParameterProperty(Parameter p) { - super(p); - } + public ParameterProperty(Parameter p) { + super(p); + } - @Override - public Class getTargetType() { - return Parameter.class; - } + @Override + public Class getTargetType() { + return Parameter.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonIdListProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonIdListProperty.java index 5b8cf32..e1a3033 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonIdListProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonIdListProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.PolygonIdList; public class PolygonIdListProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 8212792040324739831L; + private static final long serialVersionUID = 8212792040324739831L; - public PolygonIdListProperty() { - super(); - } + public PolygonIdListProperty() { + super(); + } - public PolygonIdListProperty(PolygonIdList pil) { - super(pil); - } + public PolygonIdListProperty(PolygonIdList pil) { + super(pil); + } - @Override - public Class getTargetType() { - return PolygonIdList.class; - } + @Override + public Class getTargetType() { + return PolygonIdList.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RequirementProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RequirementProperty.java index 5819edd..3b54f7f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RequirementProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RequirementProperty.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,7 +23,6 @@ import de.hft.stuttgart.quality.model.types.Requirement; public class RequirementProperty extends AbstractInlineProperty implements ADEObject { - @Serial private static final long serialVersionUID = 1084132873819307011L; public RequirementProperty() { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/StatisticsProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/StatisticsProperty.java index d67173d..5e38899 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/StatisticsProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/StatisticsProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.types.Statistics; public class StatisticsProperty extends AbstractInlineProperty implements ADEObject { - @Serial private static final long serialVersionUID = 4264016075264322157L; public StatisticsProperty() { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationPlanProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationPlanProperty.java index 60190a6..624a81e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationPlanProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationPlanProperty.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineProperty; @@ -24,20 +22,19 @@ import de.hft.stuttgart.quality.model.types.ValidationPlan; public class ValidationPlanProperty extends AbstractInlineProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 4542660904311227314L; + private static final long serialVersionUID = 4542660904311227314L; - public ValidationPlanProperty() { - super(); - } + public ValidationPlanProperty() { + super(); + } - public ValidationPlanProperty(ValidationPlan vp) { - super(vp); - } + public ValidationPlanProperty(ValidationPlan vp) { + super(vp); + } - @Override - public Class getTargetType() { - return ValidationPlan.class; - } + @Override + public Class getTargetType() { + return ValidationPlan.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationProperty.java index b2bcb6e..8f5a0b6 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationProperty.java @@ -15,32 +15,30 @@ */ package de.hft.stuttgart.quality.model.properties; -import de.hft.stuttgart.quality.model.types.Validation; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineOrByReferenceProperty; -import java.io.Serial; +import de.hft.stuttgart.quality.model.types.Validation; public class ValidationProperty extends AbstractInlineOrByReferenceProperty implements ADEObject { - @Serial - private static final long serialVersionUID = 3423466580266018906L; + private static final long serialVersionUID = 3423466580266018906L; - public ValidationProperty() { - super(); - } + public ValidationProperty() { + super(); + } - public ValidationProperty(Validation object) { - super(object); - } + public ValidationProperty(Validation object) { + super(object); + } - public ValidationProperty(String href) { - super(href); - } + public ValidationProperty(String href) { + super(href); + } - @Override - public Class getTargetType() { - return Validation.class; - } + @Override + public Class getTargetType() { + return Validation.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java index db6f38c..6e1d791 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java @@ -15,34 +15,31 @@ */ package de.hft.stuttgart.quality.model.properties; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.base.AbstractInlineOrByReferenceProperty; import de.hft.stuttgart.quality.model.types.ValidationResult; -public class ValidationResultProperty extends AbstractInlineOrByReferenceProperty implements ADEObject { - +public class ValidationResultProperty extends AbstractInlineOrByReferenceProperty + implements ADEObject { - @Serial private static final long serialVersionUID = 480940868730913996L; public ValidationResultProperty() { - super(); - } + super(); + } - public ValidationResultProperty(ValidationResult object) { - super(object); - } + public ValidationResultProperty(ValidationResult object) { + super(object); + } - public ValidationResultProperty(String href) { - super(href); - } + public ValidationResultProperty(String href) { + super(href); + } - @Override - public Class getTargetType() { - return ValidationResult.class; - } + @Override + public Class getTargetType() { + return ValidationResult.class; + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java index f5675b0..cb95bce 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; @@ -24,7 +23,6 @@ import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public abstract class AbstractError extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 4456303926951620441L; public void accept(ValidationErrorVisitor visitor) { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractGeometryError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractGeometryError.java index 4e5203d..0c6bfe1 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractGeometryError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractGeometryError.java @@ -15,19 +15,16 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public abstract class AbstractGeometryError extends AbstractError { - @Serial - private static final long serialVersionUID = 5584980708521134866L; - - @Override - public void accept(ValidationErrorVisitor visitor) { - super.accept(visitor); - visitor.visit(this); - } + private static final long serialVersionUID = 5584980708521134866L; + + @Override + public void accept(ValidationErrorVisitor visitor) { + super.accept(visitor); + visitor.visit(this); + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractPolygonError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractPolygonError.java index bcf898c..85ee1ae 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractPolygonError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractPolygonError.java @@ -15,15 +15,12 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public abstract class AbstractPolygonError extends AbstractGeometryError { - @Serial - private static final long serialVersionUID = 8765755615504522764L; - + private static final long serialVersionUID = 8765755615504522764L; + private String polygonId; public String getPolygonId() { @@ -33,7 +30,7 @@ public abstract class AbstractPolygonError extends AbstractGeometryError { public void setPolygonId(String polygonId) { this.polygonId = polygonId; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractRingError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractRingError.java index 84255f4..101f847 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractRingError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractRingError.java @@ -15,16 +15,13 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public abstract class AbstractRingError extends AbstractGeometryError { - @Serial - private static final long serialVersionUID = 6406932524599157467L; - - private String linearRingId; + private static final long serialVersionUID = 6406932524599157467L; + + private String linearRingId; public String getLinearRingId() { return linearRingId; @@ -33,7 +30,7 @@ public abstract class AbstractRingError extends AbstractGeometryError { public void setLinearRingId(String linearRingId) { this.linearRingId = linearRingId; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSemanticError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSemanticError.java index 3018482..32a9cf8 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSemanticError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSemanticError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public abstract class AbstractSemanticError extends AbstractError { - @Serial private static final long serialVersionUID = 3754322190455789991L; @Override diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSolidError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSolidError.java index cb9362f..191d5e2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSolidError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSolidError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public abstract class AbstractSolidError extends AbstractGeometryError { - @Serial private static final long serialVersionUID = 8616094562996823088L; private String geometryId; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java index bccf290..fc0f91d 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java @@ -15,19 +15,16 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class AllPolygonsOrientedWrongError extends AbstractSolidError { - @Serial - private static final long serialVersionUID = 4295306777217062184L; - - @Override - public void accept(ValidationErrorVisitor visitor) { - super.accept(visitor); - visitor.visit(this); - } + private static final long serialVersionUID = 4295306777217062184L; + + @Override + public void accept(ValidationErrorVisitor visitor) { + super.accept(visitor); + visitor.visit(this); + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java index 60b178d..e9cb6e2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; @@ -24,10 +22,9 @@ import de.hft.stuttgart.quality.model.enums.TopLevelFeatureType; public class Checking extends GMLObject implements ADEObject { - @Serial - private static final long serialVersionUID = 8248598807454312291L; - - private TopLevelFeatureType featureType; + private static final long serialVersionUID = 8248598807454312291L; + + private TopLevelFeatureType featureType; public TopLevelFeatureType getFeatureType() { return featureType; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java index 98eabb6..548afc3 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java @@ -1,23 +1,20 @@ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.citygml4j.core.model.core.ADEOfAbstractCityObject; import de.hft.stuttgart.quality.model.properties.ValidationResultProperty; public class CityObjectProperties extends ADEOfAbstractCityObject { - @Serial - private static final long serialVersionUID = 1273072314736964714L; + private static final long serialVersionUID = 1273072314736964714L; - private ValidationResultProperty validationResult; + private ValidationResultProperty validationResult; - public ValidationResultProperty getValidationResult() { - return validationResult; - } + public ValidationResultProperty getValidationResult() { + return validationResult; + } - public void setValidationResult(ValidationResultProperty validationResult) { - this.validationResult = asChild(validationResult); - } + public void setValidationResult(ValidationResultProperty validationResult) { + this.validationResult = asChild(validationResult); + } } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java index 7b8a0a1..e71a24f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java @@ -15,15 +15,12 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.xmlobjects.gml.model.geometry.DirectPosition; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class ConsecutivePointsSameError extends AbstractRingError { - @Serial private static final long serialVersionUID = 960107689338308020L; private DirectPosition vertex1; @@ -44,7 +41,7 @@ public class ConsecutivePointsSameError extends AbstractRingError { public void setVertex2(DirectPosition vertex2) { this.vertex2 = asChild(vertex2); } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java index 8e9519f..fadd5f6 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java @@ -15,15 +15,12 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; import org.xmlobjects.gml.model.geometry.DirectPosition; public class Edge extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 8021062845313752146L; private DirectPosition from; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java index a67004a..a0337bd 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -26,10 +25,9 @@ import de.hft.stuttgart.quality.model.properties.EdgeProperty; public class EdgeList extends GMLObject implements ADEObject { - @Serial - private static final long serialVersionUID = 5900643456940461301L; - - private List edges; + private static final long serialVersionUID = 5900643456940461301L; + + private List edges; public List getEdges() { if (edges == null) { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java index 7c5dde2..b03261e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; @@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.enums.ErrorId; public class Error extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 2447962257841143458L; private int occurrences; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java index e7944bb..ff2e38f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java @@ -15,19 +15,16 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; public class FeatureStatistics extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 5835765260535725839L; private int numChecked; private int numErrors; - + public FeatureStatistics() { // constructor for serialization } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java index d0b8249..6575f41 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -26,7 +25,6 @@ import de.hft.stuttgart.quality.model.properties.CheckingProperty; public class Filter extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 2766323821940477659L; private List checking; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java index 8b53d77..56e0db5 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -26,7 +25,6 @@ import de.hft.stuttgart.quality.model.properties.ParameterProperty; public class GlobalParameters extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 5470016232480954926L; private List parameters; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java index 6c6f199..8a82e13 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class HoleOutsideError extends AbstractPolygonError { - @Serial private static final long serialVersionUID = 7823516103018988170L; private String linearRingId; @@ -33,7 +30,7 @@ public class HoleOutsideError extends AbstractPolygonError { public void setLinearRingId(String linearRingId) { this.linearRingId = linearRingId; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java index 658f209..b5cdfe8 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class InnerRingsNestedError extends AbstractPolygonError { - @Serial private static final long serialVersionUID = 6801491749796411678L; private String linearRingId1; @@ -42,7 +39,7 @@ public class InnerRingsNestedError extends AbstractPolygonError { public void setLinearRingId2(String linearRingId2) { this.linearRingId2 = linearRingId2; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java index f750cd8..261d4a6 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java @@ -15,20 +15,16 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class InteriorDisconnectedError extends AbstractPolygonError { - - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); visitor.visit(this); } - @Serial - private static final long serialVersionUID = 8270468563578479182L; + private static final long serialVersionUID = 8270468563578479182L; } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java index 6ec183c..8bd213d 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class IntersectingRingsError extends AbstractPolygonError { - @Serial private static final long serialVersionUID = 4733342962974436966L; private String linearRingId1; @@ -42,7 +39,7 @@ public class IntersectingRingsError extends AbstractPolygonError { public void setLinearRingId2(String linearRingId2) { this.linearRingId2 = linearRingId2; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java index ee3b280..19f1419 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.xmlobjects.model.ChildList; @@ -25,7 +24,6 @@ import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class MultipleComponentsError extends AbstractSolidError { - @Serial private static final long serialVersionUID = 4322219502819024437L; private List components; @@ -36,7 +34,7 @@ public class MultipleComponentsError extends AbstractSolidError { } return components; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java index bb43f2e..b926f5a 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java @@ -15,14 +15,11 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.properties.EdgeListProperty; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class NonManifoldEdgeError extends AbstractSolidError { - @Serial private static final long serialVersionUID = 3499800929524507025L; private EdgeListProperty edges; @@ -30,7 +27,7 @@ public class NonManifoldEdgeError extends AbstractSolidError { public EdgeListProperty getEdges() { return edges; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java index 0d8d6fe..c35617c 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java @@ -15,17 +15,14 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.xmlobjects.gml.model.geometry.DirectPosition; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class NonManifoldVertexError extends AbstractSolidError { - @Serial - private static final long serialVersionUID = 6428627491730618046L; - + private static final long serialVersionUID = 6428627491730618046L; + private DirectPosition vertex; public DirectPosition getVertex() { @@ -35,7 +32,7 @@ public class NonManifoldVertexError extends AbstractSolidError { public void setVertex(DirectPosition vertex) { this.vertex = asChild(vertex); } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java index 1856639..3b93910 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class OrientationRingsSameError extends AbstractPolygonError { - @Serial private static final long serialVersionUID = 5732797947859046889L; private String linearRing; @@ -33,7 +30,7 @@ public class OrientationRingsSameError extends AbstractPolygonError { public void setLinearRing(String linearRing) { this.linearRing = linearRing; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java index 16e0a2f..4156792 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java @@ -15,14 +15,11 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; public class Parameter extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 3493525795867922745L; private String name; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java index 4e1c859..090acca 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java @@ -15,8 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.xmlobjects.gml.model.geometry.DirectPosition; import org.xmlobjects.gml.model.measures.Length; @@ -24,7 +22,6 @@ import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class PlanarDistancePlaneError extends AbstractPolygonError { - @Serial private static final long serialVersionUID = 9186823395923829178L; private DirectPosition vertex; @@ -45,7 +42,7 @@ public class PlanarDistancePlaneError extends AbstractPolygonError { public void setDistance(Length distance) { this.distance = asChild(distance); } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java index c93fdce..dce1c88 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java @@ -15,15 +15,12 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import org.xmlobjects.gml.model.measures.Angle; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class PlanarNormalsDeviationError extends AbstractPolygonError { - @Serial private static final long serialVersionUID = 5914728363336771016L; private Angle deviation; @@ -35,7 +32,7 @@ public class PlanarNormalsDeviationError extends AbstractPolygonError { public void setDeviation(Angle deviation) { this.deviation = asChild(deviation); } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java index 58f00bb..a8092b8 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -24,10 +23,9 @@ import org.xmlobjects.gml.model.GMLObject; public class PolygonIdList extends GMLObject implements ADEObject { - @Serial - private static final long serialVersionUID = 4396447239956257299L; - - private List polygonIds; + private static final long serialVersionUID = 4396447239956257299L; + + private List polygonIds; public List getPolygonIds() { if (polygonIds == null) { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java index f6ed58d..4033203 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java @@ -15,14 +15,11 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.properties.EdgeListProperty; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class PolygonWrongOrientationError extends AbstractSolidError { - @Serial private static final long serialVersionUID = 4975827693656963892L; private EdgeListProperty edges; @@ -34,7 +31,7 @@ public class PolygonWrongOrientationError extends AbstractSolidError { public void setEdges(EdgeListProperty edges) { this.edges = edges; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java index 4dad3b5..921eb87 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -27,7 +26,6 @@ import de.hft.stuttgart.quality.model.properties.ParameterProperty; public class Requirement extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 4428291416242684642L; private boolean enabled; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java index 7805c3a..a45bc0f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; @@ -27,7 +26,6 @@ public class RingNotClosedError extends AbstractRingError { visitor.visit(this); } - @Serial private static final long serialVersionUID = 3327214274004406000L; } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java index 3fc1189..779008f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import org.xmlobjects.gml.model.geometry.DirectPosition; @@ -25,7 +24,6 @@ import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class RingSelfIntersectionError extends AbstractRingError { - @Serial private static final long serialVersionUID = 9103800366580888883L; private RingSelfIntType type; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java index 1f41556..3940c54 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java @@ -15,19 +15,16 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class RingTooFewPointsError extends AbstractRingError { - + + private static final long serialVersionUID = 8057350098649982235L; + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); visitor.visit(this); } - @Serial - private static final long serialVersionUID = 8057350098649982235L; - } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java index 3475d42..8d613e7 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class SemanticAttributeMissingError extends AbstractSemanticError { - @Serial private static final long serialVersionUID = 7157884749606290596L; private String childId; @@ -51,7 +48,7 @@ public class SemanticAttributeMissingError extends AbstractSemanticError { public void setGeneric(boolean generic) { this.generic = generic; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java index d0d0206..f880417 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java @@ -15,15 +15,12 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class SemanticAttributeWrongValueError extends AbstractSemanticError { - @Serial - private static final long serialVersionUID = 3478578364446339884L; - + private static final long serialVersionUID = 3478578364446339884L; + private String childId; private String attributeName; private boolean generic; @@ -51,6 +48,7 @@ public class SemanticAttributeWrongValueError extends AbstractSemanticError { public void setGeneric(boolean generic) { this.generic = generic; } + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java index 4e1c3d9..c6415ea 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java @@ -15,14 +15,11 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.properties.EdgeListProperty; import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class SolidNotClosedError extends AbstractSolidError { - @Serial private static final long serialVersionUID = 297029245173578437L; private EdgeListProperty edges; @@ -34,7 +31,7 @@ public class SolidNotClosedError extends AbstractSolidError { public void setEdges(EdgeListProperty edges) { this.edges = asChild(edges); } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java index 799e90a..46c595e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java @@ -15,13 +15,10 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class SolidSelfIntersectionError extends AbstractSolidError { - @Serial private static final long serialVersionUID = 5070991901664859830L; private String polygonId1; @@ -42,7 +39,7 @@ public class SolidSelfIntersectionError extends AbstractSolidError { public void setPolygonId2(String polygonId2) { this.polygonId2 = polygonId2; } - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java index 3ee2e16..7dd4bef 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java @@ -15,19 +15,16 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; - import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class SolidTooFewPolygonsError extends AbstractSolidError { - + @Override public void accept(ValidationErrorVisitor visitor) { super.accept(visitor); visitor.visit(this); } - @Serial - private static final long serialVersionUID = 1987841643971824973L; + private static final long serialVersionUID = 1987841643971824973L; } diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java index 9034217..349729e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -27,15 +26,14 @@ import de.hft.stuttgart.quality.model.properties.FeatureStatisticsProperty; public class Statistics extends GMLObject implements ADEObject { - @Serial - private static final long serialVersionUID = 2935590283116950203L; - - private FeatureStatisticsProperty numErrorBuildings; - private FeatureStatisticsProperty numErrorVegetation; - private FeatureStatisticsProperty numErrorLandObjects; - private FeatureStatisticsProperty numErrorBridgeObjects; - private FeatureStatisticsProperty numErrorWaterObjects; - private FeatureStatisticsProperty numErrorTransportation; + private static final long serialVersionUID = 2935590283116950203L; + + private FeatureStatisticsProperty numErrorBuildings; + private FeatureStatisticsProperty numErrorVegetation; + private FeatureStatisticsProperty numErrorLandObjects; + private FeatureStatisticsProperty numErrorBridgeObjects; + private FeatureStatisticsProperty numErrorWaterObjects; + private FeatureStatisticsProperty numErrorTransportation; private List errors; public FeatureStatisticsProperty getNumErrorBuildings() { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java index a880fce..2f26c40 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.time.ZonedDateTime; import org.citygml4j.core.model.ade.ADEObject; @@ -26,7 +25,6 @@ import de.hft.stuttgart.quality.model.properties.ValidationPlanProperty; public class Validation extends AbstractFeature implements ADEObject { - @Serial private static final long serialVersionUID = 7821104529898548535L; private ZonedDateTime validationDate; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java index 4b33144..3310549 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -28,7 +27,6 @@ import de.hft.stuttgart.quality.model.properties.RequirementProperty; public class ValidationPlan extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 434443226848485642L; private GlobalParametersProperty globalParameters; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java index e795e5f..8f0446c 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java @@ -15,7 +15,6 @@ */ package de.hft.stuttgart.quality.model.types; -import java.io.Serial; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; @@ -29,7 +28,6 @@ import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor; public class ValidationResult extends GMLObject implements ADEObject { - @Serial private static final long serialVersionUID = 4867627296196445082L; private Reference validationPlanID; diff --git a/public/0.1.4/qualityAde.xsd b/public/0.1.4/qualityAde.xsd new file mode 100644 index 0000000..0362e46 --- /dev/null +++ b/public/0.1.4/qualityAde.xsd @@ -0,0 +1,658 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab