Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
)

Expand Down
Loading