Skip to content

Commit 4407e9d

Browse files
authored
[CQ] fix nullability problems for flutter/analytics (#8294)
Fix nullability problems in `src/io/flutter/analytics/`. See #8291. If we pursue #8292, we could mark `src/io/flutter/analytics/` as null-"clean". --- - [x] I’ve reviewed the contributor guide and applied the relevant portions to this PR. <details> <summary>Contribution guidelines:</summary><br> - See our [contributor guide]([https://github.com/dart-lang/sdk/blob/main/CONTRIBUTING.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview) for general expectations for PRs. - Larger or significant changes should be discussed in an issue before creating a PR. - Dart contributions to our repos should follow the [Dart style guide](https://dart.dev/guides/language/effective-dart) and use `dart format`. - Java and Kotlin contributions should strive to follow Java and Kotlin best practices ([discussion](#8098)). </details>
1 parent db377ef commit 4407e9d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

flutter-idea/src/io/flutter/analytics/UnifiedAnalytics.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public void manageConsent() {
7070
}
7171
}
7272

73-
private CompletableFuture<JsonObject> makeUnifiedAnalyticsRequest(String requestName,
74-
@NotNull DartToolingDaemonService service,
75-
@NotNull JsonObject params) {
73+
private @NotNull CompletableFuture<JsonObject> makeUnifiedAnalyticsRequest(String requestName,
74+
@NotNull DartToolingDaemonService service,
75+
@NotNull JsonObject params) {
7676
CompletableFuture<JsonObject> finalResult = new CompletableFuture<>();
7777
try {
7878
service.sendRequest("UnifiedAnalytics." + requestName, params, false, object -> {
@@ -90,7 +90,7 @@ private CompletableFuture<JsonObject> makeUnifiedAnalyticsRequest(String request
9090
return finalResult;
9191
}
9292

93-
private @Nullable CompletableFuture<Boolean> telemetryEnabled(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
93+
private @NotNull CompletableFuture<Boolean> telemetryEnabled(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
9494
return makeUnifiedAnalyticsRequest("telemetryEnabled", service, params).thenCompose(result -> {
9595
assert result != null;
9696
JsonPrimitive value = result.getAsJsonPrimitive("value");
@@ -104,7 +104,7 @@ private CompletableFuture<JsonObject> makeUnifiedAnalyticsRequest(String request
104104
});
105105
}
106106

107-
private @Nullable CompletableFuture<Boolean> clientShowedMessage(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
107+
private @NotNull CompletableFuture<Boolean> clientShowedMessage(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
108108
return makeUnifiedAnalyticsRequest("clientShowedMessage", service, params).thenCompose(result -> {
109109
assert result != null;
110110
JsonPrimitive type = result.getAsJsonPrimitive("type");
@@ -118,9 +118,9 @@ private CompletableFuture<JsonObject> makeUnifiedAnalyticsRequest(String request
118118
});
119119
}
120120

121-
private @Nullable CompletableFuture<Boolean> setTelemetry(@NotNull DartToolingDaemonService service,
122-
@NotNull JsonObject params,
123-
Boolean canSendAnalytics) {
121+
private @NotNull CompletableFuture<Boolean> setTelemetry(@NotNull DartToolingDaemonService service,
122+
@NotNull JsonObject params,
123+
Boolean canSendAnalytics) {
124124
params.addProperty("enable", canSendAnalytics);
125125
return makeUnifiedAnalyticsRequest("setTelemetry", service, params).thenCompose(result -> {
126126
assert result != null;
@@ -178,7 +178,7 @@ else if ("Android-Studio".equals(ideValue)) {
178178
}
179179
}
180180

181-
private @Nullable CompletableFuture<Boolean> shouldShowMessage(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
181+
private @NotNull CompletableFuture<Boolean> shouldShowMessage(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
182182
return makeUnifiedAnalyticsRequest("shouldShowMessage", service, params).thenCompose(result -> {
183183
assert result != null;
184184
JsonPrimitive value = result.getAsJsonPrimitive("value");
@@ -192,7 +192,7 @@ else if ("Android-Studio".equals(ideValue)) {
192192
});
193193
}
194194

195-
private @Nullable CompletableFuture<String> getConsentMessage(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
195+
private @NotNull CompletableFuture<String> getConsentMessage(@NotNull DartToolingDaemonService service, @NotNull JsonObject params) {
196196
return makeUnifiedAnalyticsRequest("getConsentMessage", service, params).thenCompose(result -> {
197197
assert result != null;
198198
JsonPrimitive value = result.getAsJsonPrimitive("value");

flutter-idea/src/io/flutter/dart/DtdUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.concurrent.CompletableFuture;
1313

1414
public class DtdUtils {
15-
public CompletableFuture<DartToolingDaemonService> readyDtdService(@NotNull Project project) {
15+
public @NotNull CompletableFuture<DartToolingDaemonService> readyDtdService(@NotNull Project project) {
1616
final DartToolingDaemonService dtdService = DartToolingDaemonService.getInstance(project);
1717
CompletableFuture<DartToolingDaemonService> readyService = new CompletableFuture<>();
1818
int attemptsRemaining = 10;

0 commit comments

Comments
 (0)