fix(amazonq): loosen search strings (#5260)

* fix(amazonq): loosen search strings

* make field optional

---------

Co-authored-by: David Hasani <davhasan@amazon.com>

Author: dhasani23

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt

@@ -164,6 +164,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                 return if (javaModules.isNotEmpty()) {
                     ValidationResult(
                         true,
+                        metadata = "found ${javaModules.size} modules with SQL"
                     )
                 } else {
                     ValidationResult(

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt

@@ -58,6 +58,7 @@ class CodeTransformTelemetryManager(private val project: Project) {
             codeTransformPreValidationError = validationError,
             codeTransformBuildSystem = validationResult.buildSystem,
             codeTransformSessionId = sessionId,
+            codeTransformMetadata = validationResult.metadata,
             result = if (validationResult.valid) Result.Succeeded else Result.Failed,
             reason = if (validationResult.valid) null else validationResult.invalidTelemetryReason.additionalInfo,
         )

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt

@@ -6,10 +6,12 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.model
 import com.intellij.openapi.vfs.VirtualFile
 import software.aws.toolkits.telemetry.CodeTransformBuildSystem
 
+// TODO: combine a lot of these fields into the 'metadata' field
 data class ValidationResult(
     val valid: Boolean,
     val invalidTelemetryReason: InvalidTelemetryReason = InvalidTelemetryReason(),
     val validatedBuildFiles: List<VirtualFile> = emptyList(),
     val buildSystem: CodeTransformBuildSystem = CodeTransformBuildSystem.Unknown,
     val buildSystemVersion: String = "",
+    val metadata: String? = null,
 )

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformModuleUtils.kt

@@ -44,9 +44,8 @@ fun Module.tryGetJdkLanguageLevelJdk(): JavaSdkVersion? {
 // search for Strings that indicate embedded Oracle SQL statements are present
 fun containsSQL(contentRoot: VirtualFile): Boolean {
     val patterns = listOf(
-        "oracle.jdbc.OracleDriver",
-        "jdbc:oracle:thin:@",
-        "jdbc:oracle:oci:@",
+        "oracle.jdbc.",
+        "jdbc:oracle:",
         "jdbc:odbc:",
     )