reverts

Author: thomasturrell

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidator.java

@@ -13,9 +13,10 @@
  * The {@link ActivityDefinition} being validated must be valid.
  *
  * @author István Rátkai (Selindek)
+ *
  * @see <a href=
- *     "https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#activity-definition">Activity
- *     Definition</a>
+ *      "https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#activity-definition">Activity
+ *      Definition</a>
  */
 public class ActivityDefinitionValidator
     extends DisableableValidator<ValidActivityDefinition, ActivityDefinition> {
@@ -27,12 +28,10 @@ public boolean isValidIfEnabled(ActivityDefinition value, ConstraintValidatorCon
       return true;
     }
 
-    return !(value.getInteractionType() == null
-        && (value.getCorrectResponsesPattern() != null
-            || value.getChoices() != null
-            || value.getScale() != null
-            || value.getSource() != null
-            || value.getTarget() != null
-            || value.getSteps() != null));
+    return !(value.getInteractionType() == null && (value.getCorrectResponsesPattern() != null
+        || value.getChoices() != null || value.getScale() != null || value.getSource() != null
+        || value.getTarget() != null || value.getSteps() != null));
+
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ActorValidator.java

@@ -16,6 +16,7 @@
  * The {@link StatementObject} being validated must be valid.
  *
  * @author István Rátkai (Selindek)
+ *
  * @see <a href="https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#actor">Actor</a>
  */
 public class ActorValidator extends DisableableValidator<ValidActor, Object> {
@@ -29,17 +30,15 @@ public class ActorValidator extends DisableableValidator<ValidActor, Object> {
   public boolean isValidIfEnabled(Object value, ConstraintValidatorContext context) {
 
     if (value instanceof final Group group) {
-      return group.getAccount() == null
-              && group.getMbox() == null
-              && group.getMboxSha1sum() == null
-              && group.getOpenid() == null
-          ? group.getMember() != null && !group.getMember().isEmpty()
-          : hasSingleIdentifier(group);
+      return group.getAccount() == null && group.getMbox() == null && group.getMboxSha1sum() == null
+          && group.getOpenid() == null ? group.getMember() != null && !group.getMember().isEmpty()
+              : hasSingleIdentifier(group);
     } else if (value instanceof final Agent agent) {
       return hasSingleIdentifier(agent);
     }
 
     return true;
+
   }
 
   private boolean hasSingleIdentifier(Actor value) {
@@ -61,4 +60,5 @@ private boolean hasSingleIdentifier(Actor value) {
 
     return n == 1;
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidator.java

@@ -30,5 +30,7 @@ public boolean isValidIfEnabled(Actor value, ConstraintValidatorContext context)
     final var group = (Group) value;
     // ... or must be an anonymous Group with exactly two members
     return group.isAnonymous() && group.getMember().size() == 2;
+
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUri.java

@@ -24,5 +24,7 @@ public boolean isValidIfEnabled(URI value, ConstraintValidatorContext context) {
     }
 
     return value.getScheme() != null;
+
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/MboxValidator.java

@@ -14,13 +14,16 @@
  *
  * @author Thomas Turrell-Croft
  * @author István Rátkai (Selindek)
+ *
  * @see <a href="http://xmlns.com/foaf/0.1/#term_mbox">Mbox</a>
  */
 public class MboxValidator extends DisableableValidator<Mbox, String> {
 
   public static final String PREFIX = "mailto:";
 
-  /** Cached email validator instance to avoid repeated object creation. */
+  /**
+   * Cached email validator instance to avoid repeated object creation.
+   */
   private static final EmailValidator EMAIL_VALIDATOR = new EmailValidator();
 
   @Override
@@ -37,4 +40,5 @@ public boolean isValidIfEnabled(String value, ConstraintValidatorContext context
     return value.startsWith(PREFIX)
         && EMAIL_VALIDATOR.isValid(value.substring(PREFIX.length()), context);
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidator.java

@@ -24,5 +24,7 @@ public boolean isValidIfEnabled(Locale value, ConstraintValidatorContext context
     }
 
     return !value.toLanguageTag().equalsIgnoreCase("und");
+
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidator.java

@@ -12,8 +12,9 @@
  * The Float being validated must be a valid scaled score.
  *
  * @author István Rátkai (Selindek)
+ *
  * @see <a href="https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#details-13">xAPI Score
- *     details</a>
+ *      details</a>
  */
 public class ScaledScoreValidator extends DisableableValidator<ScaledScore, Float> {
 
@@ -26,4 +27,5 @@ public boolean isValidIfEnabled(Float value, ConstraintValidatorContext context)
 
     return value >= -1F && value <= 1F;
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/ScoreValidator.java

@@ -26,4 +26,5 @@ public boolean isValidIfEnabled(Score value, ConstraintValidatorContext context)
     return (value.getMax() == null || value.getMax() >= value.getRaw())
         && (value.getMin() == null || value.getMin() <= value.getRaw());
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidator.java

@@ -12,23 +12,24 @@
 
 /**
  * The Statement being validated must have a valid platform.
- *
- * <p>If context.platform present, then object must be an {@link Activity}.
+ * <p>
+ * If context.platform present, then object must be an {@link Activity}.
+ * </p>
  *
  * @author Thomas Turrell-Croft
  * @author István Rátkai (Selindek)
+ *
  * @see <a href="https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#requirements-10">
- *     Statement Context Requirements</a>
+ *      Statement Context Requirements</a>
  */
 public class StatementPlatformValidator
     extends DisableableValidator<ValidStatementPlatform, CoreStatement> {
 
   @Override
   public boolean isValidIfEnabled(CoreStatement value, ConstraintValidatorContext context) {
 
-    return value == null
-        || value.getContext() == null
-        || value.getContext().getPlatform() == null
+    return value == null || value.getContext() == null || value.getContext().getPlatform() == null
         || value.getObject() instanceof Activity;
   }
+
 }

xapi-model/src/main/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidator.java

@@ -12,23 +12,24 @@
 
 /**
  * The Statement being validated must have a valid revision.
- *
- * <p>If context.revision present, then object must be an {@link Activity}.
+ * <p>
+ * If context.revision present, then object must be an {@link Activity}.
+ * </p>
  *
  * @author Thomas Turrell-Croft
  * @author István Rátkai (Selindek)
+ *
  * @see <a href="https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#requirements-10">
- *     Statement Context Requirements</a>
+ *      Statement Context Requirements</a>
  */
 public class StatementRevisionValidator
     extends DisableableValidator<ValidStatementRevision, CoreStatement> {
 
   @Override
   public boolean isValidIfEnabled(CoreStatement value, ConstraintValidatorContext context) {
 
-    return value == null
-        || value.getContext() == null
-        || value.getContext().getRevision() == null
+    return value == null || value.getContext() == null || value.getContext().getRevision() == null
         || value.getObject() instanceof Activity;
   }
+
 }