[ignore] Minor code cleanup

Author: adamretter

csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/AllErrorsMetaDataValidator.scala

@@ -29,10 +29,10 @@ trait AllErrorsMetaDataValidator extends MetaDataValidator {
         val row = rows.next()
         val result = validateRow(row, schema, Some(rows.hasNext))
         /*
-        **  Only store the results if they contain a warning or a failure.  This means the validator is not limited by the available memory 
-        **  when processing large files.
-        */
-        if (containsErrors(result) || containsWarnings(result) ) {
+        Only store the results if they contain a warning or a failure.  This means the validator is not limited by the
+        available memory when processing large files.
+         */
+        if (containsErrors(result) || containsWarnings(result)) {
             validateRows(result :: results)
          } else {
             validateRows(results)
@@ -69,4 +69,4 @@ trait AllErrorsMetaDataValidator extends MetaDataValidator {
       if(isWarningDirective) toWarnings(ruleResult, row.lineNumber, columnIndex) else toErrors(ruleResult, row.lineNumber, columnIndex)
     }}.sequence[MetaDataValidation, Any]
   }
-}
+}

csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/FailFastMetaDataValidator.scala

@@ -34,10 +34,10 @@ trait FailFastMetaDataValidator extends MetaDataValidator {
         val row = rows.next()
         val result = validateRow(row, schema, Some(rows.hasNext))
         /*
-        **  Only store the results if they contain a warning or a failure.  This means the validator is not limited by the available memory 
-        **  when processing large files.
+        Only store the results if they contain a warning or a failure.  This means the validator is not limited by the
+        available memory when processing large files.
         */
-        if (containsErrors(result) || containsWarnings(result) ) {           
+        if (containsErrors(result) || containsWarnings(result)) {
           validateRows(result :: results)
          } else {
             validateRows(results)

csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/schema/Rule.scala

@@ -98,35 +98,29 @@ abstract class Rule(name: String, val argProviders: ArgProvider*) extends Positi
 
 }
 
-/** 
- *  This object is a place to store the precompilled regexs
- *  @author Jess Flanagan 
+/**
+ * This object is a place to store the precompiled regexs
+ * @author Jess Flanagan
  */
-object RegexCache
-{
+object RegexCache {
   val cache  = collection.mutable.Map[String, Pattern]()
 
-/** 
- *  This function returns compiled regexs. 
- *  First we check to see if its already in the cache. Otherwise we compile it, add it to the cache and return the 
- *  compiled version. This results in a significant speed up for processing large files.
- *  @param pattern A regex pattern string.
- *  @returns A compiled representation of a regular expression.
- *  @author Jess Flanagan 
- */
-  def getCompiledRegex(pattern: String): Pattern ={
-    if (!cache.contains(pattern)){
-       cache += (pattern -> Pattern.compile(pattern)) 
-    }
-    cache(pattern);
-  }
+  /**
+   * This function returns compiled regexs.
+   * First we check to see if its already in the cache. Otherwise we compile it, add it to the cache and return the
+   * compiled version. This results in a significant speed up for processing large files.
+   * @param pattern A regex pattern string.
+   *
+   * @return A compiled representation of a regular expression.
+   * @author Jess Flanagan
+   */
+  def getCompiledRegex(pattern: String): Pattern = cache.getOrElseUpdate(pattern, Pattern.compile(pattern))
 }
 
 abstract class PatternRule(name: String, pattern: String) extends Rule(name) {
   // Uses the cache to retrieve a compiled regex representation for the pattern string.
-  override def valid(cellValue: String, columnDefinition: ColumnDefinition, columnIndex: Int, row: Row, schema: Schema, mayBeLast: Option[Boolean] = None): Boolean ={
+  override def valid(cellValue: String, columnDefinition: ColumnDefinition, columnIndex: Int, row: Row, schema: Schema, mayBeLast: Option[Boolean] = None): Boolean = {
     RegexCache.getCompiledRegex(pattern).matcher(cellValue).matches()
-
   }
 }
 

csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/schema/v1_0/Rule.scala

@@ -94,20 +94,15 @@ case class IfRule(condition: Rule, rules: List[Rule], elseRules: Option[List[Rul
 
 abstract class PatternRule(name: String, pattern: String) extends Rule(name) {
   // Uses the cache to retrieve a compiled regex representation for the pattern string.
-  override def valid(cellValue: String, columnDefinition: ColumnDefinition, columnIndex: Int, row: Row, schema: Schema, mayBeLast: Option[Boolean] = None): Boolean ={
+  override def valid(cellValue: String, columnDefinition: ColumnDefinition, columnIndex: Int, row: Row, schema: Schema, mayBeLast: Option[Boolean] = None): Boolean = {
     RegexCache.getCompiledRegex(pattern).matcher(cellValue).matches()
-
   }
-
 }
 
 case class RegExpRule(regex: String) extends Rule("regex") {
   override def valid(cellValue: String, columnDefinition: ColumnDefinition, columnIndex: Int, row: Row, schema: Schema, mayBeLast: Option[Boolean] = None): Boolean = {
-
     val regexp = if (columnDefinition.directives.contains(IgnoreCase())) "(?i)" + regex else regex
-    
     RegexCache.getCompiledRegex(regexp).matcher(cellValue).matches()
-
   }
 
   override def toError = {