remove support for annotations

core/src/main/java/org/mobilitydata/gtfsvalidator/notice/Notice.java

@@ -64,12 +64,21 @@ public SeverityLevel getSeverityLevel() {
    *
    * @return notice code, e.g., "foreign_key_violation".
    */
-  public String getCode() {
+  public static String getCode(String classSimpleName) {
     return StringUtils.removeEnd(
         CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, classSimpleName),
         NOTICE_SUFFIX);
   }
 
+  /**
+   * Returns a descriptive type-specific name for this notice based on the class simple name.
+   *
+   * @return notice code, e.g., "foreign_key_violation".
+   */
+  public String getCode() {
+    return getCode(getClass().getSimpleName());
+  }
+
   @Override
   public boolean equals(Object other) {
     if (this == other) {

core/src/main/java/org/mobilitydata/gtfsvalidator/notice/NoticeSchemaGenerator.java

@@ -23,23 +23,18 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.io.IOException;
-import java.lang.annotation.AnnotationFormatError;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Parameter;
 import java.sql.JDBCType;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import org.mobilitydata.gtfsvalidator.annotation.SchemaExport;
 import org.mobilitydata.gtfsvalidator.exception.ConstructorParametersInconsistencyException;
 import org.mobilitydata.gtfsvalidator.type.GtfsColor;
 import org.mobilitydata.gtfsvalidator.type.GtfsDate;
@@ -215,20 +210,18 @@ private static JsonObject extractMainNoticesProperties(String validatorPackageNa
 
   /**
    * Return a {@code JsonArray} that contains information about the type of each parameter of a
-   * {@code ValidationNotice} using the constructors of the class that are annotated by {@code
-   * SchemaExport}.
+   * {@code ValidationNotice} using the constructors of the class.
    *
    * @param validationNoticeSubClass the {@code ValidationNotice} sub class to extract information
    *                                 from
    * @return a {@code JsonArray} that contains information about the type of each parameter of said
-   * {@code ValidationNotice} using the constructors of the class that are annotated by {@code
-   * SchemaExport}.
+   * {@code ValidationNotice} using the constructors of the class.
    * @throws ConstructorParametersInconsistencyException if two notice constructors defines the same
    *                                                     parameter with different types.
    */
   private static JsonArray extractNoticeProperties(Class<?> validationNoticeSubClass)
       throws ConstructorParametersInconsistencyException {
-    List<Constructor<?>> constructors = getAnnotatedConstructors(validationNoticeSubClass);
+    Constructor<?>[] constructors = validationNoticeSubClass.getDeclaredConstructors();
     JsonArray parametersAsJsonArray = new JsonArray();
     Map<String, Parameter> parameterMap = new TreeMap<>();
     for (Constructor<?> constructor : constructors) {
@@ -277,32 +270,4 @@ private static String mapDataType(Parameter parameter) {
             parameter.getType().getSimpleName().toUpperCase()))
         .getName();
   }
-
-  /**
-   * Returns the annotated constructors of a {@code ValidationNotice} subclass. Throws {@code
-   * AnnotationFormatError} if the {@code ValidationNotice} subclass does not define a constructor
-   * for schema export i.e. no constructor for the given class uses {@code SchemaExport}
-   * annotation.
-   *
-   * @param clazz the class to extract the annotated constructor from
-   * @return the annotated constructors of a {@code ValidationNotice} subclass. Throws {@code
-   * AnnotationFormatError} if the {@code ValidationNotice} subclass does not define a constructor
-   * for schema export i.e. no constructor for the given class uses {@code SchemaExport}
-   * annotation.
-   */
-  private static List<Constructor<?>> getAnnotatedConstructors(Class<?> clazz) {
-    List<Constructor<?>> constructors = new ArrayList<>();
-    for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
-      if (constructor.isAnnotationPresent(SchemaExport.class)) {
-        constructors.add(constructor);
-      }
-    }
-    if (constructors.size() == 0) {
-      throw new AnnotationFormatError(
-          String.format(
-              "Validation notice %s does not define constructor for schema export",
-              clazz.getSimpleName()));
-    }
-    return constructors;
-  }
 }

core/src/test/java/org/mobilitydata/gtfsvalidator/notice/NoticeSchemaGeneratorTest.java

@@ -1,16 +1,12 @@
 package org.mobilitydata.gtfsvalidator.notice;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
-import java.lang.annotation.AnnotationFormatError;
 import org.junit.Test;
 import org.mobilitydata.gtfsvalidator.exception.ConstructorParametersInconsistencyException;
 import org.mobilitydata.gtfsvalidator.notice.sample.AnotherTestValidationNotice;
-import org.mobilitydata.gtfsvalidator.notice.sample.mismatching_types.MismatchingTypesNotice;
-import org.mobilitydata.gtfsvalidator.notice.sample.no_annotation.NoAnnotationNotice;
 import org.mobilitydata.gtfsvalidator.validator.sample.SampleTestValidator;
 
 public class NoticeSchemaGeneratorTest {
@@ -104,29 +100,4 @@ public void exportNoticesSchema()
             + "}"
     );
   }
-
-  @Test
-  public void noAnnotationOnNotice_throwsException() {
-    AnnotationFormatError exception = assertThrows(AnnotationFormatError.class,
-        () -> NoticeSchemaGenerator.export(
-            true,
-            ImmutableList.of(NoAnnotationNotice.class.getPackage().getName()),
-            ImmutableList.of(SampleTestValidator.class.getPackage().getName())));
-    assertThat(exception.getMessage()).matches(String
-        .format("Validation notice %s does not define constructor for schema export",
-            NoAnnotationNotice.class.getSimpleName()));
-  }
-
-  @Test
-  public void mismatchingTypesInNoticeConstructor_throwsException() {
-    ConstructorParametersInconsistencyException exception = assertThrows(ConstructorParametersInconsistencyException.class,
-        () -> NoticeSchemaGenerator.export(
-            true,
-            ImmutableList.of(MismatchingTypesNotice.class.getPackage().getName()),
-            ImmutableList.of(SampleTestValidator.class.getPackage().getName())));
-    assertThat(exception.getMessage()).matches(String
-        .format(
-            "Validation notice %s defines parameter %s with different types in its constructors.",
-            MismatchingTypesNotice.class.getSimpleName(), "parameterWithWrongType"));
-  }
 }

