Merge branch 'dev' into 'master'

Version 3.15.0

See merge request !8

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/HealingID.java

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
-public class HealingID {
+public record HealingID(String idString) {
 	
 	public static final HealingID S_GEOMETRIC_SIMPLIFIER = new HealingID("S_GEOMETRIC_SIMPLIFIER");
 	public static final HealingID S_ALL_POLYGONS_WRONG_ORIENTATION = new HealingID("S_ALL_POLYGONS_WRONG_ORIENTATION");
@@ -38,12 +38,6 @@ public class HealingID {
 	public static final HealingID S_NOT_CLOSED_CPP = new HealingID("S_NOT_CLOSED_CPP");
 	public static final HealingID SE_POLYGON_WITHOUT_SURFACE = new HealingID("SE_POLYGON_WITHOUT_SURFACE");
 
-	private String idString;
-	
-	public HealingID(String idString) {
-		this.idString = idString;
-	}
-
 	@Override
 	public String toString() {
 		return "HealingID [idString=" + idString + "]";
@@ -67,11 +61,8 @@ public class HealingID {
 			return false;
 		HealingID other = (HealingID) obj;
 		if (idString == null) {
-			if (other.idString != null)
-				return false;
-		} else if (!idString.equals(other.idString))
-			return false;
-		return true;
+            return other.idString == null;
+		} else return idString.equals(other.idString);
     }
 	
 	

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/HealingMethod.java

@@ -60,6 +60,7 @@ import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
  * @author Matthias Betz
  *
  */
+@SuppressWarnings("unused")
 public interface HealingMethod {
 	
 	

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/QualityAdeErrorVisitor.java

@@ -91,7 +91,7 @@ import de.hft.stuttgart.quality.model.types.ValidationResult;
 
 public class QualityAdeErrorVisitor implements ErrorVisitor {
 	
-	private ValidationResult res;
+	private final ValidationResult res;
 	
 	public QualityAdeErrorVisitor(ValidationResult res) {
 		this.res = res;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,6 +26,7 @@ import java.util.List;
 
 public class Requirement implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = -590639811553512803L;
 
 	private static final String DISTANCE_TOLERANCE = "distanceTolerance";
@@ -90,8 +92,8 @@ public class Requirement implements Serializable {
 
 	}
 
-	private String id;
-	private RequirementType type;
+	private final String id;
+	private final RequirementType type;
 	private List<DefaultParameter> parameters;
 
 	public Requirement(String id, RequirementType type) {
@@ -126,11 +128,8 @@ public class Requirement implements Serializable {
 			return false;
 		Requirement other = (Requirement) obj;
 		if (id == null) {
-			if (other.id != null)
-				return false;
-		} else if (!id.equals(other.id))
-			return false;
-		return true;
+            return other.id == null;
+		} else return id.equals(other.id);
     }
 
 	@Override

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Unit.java

@@ -31,8 +31,8 @@ public enum Unit {
 
 	KWH("kWh", "kWh"), METER("m", "m"), SQUARE_METER("m²", "m2"), CUBIC_METER("m³", "m3"), RADIAN(Localization.getText("Unit.Radian"), "rad"), NONE("", null), DEGREE(Localization.getText("Unit.Degree"), "deg");
 
-	private String representation;
-	private String gmlRep;
+	private final String representation;
+	private final String gmlRep;
 
 	private Unit(String rep, String gmlRep) {
 		representation = rep;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AllPolygonsWrongOrientationError.java

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 /**
  * Error when all polygons are oriented wrong.
  * 
@@ -36,9 +38,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
  */
 public class AllPolygonsWrongOrientationError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 2263993313732858840L;
 	
-	private Geometry geom;
+	private final Geometry geom;
 
 	public AllPolygonsWrongOrientationError(Geometry geom) {
 		this.geom = geom;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AttributeInvalidError.java

@@ -28,15 +28,18 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 public class AttributeInvalidError implements CheckError {
 	
+	@Serial
 	private static final long serialVersionUID = 346311592089394220L;
 
 	public static final ErrorId ID = new ErrorId("SE_ATTRIBUTE_INVALID");
 
-	private CityObject co;
-	private String childId;
-	private String nameOfAttribute;
+	private final CityObject co;
+	private final String childId;
+	private final String nameOfAttribute;
 
 	public AttributeInvalidError(CityObject co, String childId, String nameOfAttribute) {
 		this.co = co;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AttributeMissingError.java

@@ -28,15 +28,18 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 public class AttributeMissingError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 185026674309965067L;
 
 	public static final ErrorId ID = new ErrorId("SE_ATTRIBUTE_MISSING");
 
-	private CityObject co;
-	private String childId;
-	private String nameOfAttribute;
+	private final CityObject co;
+	private final String childId;
+	private final String nameOfAttribute;
 
 	public AttributeMissingError(CityObject co, String childId, String nameOfAttribute) {
 		this.co = co;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AttributeValueWrongError.java

@@ -28,15 +28,18 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 public class AttributeValueWrongError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 6106964709204961560L;
 
 	public static final ErrorId ID = new ErrorId("SE_ATTRIBUTE_WRONG_VALUE");
 
-	private CityObject co;
-	private String childId;
-	private String nameOfAttribute;
+	private final CityObject co;
+	private final String childId;
+	private final String nameOfAttribute;
 
 	public AttributeValueWrongError(CityObject co, String childId, String nameOfAttribute) {
 		this.co = co;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/ConsecutivePointSameError.java

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 
+import java.io.Serial;
+
 /**
  * When two points are too close to each other and are consecutive in a linear
  * ring, this error is created.
@@ -38,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
  */
 public class ConsecutivePointSameError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -6355935751554777494L;
 	
-	private LinearRing lr;
-	private Vertex p1;
-	private Vertex p2;
+	private final LinearRing lr;
+	private final Vertex p1;
+	private final Vertex p2;
 
 	public ConsecutivePointSameError(LinearRing lr, Vertex p1, Vertex p2) {
 		this.lr = lr;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/DegeneratedRingError.java

@@ -28,11 +28,14 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 
+import java.io.Serial;
+
 public class DegeneratedRingError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 865493182529055651L;
 
-	private LinearRing lr;
+	private final LinearRing lr;
 	
 	public DegeneratedRingError(LinearRing lr) {
 		this.lr = lr;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/DependenciesNotMetError.java

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.HealingMethod;
 import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 /**
  * When a check checks if it can be executed but one or more dependency has
  * found an error this check can also not be executed. This error is created in
@@ -39,9 +41,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
  */
 public class DependenciesNotMetError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -851655185949574160L;
 	
-	private CheckId dependency;
+	private final CheckId dependency;
 
 	public DependenciesNotMetError(CheckId dependency) {
 		this.dependency = dependency;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/MultipleConnectedComponentsError.java

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -40,10 +41,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class MultipleConnectedComponentsError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 2152069835068857036L;
 	
-	private Geometry geom;
-	private List<List<Polygon>> components;
+	private final Geometry geom;
+	private final List<List<Polygon>> components;
 
 	public MultipleConnectedComponentsError(Geometry geom, List<List<Polygon>> components) {
 		this.geom = geom;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NestedRingError.java

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * If an inner ring is with in the boundaries of another, this error is created.
  * 
@@ -37,11 +39,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NestedRingError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3396113374745830193L;
 	
-	private Polygon p;
-	private LinearRing innerRing;
-	private LinearRing withinRing;
+	private final Polygon p;
+	private final LinearRing innerRing;
+	private final LinearRing withinRing;
 
 	public NestedRingError(Polygon p, LinearRing innerRing, LinearRing withinRing) {
 		this.p = p;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonManifoldEdgeError.java

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -39,10 +40,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
  */
 public class NonManifoldEdgeError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -6742948557014332402L;
 	
-	private List<Edge> edges;
-	private Geometry geom;
+	private final List<Edge> edges;
+	private final Geometry geom;
 
 	public NonManifoldEdgeError(Geometry geom, List<Edge> edges) {
 		this.edges = edges;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonManifoldVertexError.java

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -41,11 +42,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
  */
 public class NonManifoldVertexError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3915669943428175777L;
 	
-	private List<List<Polygon>> components;
-	private Geometry geom;
-	private Vertex v;
+	private final List<List<Polygon>> components;
+	private final Geometry geom;
+	private final Vertex v;
 
 	public NonManifoldVertexError(Geometry geom, List<List<Polygon>> components, Vertex v) {
 		this.geom = geom;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonPlanarPolygonDistancePlaneError.java

@@ -31,6 +31,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.math.Plane;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 
+import java.io.Serial;
+
 /**
  * Error object for planarity errors containing the polygon, the regression
  * plane and the distance to the plane.
@@ -40,12 +42,13 @@ import de.hft.stuttgart.citydoctor2.utils.Localization;
  */
 public class NonPlanarPolygonDistancePlaneError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3504364055236383519L;
 	
-	private Polygon p;
-	private double distance;
-	private Vertex v;
-	private Plane plane;
+	private final Polygon p;
+	private final double distance;
+	private final Vertex v;
+	private final Plane plane;
 
 	public NonPlanarPolygonDistancePlaneError(Polygon p, double distance, Vertex v, Plane plane) {
 		this.p = p;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonPlanarPolygonNormalsDeviation.java

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * When the normal of the triangles created from the triangulation of the
  * polygon have a too large angle between them, this error is created.
@@ -37,10 +39,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NonPlanarPolygonNormalsDeviation implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 69073161885265794L;
 	
-	private Polygon p;
-	private double deviation;
+	private final Polygon p;
+	private final double deviation;
 
 	public NonPlanarPolygonNormalsDeviation(Polygon p, double deviation) {
 		this.p = p;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NotCeilingError.java

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * If a boundary surface is infact not a ceiling even though it was defined as
  * one.
@@ -38,10 +40,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NotCeilingError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 6725904270389419696L;
-	
-	private BoundarySurface surface;
-	private Polygon p;
+	private final BoundarySurface surface;
+	private final Polygon p;
 
 	public NotCeilingError(BoundarySurface bs, Polygon p) {
 		surface = bs;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NotFloorError.java

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * When a boundary surface is not a floor even though it was defined as one.
  * 
@@ -37,10 +39,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NotFloorError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3193557053834977449L;
 	
-	private BoundarySurface surface;
-	private Polygon p;
+	private final BoundarySurface surface;
+	private final Polygon p;
 
 	public NotFloorError(BoundarySurface bs, Polygon p) {
 		surface = bs;