From c40de533af81bef167b9e4d1d967313a47e0d283 Mon Sep 17 00:00:00 2001 From: Toki Date: Wed, 25 Sep 2024 19:30:38 +0900 Subject: [PATCH] error fix / update code --- lib/oto/commands/command.dart | 14 ++- lib/oto/commands/util/jira.dart | 48 ++++---- lib/oto/data/command_data.dart | 12 ++ lib/oto/data/command_data.g.dart | 205 ++++++++++++++----------------- lib/oto/data/jenkins_data.g.dart | 4 +- lib/oto/data/jira_data.g.dart | 4 +- 6 files changed, 142 insertions(+), 145 deletions(-) diff --git a/lib/oto/commands/command.dart b/lib/oto/commands/command.dart index 5be0e31..cbee057 100644 --- a/lib/oto/commands/command.dart +++ b/lib/oto/commands/command.dart @@ -371,9 +371,12 @@ abstract class Command { Future executeHandle(DataCommand command, ExeHandleData handleData) async { exeHandle = handleData; - try { + try + { return await execute(command); - } on Exception catch (e) { + } + on Exception catch (e) + { return await exeHandle!.pipelineFail!.execute(); } } @@ -425,7 +428,8 @@ abstract class Command { await setProperty(data.setResult!, resultMessage); } } - if (exeHandle == null) { + if(exeHandle == null) + { if (passExitCodesMerge.contains(exitCode)) { return simpleFuture; } else { @@ -435,7 +439,9 @@ abstract class Command { data.message = errorMessage; throw Exception(data); } - } else { + } + else + { if (passExitCodesMerge.contains(exitCode)) { return await exeHandle!.pipelineSuccess!.execute(); } else { diff --git a/lib/oto/commands/util/jira.dart b/lib/oto/commands/util/jira.dart index c0cd290..7fd874d 100644 --- a/lib/oto/commands/util/jira.dart +++ b/lib/oto/commands/util/jira.dart @@ -1,4 +1,3 @@ - // ignore_for_file: prefer_function_declarations_over_variables, avoid_init_to_null import 'dart:convert'; @@ -12,11 +11,11 @@ import 'package:oto_cli/oto/data/jira_data.dart'; class Jira extends Command { String? findContent(DataJiraContent? data) { - if(data != null) { - if(data.text != null) { + if (data != null) { + if (data.text != null) { return data.text; } else { - if(data.content != null && data.content!.isNotEmpty) { + if (data.content != null && data.content!.isNotEmpty) { return findContent(data.content!.first); } else { return null; @@ -32,8 +31,7 @@ class Jira extends Command { var data = DataJira.fromJson(command.param); var text = '${data.id}:${data.token}'; var base64 = base64Encode(utf8.encode(text)); - var header = - { + var header = { 'Content-Type': 'application/json', 'Authorization': 'Basic $base64' }; @@ -41,27 +39,25 @@ class Jira extends Command { print(url); var response = await http.get(Uri.parse(url), headers: header); - if(response.statusCode < 300 && response.statusCode >= 200) - { + if (response.statusCode < 300 && response.statusCode >= 200) { print(response.body); var issue = DataJiraIssue.fromJson(jsonDecode(response.body)); var targetUser = issue.fields?.assignee?.emailAddress; - if(targetUser != null) - { + if (targetUser != null) { var slackID = ''; - for(var user in data.users) { - if(targetUser.contains(user.mail!)) { + for (var user in data.users) { + if (targetUser.contains(user.mail!)) { slackID = user.slackID!; break; } } - if(slackID.isNotEmpty) { + if (slackID.isNotEmpty) { var arr = issue.fields?.description?.content; var summary = issue.fields?.summary; - if((arr != null && arr.isNotEmpty) || summary != null) { + if ((arr != null && arr.isNotEmpty) || summary != null) { String? content = ""; - if(arr != null && arr.isNotEmpty) { + if (arr != null && arr.isNotEmpty) { content = findContent(arr.first); content ??= summary!; } else { @@ -84,7 +80,8 @@ class Jira extends Command { blockSection = SlackBlockSection(); blockSection.text = SlackBlockText(); blockSection.text!.type = SlackTextType.mrkdwn; - blockSection.text!.text = '*<$browseUrl|${data.issue}> ${issue.fields?.summary}*'; + blockSection.text!.text = + '*<$browseUrl|${data.issue}> ${issue.fields?.summary}*'; attachment.blocks!.add(blockSection); blockSection = SlackBlockSection(); @@ -97,27 +94,24 @@ class Jira extends Command { blockSection.accessory!.text!.type = SlackTextType.plain_text; blockSection.accessory!.text!.text = 'Open'; attachment.blocks!.add(blockSection); - + slackData.attachments!.add(attachment); return slackData; }; - setReturn(data.return_slack_data, getData(slackID)); + // setReturn(data.return_slack_data, getData(slackID)); - if(data.sub_channel != null) { - setReturn(data.return_slack_channel, getData(data.sub_channel!)); - } + // if(data.sub_channel != null) { + // setReturn(data.return_slack_channel, getData(data.sub_channel!)); + // } } } else { print('User not found'); } } - - } - else - { + } else { throw Exception('Request Jira API Faile: $url'); } - + return simpleFuture; } -} \ No newline at end of file +} diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index b52ca07..24ed508 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -681,6 +681,18 @@ class DataJsonReaderFile extends DataParam { Map toJson() => _$DataJsonReaderFileToJson(this); } +@JsonSerializable() +class DataExecuteApp { + late String executable; + late String desktopServicePath; + + DataExecuteApp(); + + factory DataExecuteApp.fromJson(Map json) => + _$DataExecuteAppFromJson(json); + Map toJson() => _$DataExecuteAppToJson(this); +} + @JsonSerializable() class DataPair { late String from; diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 5e3a792..d0fd7ce 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -91,9 +91,8 @@ const _$CommandTypeEnumMap = { DataParam _$DataParamFromJson(Map json) => DataParam() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String?; @@ -108,7 +107,7 @@ DataSimpleCommand _$DataSimpleCommandFromJson(Map json) => DataSimpleCommand() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -125,9 +124,8 @@ Map _$DataSimpleCommandToJson(DataSimpleCommand instance) => DataPrint _$DataPrintFromJson(Map json) => DataPrint() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..message = json['message'] as String; @@ -142,9 +140,8 @@ Map _$DataPrintToJson(DataPrint instance) => { DataSetValue _$DataSetValueFromJson(Map json) => DataSetValue() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..values_int = json['values-int'] as Map? @@ -168,7 +165,7 @@ DataAppDataCreator _$DataAppDataCreatorFromJson(Map json) => DataAppDataCreator() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -204,7 +201,7 @@ DataBuildMSBuild _$DataBuildMSBuildFromJson(Map json) => DataBuildMSBuild() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -238,7 +235,7 @@ DataBuildDart _$DataBuildDartFromJson(Map json) => DataBuildDart() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -257,7 +254,7 @@ DataBuildFlutter _$DataBuildFlutterFromJson(Map json) => DataBuildFlutter() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -283,7 +280,7 @@ DataBuildDartCompile _$DataBuildDartCompileFromJson( DataBuildDartCompile() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -307,7 +304,7 @@ DataBuildDotNet _$DataBuildDotNetFromJson(Map json) => DataBuildDotNet() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -324,9 +321,8 @@ Map _$DataBuildDotNetToJson(DataBuildDotNet instance) => DataBuildiOS _$DataBuildiOSFromJson(Map json) => DataBuildiOS() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..scheme = json['scheme'] as String @@ -370,9 +366,8 @@ const _$BuildPlatformEnumMap = { DataCodeSign _$DataCodeSignFromJson(Map json) => DataCodeSign() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..appPath = json['appPath'] as String @@ -394,7 +389,7 @@ DataCodeSignVerify _$DataCodeSignVerifyFromJson(Map json) => DataCodeSignVerify() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -413,7 +408,7 @@ DataProductBuild _$DataProductBuildFromJson(Map json) => DataProductBuild() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -440,9 +435,8 @@ Map _$DataProductBuildToJson(DataProductBuild instance) => DataNotarize _$DataNotarizeFromJson(Map json) => DataNotarize() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..macPassword = json['macPassword'] as String @@ -470,7 +464,7 @@ DataArchiveiOS _$DataArchiveiOSFromJson(Map json) => DataArchiveiOS() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -495,7 +489,7 @@ DataExportiOS _$DataExportiOSFromJson(Map json) => DataExportiOS() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -518,7 +512,7 @@ DataPublishiOS _$DataPublishiOSFromJson(Map json) => DataPublishiOS() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -549,13 +543,12 @@ Map _$DataPublishiOSToJson(DataPublishiOS instance) => DataUploader _$DataUploaderFromJson(Map json) => DataUploader() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..sftp = json['sftp'] as bool - ..port = (json['port'] as num).toInt() + ..port = json['port'] as int ..host = json['host'] as String ..user = json['user'] as String ..password = json['password'] as String @@ -577,9 +570,8 @@ Map _$DataUploaderToJson(DataUploader instance) => DataCopy _$DataCopyFromJson(Map json) => DataCopy() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..ignorePattern = (json['ignorePattern'] as List?) @@ -602,9 +594,8 @@ Map _$DataCopyToJson(DataCopy instance) => { DataDelete _$DataDeleteFromJson(Map json) => DataDelete() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..ignorePattern = (json['ignorePattern'] as List?) @@ -624,9 +615,8 @@ Map _$DataDeleteToJson(DataDelete instance) => DataRename _$DataRenameFromJson(Map json) => DataRename() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..ignorePattern = (json['ignorePattern'] as List?) @@ -648,7 +638,7 @@ DataFileDiffCheck _$DataFileDiffCheckFromJson(Map json) => DataFileDiffCheck() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -668,9 +658,8 @@ Map _$DataFileDiffCheckToJson(DataFileDiffCheck instance) => DataFileRead _$DataFileReadFromJson(Map json) => DataFileRead() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..path = json['path'] as String @@ -690,7 +679,7 @@ DataFileWrite _$DataFileWriteFromJson(Map json) => DataFileWrite() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -711,7 +700,7 @@ DataDirectoryCreate _$DataDirectoryCreateFromJson(Map json) => DataDirectoryCreate() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -731,7 +720,7 @@ DataSlackSender _$DataSlackSenderFromJson(Map json) => DataSlackSender() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -754,7 +743,7 @@ DataSlackBuild _$DataSlackBuildFromJson(Map json) => DataSlackBuild() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -793,9 +782,8 @@ const _$SlackBuildTypeEnumMap = { DataJira _$DataJiraFromJson(Map json) => DataJira() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..id = json['id'] as String @@ -826,9 +814,8 @@ Map _$DataJiraToJson(DataJira instance) => { DataJiraUser _$DataJiraUserFromJson(Map json) => DataJiraUser() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..mail = json['mail'] as String? @@ -846,9 +833,8 @@ Map _$DataJiraUserToJson(DataJiraUser instance) => DataZip _$DataZipFromJson(Map json) => DataZip() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..zipFile = json['zipFile'] as String @@ -866,9 +852,8 @@ Map _$DataZipToJson(DataZip instance) => { DataShell _$DataShellFromJson(Map json) => DataShell() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..commands = @@ -886,7 +871,7 @@ DataShellFile _$DataShellFileFromJson(Map json) => DataShellFile() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -903,9 +888,8 @@ Map _$DataShellFileToJson(DataShellFile instance) => DataGit _$DataGitFromJson(Map json) => DataGit() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..commands = @@ -921,9 +905,8 @@ Map _$DataGitToJson(DataGit instance) => { DataGitPush _$DataGitPushFromJson(Map json) => DataGitPush() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..branch = json['branch'] as String?; @@ -941,7 +924,7 @@ DataGitCheckout _$DataGitCheckoutFromJson(Map json) => DataGitCheckout() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -960,9 +943,8 @@ Map _$DataGitCheckoutToJson(DataGitCheckout instance) => DataGitCount _$DataGitCountFromJson(Map json) => DataGitCount() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..setValue = json['setValue'] as String; @@ -978,9 +960,8 @@ Map _$DataGitCountToJson(DataGitCount instance) => DataGitRev _$DataGitRevFromJson(Map json) => DataGitRev() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..branch = json['branch'] as String? @@ -998,9 +979,8 @@ Map _$DataGitRevToJson(DataGitRev instance) => DataGitHub _$DataGitHubFromJson(Map json) => DataGitHub() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..commands = @@ -1020,7 +1000,7 @@ DataGitHubPullRequestCreate _$DataGitHubPullRequestCreateFromJson( DataGitHubPullRequestCreate() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1049,7 +1029,7 @@ DataGitHubPullRequestList _$DataGitHubPullRequestListFromJson( DataGitHubPullRequestList() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1076,7 +1056,7 @@ DataGitHubPullRequestClose _$DataGitHubPullRequestCloseFromJson( DataGitHubPullRequestClose() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1094,9 +1074,8 @@ Map _$DataGitHubPullRequestCloseToJson( DataProtobuf _$DataProtobufFromJson(Map json) => DataProtobuf() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..commands = @@ -1115,7 +1094,7 @@ DataJsonReader _$DataJsonReaderFromJson(Map json) => DataJsonReader() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1138,7 +1117,7 @@ DataJsonReaderFile _$DataJsonReaderFileFromJson(Map json) => DataJsonReaderFile() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1157,6 +1136,17 @@ Map _$DataJsonReaderFileToJson(DataJsonReaderFile instance) => 'pair': instance.pair, }; +DataExecuteApp _$DataExecuteAppFromJson(Map json) => + DataExecuteApp() + ..executable = json['executable'] as String + ..desktopServicePath = json['desktopServicePath'] as String; + +Map _$DataExecuteAppToJson(DataExecuteApp instance) => + { + 'executable': instance.executable, + 'desktopServicePath': instance.desktopServicePath, + }; + DataPair _$DataPairFromJson(Map json) => DataPair() ..from = json['from'] as String ..setValue = json['setValue'] as String; @@ -1168,9 +1158,8 @@ Map _$DataPairToJson(DataPair instance) => { DataAwsCli _$DataAwsCliFromJson(Map json) => DataAwsCli() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..subCommand = json['sub-command'] as String @@ -1188,9 +1177,8 @@ Map _$DataAwsCliToJson(DataAwsCli instance) => DataDocker _$DataDockerFromJson(Map json) => DataDocker() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..command = json['command'] as String @@ -1208,9 +1196,8 @@ Map _$DataDockerToJson(DataDocker instance) => DataGradle _$DataGradleFromJson(Map json) => DataGradle() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..args = (json['args'] as List).map((e) => e as String).toList(); @@ -1228,12 +1215,12 @@ DataStringSub _$DataStringSubFromJson(Map json) => DataStringSub() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? - ..startIndex = (json['startIndex'] as num?)?.toInt() - ..lastIndex = (json['lastIndex'] as num?)?.toInt() + ..startIndex = json['startIndex'] as int? + ..lastIndex = json['lastIndex'] as int? ..text = json['text'] as String ..setValue = json['setValue'] as String; @@ -1253,7 +1240,7 @@ DataStringReplace _$DataStringReplaceFromJson(Map json) => DataStringReplace() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1276,9 +1263,8 @@ Map _$DataStringReplaceToJson(DataStringReplace instance) => DataWebBase _$DataWebBaseFromJson(Map json) => DataWebBase() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..url = json['url'] as String @@ -1306,9 +1292,8 @@ Map _$DataWebBaseToJson(DataWebBase instance) => DataWebFile _$DataWebFileFromJson(Map json) => DataWebFile() ..workspace = json['workspace'] as String? - ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) - .toList() + ..passExitCodes = + (json['passExitCodes'] as List?)?.map((e) => e as int).toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? ..url = json['url'] as String @@ -1344,7 +1329,7 @@ DataProcessPortUse _$DataProcessPortUseFromJson(Map json) => DataProcessPortUse() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1365,7 +1350,7 @@ DataProcessRun _$DataProcessRunFromJson(Map json) => DataProcessRun() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? @@ -1386,7 +1371,7 @@ DataProcessKill _$DataProcessKillFromJson(Map json) => DataProcessKill() ..workspace = json['workspace'] as String? ..passExitCodes = (json['passExitCodes'] as List?) - ?.map((e) => (e as num).toInt()) + ?.map((e) => e as int) .toList() ..setResult = json['setResult'] as String? ..setExitCode = json['setExitCode'] as String? diff --git a/lib/oto/data/jenkins_data.g.dart b/lib/oto/data/jenkins_data.g.dart index 6d390dc..921400c 100644 --- a/lib/oto/data/jenkins_data.g.dart +++ b/lib/oto/data/jenkins_data.g.dart @@ -14,8 +14,8 @@ DataCommon _$DataCommonFromJson(Map json) => DataCommon() ..jobUrl = json['jobUrl'] as String ..jobName = json['jobName'] as String ..gitCommit = json['gitCommit'] as String - ..buildNumber = (json['buildNumber'] as num).toInt() - ..buildID = (json['buildID'] as num).toInt() + ..buildNumber = json['buildNumber'] as int + ..buildID = json['buildID'] as int ..buildDisplayName = json['buildDisplayName'] as String ..gitBranch = json['gitBranch'] as String ..buildTag = json['buildTag'] as String; diff --git a/lib/oto/data/jira_data.g.dart b/lib/oto/data/jira_data.g.dart index d30682c..1ff06fd 100644 --- a/lib/oto/data/jira_data.g.dart +++ b/lib/oto/data/jira_data.g.dart @@ -102,7 +102,7 @@ DataJiraIssueStatusCategory _$DataJiraIssueStatusCategoryFromJson( Map json) => DataJiraIssueStatusCategory() ..self = json['self'] as String? - ..id = (json['id'] as num?)?.toInt() + ..id = json['id'] as int? ..key = json['key'] as String? ..colorName = json['colorName'] as String? ..name = json['name'] as String?; @@ -141,7 +141,7 @@ Map _$DataJiraUserToJson(DataJiraUser instance) => DataJiraIssueDesc _$DataJiraIssueDescFromJson(Map json) => DataJiraIssueDesc() - ..version = (json['version'] as num?)?.toInt() + ..version = json['version'] as int? ..doc = json['doc'] as String? ..content = (json['content'] as List?) ?.map((e) => DataJiraContent.fromJson(e as Map))