Refactor: requested changes.

Author: lmasroca

client-java/instrumentation-shared/src/main/java/org/evomaster/client/java/instrumentation/shared/StringSpecializationInfo.java

@@ -53,6 +53,10 @@ public TaintType getType() {
         return type;
     }
 
+    /**
+     * Getter for regex flags bitmask, only meaningful when stringSpecialization is regex type. Defaults to 0 (no flags)
+     * @return Integer bitmask for the regex flags associated to the string.
+     */
     public int getRegexFlags() { return regexFlags; }
 
     @Override

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/coverage/methodreplacement/classes/MatcherClassReplacement.java

@@ -48,9 +48,9 @@ public static boolean matches(Matcher caller, String idTemplate) {
 
         String text = getText(caller);
         String pattern = caller.pattern().toString();
-        int flags = caller.pattern().flags();
+        int regexFlags = caller.pattern().flags();
 
-        boolean patternMatchesResult = PatternMatchingHelper.matches(pattern, flags, text, idTemplate);
+        boolean patternMatchesResult = PatternMatchingHelper.matches(pattern, regexFlags, text, idTemplate);
 
         TaintType taintType = ExecutionTracer.getTaintType(text);
 
@@ -60,7 +60,7 @@ public static boolean matches(Matcher caller, String idTemplate) {
              */
             String regex = caller.pattern().toString();
             ExecutionTracer.addStringSpecialization(text,
-                    new StringSpecializationInfo(StringSpecialization.REGEX_WHOLE, regex, taintType, flags));
+                    new StringSpecializationInfo(StringSpecialization.REGEX_WHOLE, regex, taintType, regexFlags));
         }
         boolean matcherMatchesResults = caller.matches();
         assert (patternMatchesResult == matcherMatchesResults);
@@ -73,7 +73,7 @@ public static boolean find(Matcher caller, String idTemplate) {
 
         String input = getText(caller);
         String regex = caller.pattern().toString();
-        int flags = caller.pattern().flags();
+        int regexFlags = caller.pattern().flags();
         int end;
         try {
             end = caller.end();
@@ -106,7 +106,7 @@ match the regex, and find() only requires
         TaintType taintType = ExecutionTracer.getTaintType(substring);
         if (taintType.isTainted()) {
             ExecutionTracer.addStringSpecialization(substring,
-                    new StringSpecializationInfo(StringSpecialization.REGEX_PARTIAL, regex, taintType, flags));
+                    new StringSpecializationInfo(StringSpecialization.REGEX_PARTIAL, regex, taintType, regexFlags));
         }
 
         String anyPositionRegexMatch = RegexSharedUtils.handlePartialMatch(regex);

core/src/main/kotlin/org/evomaster/core/parser/RegexHandler.kt

@@ -4,6 +4,7 @@ import org.antlr.v4.runtime.*
 import org.antlr.v4.runtime.misc.ParseCancellationException
 import org.evomaster.core.search.gene.regex.RegexGene
 import org.evomaster.core.utils.RegexFlags
+import org.evomaster.core.utils.RegexWithFlags
 
 
 /**
@@ -20,14 +21,14 @@ object RegexHandler {
         WARNING mutable static state, but those are just caches.
         Key -> regex
      */
-    private val cacheJVM : MutableMap<Pair<String, RegexFlags>, RegexGene> = mutableMapOf()
+    private val cacheJVM : MutableMap<RegexWithFlags, RegexGene> = mutableMapOf()
     private val cacheEcma262 : MutableMap<String, RegexGene> = mutableMapOf()
     private val cachePostgresLike : MutableMap<String, RegexGene> = mutableMapOf()
     private val cachePostgresSimilarTo : MutableMap<String, RegexGene> = mutableMapOf()
 
     fun createGeneForJVM(regex: String, flags: RegexFlags = RegexFlags()) : RegexGene {
 
-        val key = Pair(regex, flags)
+        val key = RegexWithFlags(regex, flags)
         if(cacheJVM.contains(key)){
             return cacheJVM[key]!!.copy() as RegexGene
         }

core/src/main/kotlin/org/evomaster/core/search/gene/string/StringGene.kt

@@ -36,7 +36,7 @@ import org.evomaster.core.search.service.Randomness
 import org.evomaster.core.search.service.mutator.MutationWeightControl
 import org.evomaster.core.search.service.mutator.genemutation.AdditionalGeneMutationInfo
 import org.evomaster.core.search.service.mutator.genemutation.SubsetGeneMutationSelectionStrategy
-import org.evomaster.core.utils.RegexFlags
+import org.evomaster.core.utils.RegexWithFlags
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.lang.IllegalStateException
@@ -817,7 +817,7 @@ class StringGene(
                         } else {
                             RegexSharedUtils.handlePartialMatch(it.value)
                         }
-                        Pair(regex, RegexFlags.fromJavaFlags(it.regexFlags))
+                        RegexWithFlags(regex, it.regexFlags)
                     }
                     //.joinToString("|")
                     .forEach {(regex, flags) ->

core/src/main/kotlin/org/evomaster/core/utils/RegexWithFlags.kt

@@ -0,0 +1,5 @@
+package org.evomaster.core.utils
+
+data class RegexWithFlags(val regex: String, val regexFlags: RegexFlags) {
+    constructor (regex: String, regexFlagInt: Int) : this(regex, RegexFlags.fromJavaFlags(regexFlagInt))
+}