core/src/test/java/org/mobilitydata/gtfsvalidator/notice/sample/AnotherTestValidationNotice.java

@@ -16,8 +16,6 @@
 
 package org.mobilitydata.gtfsvalidator.notice.sample;
 
-import com.google.common.collect.ImmutableMap;
-import org.mobilitydata.gtfsvalidator.annotation.SchemaExport;
 import org.mobilitydata.gtfsvalidator.notice.SeverityLevel;
 import org.mobilitydata.gtfsvalidator.notice.ValidationNotice;
 import org.mobilitydata.gtfsvalidator.type.GtfsColor;
@@ -29,35 +27,42 @@
  */
 public class AnotherTestValidationNotice extends ValidationNotice {
 
-  @SchemaExport
+  private final String filename;
+  private final Long csvRowNumber;
+  private final String fieldName;
+  private final Double otherFieldValue;
+  private final Object fieldValue;
+  private final GtfsDate sampleDate;
+  private final GtfsTime sampleTime;
+  private final GtfsColor sampleColor;
+  private final Integer integerValue;
+
   public AnotherTestValidationNotice(String filename, long csvRowNumber, String fieldName,
       Object fieldValue, double otherFieldValue, GtfsDate sampleDate, GtfsTime sampleTime,
       GtfsColor sampleColor) {
-    super(new ImmutableMap.Builder<String, Object>()
-            .put("filename", filename)
-            .put("csvRowNumber", csvRowNumber)
-            .put("fieldName", fieldName)
-            .put("otherFieldValue", otherFieldValue)
-            .put("fieldValue", fieldValue)
-            .put("sampleDate", sampleDate)
-            .put("sampleTime", sampleTime)
-            .put("sampleColor", sampleColor)
-            .build(),
-        SeverityLevel.WARNING);
+    super(SeverityLevel.WARNING);
+    this.filename = filename;
+    this.csvRowNumber = csvRowNumber;
+    this.fieldName = fieldName;
+    this.otherFieldValue = otherFieldValue;
+    this.fieldValue = fieldValue;
+    this.sampleDate = sampleDate;
+    this.sampleTime = sampleTime;
+    this.sampleColor = sampleColor;
+    this.integerValue = null;
   }
 
-  @SchemaExport
   public AnotherTestValidationNotice(String filename, long csvRowNumber, String fieldName,
       Object fieldValue, GtfsTime sampleTime, GtfsColor sampleColor, int integerValue) {
-    super(new ImmutableMap.Builder<String, Object>()
-            .put("filename", filename)
-            .put("csvRowNumber", csvRowNumber)
-            .put("fieldName", fieldName)
-            .put("fieldValue", fieldValue)
-            .put("sampleTime", sampleTime)
-            .put("sampleColor", sampleColor)
-            .put("integerValue", integerValue)
-            .build(),
-        SeverityLevel.WARNING);
+    super(SeverityLevel.WARNING);
+    this.filename = filename;
+    this.csvRowNumber = csvRowNumber;
+    this.fieldValue = fieldValue;
+    this.fieldName = fieldName;
+    this.sampleTime = sampleTime;
+    this.sampleColor = sampleColor;
+    this.integerValue = integerValue;
+    this.sampleDate = null;
+    this.otherFieldValue = null;
   }
 }

