Enforce the checkstyle JavadocType rule

mrigger · mrigger · commit 3b3ae42bacfa · 2020-08-13T23:21:38.000+02:00
diff --git a/configs/checkstyle.xml b/configs/checkstyle.xml
@@ -81,7 +81,7 @@
 		<!-- See https://checkstyle.org/config_javadoc.html -->
 		<module name="InvalidJavadocPosition" />
 		<!-- <module name="JavadocMethod"/> -->
-		<!-- <module name="JavadocType"/> <module name="JavadocVariable"/> <module 
+		<module name="JavadocType"/> <!-- <module name="JavadocVariable"/> <module
 			name="JavadocStyle"/> <module name="MissingJavadocMethod"/> -->
 
 		<!-- Checks for Naming Conventions. -->
diff --git a/src/sqlancer/GlobalState.java b/src/sqlancer/GlobalState.java
@@ -12,7 +12,9 @@
  * Represents a global state that is valid for a testing session on a given database.
  *
  * @param <O>
- *            the option parameter.
+ *            the option parameter
+ * @param <S>
+ *            the schema parameter
  */
 public abstract class GlobalState<O extends DBMSSpecificOptions<?>, S> {
 
diff --git a/src/sqlancer/common/oracle/TernaryLogicPartitioningOracleBase.java b/src/sqlancer/common/oracle/TernaryLogicPartitioningOracleBase.java
@@ -1,5 +1,6 @@
 package sqlancer.common.oracle;
 
+import sqlancer.GlobalState;
 import sqlancer.common.gen.ExpressionGenerator;
 import sqlancer.common.query.ExpectedErrors;
 
@@ -10,8 +11,10 @@
  *
  * @param <E>
  *            the expression type
+ * @param <S>
+ *            the global state type
  */
-public abstract class TernaryLogicPartitioningOracleBase<E, S> implements TestOracle {
+public abstract class TernaryLogicPartitioningOracleBase<E, S extends GlobalState<?, ?>> implements TestOracle {
 
     protected E predicate;
     protected E negatedPredicate;
