Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore - Refactor utils files #4220

Merged
merged 17 commits into from
Apr 9, 2024
Merged

Chore - Refactor utils files #4220

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1fb6d89
Chore - refactor util files for separation of concerns
Mar 29, 2024
a230b8d
Chore - fix merge conflicst with refactoring and import long form str…
Mar 29, 2024
49f953d
Chore - remove unused code from refactor
Mar 29, 2024
90a66f2
Chore - remove extra code added by jetbrains
Mar 29, 2024
91ec784
Chore - rename all new files to have CodeTransform prefix
Mar 29, 2024
4bfd00a
Chore - remove testing if statement
Mar 29, 2024
c3177f2
Merge branch 'main' into chore/refactor-utils
Apr 2, 2024
ca8046c
Chore - revert feedback dialog constructor
Apr 2, 2024
124b77f
Chore - refactor folder location since upstream refactor moved our re…
Apr 2, 2024
4e44fce
Chore - fix detekt issues
Apr 3, 2024
1ee0abd
Chore - fix bad import in util file
Apr 4, 2024
a25a768
Merge branch 'main' into chore/refactor-utils
Apr 4, 2024
7e24ef8
Chore - fix util import in FeatureDevClient
Apr 4, 2024
665370a
Merge branch 'main' into chore/refactor-utils
Apr 4, 2024
77d65d1
Chore - add missing import post merge
Apr 4, 2024
4144179
Merge branch 'main' into chore/refactor-utils
Apr 8, 2024
7a9216b
Merge branch 'main' into chore/refactor-utils
Apr 9, 2024
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
14 changes: 12 additions & 2 deletions ...-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClien
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
import software.aws.toolkits.jetbrains.services.codemodernizer.summary.CodeModernizerSummaryEditorProvider
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.TROUBLESHOOTING_URL_DOWNLOAD_DIFF
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTroubleshootingGuideNotificationAction
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
import software.aws.toolkits.resources.message
Expand Down Expand Up @@ -152,7 +154,11 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
message("codemodernizer.notification.warn.view_diff_failed.title"),
message("codemodernizer.notification.warn.view_diff_failed.content"),
project,
listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_DOWNLOAD_DIFF)),
listOf(
openTroubleshootingGuideNotificationAction(
TROUBLESHOOTING_URL_DOWNLOAD_DIFF
)
),
)
}

Expand All @@ -162,7 +168,11 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
message("codemodernizer.notification.warn.view_summary_failed.title"),
message("codemodernizer.notification.warn.view_summary_failed.content"),
project,
listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_DOWNLOAD_DIFF)),
listOf(
openTroubleshootingGuideNotificationAction(
TROUBLESHOOTING_URL_DOWNLOAD_DIFF
)
),
)
}

Expand Down
10 changes: 10 additions & 0 deletions ...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModerni
import software.aws.toolkits.jetbrains.services.codemodernizer.state.StateFlags
import software.aws.toolkits.jetbrains.services.codemodernizer.state.buildState
import software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeModernizerBottomToolWindowFactory
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_WHERE_PLAN_EXIST
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.TROUBLESHOOTING_URL_MAVEN_COMMANDS
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.TROUBLESHOOTING_URL_PREREQUISITES
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getModuleOrProjectNameForFile
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getSupportedBuildFilesWithSupportedJdk
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getSupportedJavaMappings
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getSupportedModules
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isGradleProject
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTroubleshootingGuideNotificationAction
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
import software.aws.toolkits.jetbrains.ui.feedback.CodeTransformFeedbackDialog
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
import software.aws.toolkits.jetbrains.utils.notifyStickyError
Expand Down
9 changes: 7 additions & 2 deletions ...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCo
import software.aws.toolkits.jetbrains.services.codemodernizer.model.ZipCreationResult
import software.aws.toolkits.jetbrains.services.codemodernizer.plan.CodeModernizerPlanEditorProvider
import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_AFTER_INITIAL_BUILD
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_AFTER_STARTED
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_WHERE_JOB_STOPPED_PRE_PLAN_READY
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_WHERE_PLAN_EXIST
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getModuleOrProjectNameForFile
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.pollTransformationStatusAndPlan
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.toTransformationLanguage
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession
import software.aws.toolkits.resources.message
import software.aws.toolkits.telemetry.CodeTransformApiNames
Expand Down Expand Up @@ -448,6 +455,4 @@ class CodeModernizerSession(

fun getActiveJobId() = state.currentJobId
fun fetchPlan(lastJobId: JobId) = clientAdaptor.getCodeModernizationPlan(lastJobId)

fun didJobStart() = state.currentJobId != null
}
9 changes: 8 additions & 1 deletion .../software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationResult
import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeTransformTelemetryState
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getJavaVersionFromProjectSetting
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getMavenVersion
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
import software.aws.toolkits.telemetry.CodeTransformApiNames
import software.aws.toolkits.telemetry.CodeTransformCancelSrcComponents
import software.aws.toolkits.telemetry.CodeTransformJavaSourceVersionsAllowed
Expand Down Expand Up @@ -93,7 +97,10 @@ class CodeTransformTelemetryManager(private val project: Project) {
codeTransformJobId = jobId?.toString(),
codeTransformSessionId = sessionId,
codeTransformResultStatusMessage = codeTransformResultStatusMessage,
codeTransformRunTimeLatency = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime(), Instant.now()),
codeTransformRunTimeLatency = calculateTotalLatency(
CodeTransformTelemetryState.instance.getStartTime(),
Instant.now()
),
codeTransformLocalJavaVersion = getJavaVersionFromProjectSetting(project),
codeTransformLocalMavenVersion = getMavenVersion(project),
)
Expand Down
286 changes: 0 additions & 286 deletions ...mmunity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformUtils.kt
View file
Open in desktop

This file was deleted.

Loading
Loading