core/src/test/java/org/mobilitydata/gtfsvalidator/notice/sample/SomeTestValidationNotice.java

@@ -15,25 +15,24 @@
  */
 package org.mobilitydata.gtfsvalidator.notice.sample;
 
-import com.google.common.collect.ImmutableMap;
-import org.mobilitydata.gtfsvalidator.annotation.SchemaExport;
 import org.mobilitydata.gtfsvalidator.notice.SeverityLevel;
 import org.mobilitydata.gtfsvalidator.notice.ValidationNotice;
 
 /**
  * {@code ValidationNotice} defined for tests purpose.
  */
 public class SomeTestValidationNotice extends ValidationNotice {
+  private final String filename;
+  private final long csvRowNumber;
+  private final String fieldName;
+  private final Object fieldValue;
 
-  @SchemaExport
   public SomeTestValidationNotice(String filename, long csvRowNumber, String fieldName,
       Object fieldValue, SeverityLevel severityLevel) {
-    super(new ImmutableMap.Builder<String, Object>()
-            .put("filename", filename)
-            .put("csvRowNumber", csvRowNumber)
-            .put("fieldName", fieldName)
-            .put("fieldValue", fieldValue)
-            .build(),
-        severityLevel);
+    super(severityLevel);
+    this.filename = filename;
+    this.csvRowNumber = csvRowNumber;
+    this.fieldName = fieldName;
+    this.fieldValue = fieldValue;
   }
 }

core/src/test/java/org/mobilitydata/gtfsvalidator/validator/sample/SampleTestValidator.java

@@ -16,10 +16,8 @@
 
 package org.mobilitydata.gtfsvalidator.validator.sample;
 
-import com.google.common.collect.ImmutableMap;
 import javax.inject.Inject;
 import org.mobilitydata.gtfsvalidator.annotation.GtfsValidator;
-import org.mobilitydata.gtfsvalidator.annotation.SchemaExport;
 import org.mobilitydata.gtfsvalidator.notice.NoticeContainer;
 import org.mobilitydata.gtfsvalidator.notice.SeverityLevel;
 import org.mobilitydata.gtfsvalidator.notice.ValidationNotice;
@@ -41,14 +39,13 @@ public void validate(NoticeContainer noticeContainer) {
   }
 
   static class NestedTestValidatorNotice extends ValidationNotice {
+    private final String tripId;
+    private final Long csvRowNumber;
 
-    @SchemaExport
     NestedTestValidatorNotice(String tripId, long csvRowNumber) {
-      super(new ImmutableMap.Builder<String, Object>()
-              .put("tripId", tripId)
-              .put("csvRowNumber", csvRowNumber)
-              .build(),
-          SeverityLevel.WARNING);
+      super(SeverityLevel.WARNING);
+      this.tripId = tripId;
+      this.csvRowNumber = csvRowNumber;
     }
   }
 }