Refactor: Rename AbstractCheck

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/AbstractCheck.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/AbstractVisitor.java

@@ -30,7 +30,7 @@ import java.util.Set;
  * @author Matthias Betz
  *
  */
-public abstract class AbstractCheck extends Check {
+public abstract class AbstractVisitor extends Check {
 
 	@Override
 	public Set<Requirement> appliesToRequirements() {

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

@@ -26,7 +26,7 @@ import java.util.Map;
 
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
 import de.hft.stuttgart.citydoctor2.utils.visitors.CheckableErrorCollector;
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.ClearMetaInformationVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsAnyErrorVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsErrorVisitor;
@@ -232,7 +232,7 @@ public abstract class Checkable implements Serializable {
 	 * Clears the checkResults list of this checkable and all child objects in its datastructure.
 	 */
 	public final void clearAllContainedCheckResults() {
-		this.accept(new ClearCheckResultsVisitor());
+		this.accept(new ClearVisitorResultsVisitor());
 	}
 
 	/**

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java

@@ -18,7 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException;
@@ -147,7 +147,7 @@ public class CityDoctorModel {
         folder.mkdirs();
         createFeatureStream().forEach(co -> {
             Map<Lod, Set<Polygon>> polygonMap = new EnumMap<>(Lod.class);
-            Check c = new AbstractCheck() {
+            Check c = new AbstractVisitor() {
 
                 @Override
                 public void check(Geometry geom) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CheckableErrorCollector.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 
@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * This Visitor collects all CheckErrors in the datastructure of a checkable.
  */
-public class CheckableErrorCollector extends AbstractCheck {
+public class CheckableErrorCollector extends AbstractVisitor {
 
     List<CheckError> errors;
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 
 import java.util.HashSet;
@@ -9,7 +9,7 @@ import java.util.Set;
 /**
  * This Visitor collects all sub-CityObjects that are in the datastructure of a CityObject (including itself) in a Set.
  */
-public class CityObjectCollector extends AbstractCheck {
+public class CityObjectCollector extends AbstractVisitor {
 
     private final Set<CityObject> objects = new HashSet<>();
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearMetaInformationVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 
 /**
  * This Visitor removes the metadata created by the {@link PrepareForCheckingVisitor} for the low-memory consumption mode.
  */
-public class ClearMetaInformationVisitor extends AbstractCheck {
+public class ClearMetaInformationVisitor extends AbstractVisitor {
 
     @Override
     public void check(Geometry geometry) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearCheckResultsVisitor.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearVisitorResultsVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 
 /**
  * This Visitor removes the check results from a CityObject and the objects in its datastructure.
  */
-public class ClearCheckResultsVisitor extends AbstractCheck {
+public class ClearVisitorResultsVisitor extends AbstractVisitor {
 
     @Override
     public void check(Checkable checkable) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
 import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
@@ -11,7 +11,7 @@ import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
  * This visitor's check method terminates early by throwing an unchecked {@link CheckErrorFound},
  * use {@link #checkObject(Checkable) ContainsAnyErrorVisitor.checkObject(Checkable)} to handle the Throwable.
  */
-public class ContainsAnyErrorVisitor extends AbstractCheck {
+public class ContainsAnyErrorVisitor extends AbstractVisitor {
 
     /**
      * Checks if a Checkable, or any Object in its datastructure, contains any error.

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
@@ -12,7 +12,7 @@ import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
  * This visitor's check method terminates early by throwing an unchecked {@link CheckErrorFound},
  * use {@link #checkObject(Checkable, CheckId) ContainsAnyErrorVisitor.checkObject(Checkable, CheckId)} to handle the Throwable.
  */
-public class ContainsErrorVisitor extends AbstractCheck {
+public class ContainsErrorVisitor extends AbstractVisitor {
 
     private CheckId checkId;
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/GmlGeometryRebuilder.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -11,7 +11,7 @@ import java.util.Objects;
  * This Visitor recreates the Geometries of the original CityGml object from the associated Geometries in CityDoctor's
  * internal model.
  */
-public class GmlGeometryRebuilder extends AbstractCheck {
+public class GmlGeometryRebuilder extends AbstractVisitor {
 
     private final GeometryFactory factory;
     private final ParserConfiguration config;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/PrepareForCheckingVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 
 /**
  * This Visitor prepares the {@link Geometry Geometries} in a Checkable for low-memory consumption mode.
  */
-public class PrepareForCheckingVisitor extends AbstractCheck {
+public class PrepareForCheckingVisitor extends AbstractVisitor {
 
     @Override
     public void check(Geometry geom) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java

 package de.hft.stuttgart.citydoctor2.utils.visitors;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
 
 /**
  * This Visitor removes the GmlGeometries from the linked original GmlObjects in a CityObject's datastructure to reduce
  * memory bloat.
  */
-public class UnsetGeometriesVisitor extends AbstractCheck {
+public class UnsetGeometriesVisitor extends AbstractVisitor {
 
 
     @Override

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java

@@ -24,7 +24,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -32,9 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder;
-import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import org.citygml4j.core.model.construction.WallSurface;
 import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -43,7 +40,7 @@ import org.mockito.Mockito;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
 import org.xmlobjects.gml.model.geometry.primitives.SolidProperty;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -62,7 +59,7 @@ public class AbstractBuildingTest {
 		AtomicInteger abCounter = new AtomicInteger(0);
 		AtomicInteger bsCounter = new AtomicInteger(0);
 		AtomicInteger biCounter = new AtomicInteger(0);
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 
 			@Override
 			public void check(AbstractBuilding ab) {
@@ -79,7 +76,7 @@ public class AbstractBuildingTest {
 		assertEquals(1, bsCounter.intValue());
 		assertEquals(0, biCounter.intValue());
 
-		AbstractCheck c2 = new AbstractCheck() {
+		AbstractVisitor c2 = new AbstractVisitor() {
 
 			@Override
 			public void check(Installation bi) {
@@ -109,7 +106,7 @@ public class AbstractBuildingTest {
 		ab.addBoundarySurface(mockBSurface);
 		ab.addGeometry(mockGeometry);
 
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 		};
 		ab.accept(c);
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoomTest.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -50,7 +50,7 @@ public class AbstractRoomTest {
         abRoom.addBoundarySurface(mockBoundarySurface);
         abRoom.addGeometry(geometry);
 
-        AbstractCheck c = new AbstractCheck() {
+        AbstractVisitor c = new AbstractVisitor() {
         };
         abRoom.accept(c);
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -52,7 +52,7 @@ public class AbstractTunnelTest {
         at.addBoundarySurface(mockBoundarySurface);
         at.addGeometry(mockGeometry);
 
-        AbstractCheck c = new AbstractCheck() {
+        AbstractVisitor c = new AbstractVisitor() {
         };
         at.accept(c);
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java

@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
 import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder;
 import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import org.citygml4j.core.model.construction.AbstractConstructionSurface;
@@ -41,7 +41,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -58,7 +58,7 @@ public class BoundarySurfaceTest {
 		Opening oMock = Mockito.mock(Opening.class);
 		bs.addOpening(oMock);
 
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 		};
 		bs.accept(c);
 
@@ -71,7 +71,7 @@ public class BoundarySurfaceTest {
 		Opening oMock = Mockito.mock(Opening.class);
 		bs.addOpening(oMock);
 		AtomicInteger bsCounter = new AtomicInteger(0);
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 
 			@Override
 			public void check(BoundarySurface bs) {
@@ -89,7 +89,7 @@ public class BoundarySurfaceTest {
 		Opening oMock = Mockito.mock(Opening.class);
 		bs.addOpening(oMock);
 		AtomicInteger bsCounter = new AtomicInteger(0);
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 
 			@Override
 			public void check(BridgeObject bo) {
@@ -142,7 +142,7 @@ public class BoundarySurfaceTest {
 		assertFalse(bs.getAllCheckResults().isEmpty());
 		bs.addOpening(oMock);
 		bs.clearAllContainedCheckResults();
-		verify(oMock).accept(any(ClearCheckResultsVisitor.class));
+		verify(oMock).accept(any(ClearVisitorResultsVisitor.class));
 		assertTrue(bs.getAllCheckResults().isEmpty());
 	}
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java

@@ -39,7 +39,7 @@ import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.citygml4j.core.visitor.ObjectVisitor;
 import org.junit.Test;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -58,7 +58,7 @@ public class BridgeObjectTest {
 		bo.addBoundarySurface(new BoundarySurface(null));
 		AtomicInteger boCounter = new AtomicInteger(0);
 		AtomicInteger bsCounter = new AtomicInteger(0);
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 
 			@Override
 			public void check(BridgeObject bo) {
@@ -75,7 +75,7 @@ public class BridgeObjectTest {
 		assertEquals(1, bsCounter.intValue());
 
 		AtomicInteger boCounter2 = new AtomicInteger(0);
-		c = new AbstractCheck() {
+		c = new AbstractVisitor() {
 		};
 		bo.accept(c);
 		assertEquals(0, boCounter2.intValue());
@@ -101,7 +101,7 @@ public class BridgeObjectTest {
 		bo.addBoundarySurface(bsMock);
 		bo.addGeometry(geomMock);
 
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 		};
 		bo.accept(c);
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingTest.java

@@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import org.citygml4j.core.model.construction.RoofSurface;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -151,7 +151,7 @@ public class BuildingTest {
 		bp.addStorey(mockStorey);
 
 
-		AbstractCheck c = new AbstractCheck() {
+		AbstractVisitor c = new AbstractVisitor() {
 		};
 		b.accept(c);
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/CityObjectTest.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -31,7 +31,7 @@ public class CityObjectTest {
         Geometry mockGeometry = mock(Geometry.class);
         co.addGeometry(mockGeometry);
 
-        AbstractCheck check = new AbstractCheck() {
+        AbstractVisitor check = new AbstractVisitor() {
         };
 
         co.accept(check);

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObjectTest.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -30,7 +30,7 @@ public class GenericCityObjectTest {
         gco.addBoundarySurface(mockSurface);
         gco.addGeometry(mockGeometry);
 
-        AbstractCheck c = new AbstractCheck() {
+        AbstractVisitor c = new AbstractVisitor() {
         };
         gco.accept(c);