Skip to content

xds: fix lint warnings #6907

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

Merged
voidzcy merged 3 commits into from
Apr 7, 2020
Merged

xds: fix lint warnings #6907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61cab69
Remove unnecessary suppress warning.
voidzcy Apr 7, 2020
b8fb530
Return Immutable type.
voidzcy Apr 7, 2020
b303051
Add private constructor for preventing instantiation.
voidzcy Apr 7, 2020
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
7 changes: 3 additions & 4 deletions xds/src/main/java/io/grpc/xds/XdsNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ private class ConfigWatcherImpl implements ConfigWatcher {
this.listener = listener;
}

@SuppressWarnings("unchecked")
@Override
public void onConfigChanged(ConfigUpdate update) {
Map<String, ?> rawLbConfig;
Expand Down Expand Up @@ -220,7 +219,7 @@ public void onError(Status error) {
}
}

private static Map<String, ?> generateXdsRoutingRawConfig(List<Route> routesUpdate) {
private static ImmutableMap<String, ?> generateXdsRoutingRawConfig(List<Route> routesUpdate) {
List<Object> routes = new ArrayList<>(routesUpdate.size());
Map<String, Object> actions = new LinkedHashMap<>();
Map<RouteAction, String> exitingActions = new HashMap<>();
Expand Down Expand Up @@ -275,7 +274,7 @@ public void onError(Status error) {
ImmutableMap.of("route", routes, "action", actions));
}

private static Map<String, ?> generateWeightedTargetRawConfig(
private static ImmutableMap<String, ?> generateWeightedTargetRawConfig(
List<ClusterWeight> clusterWeights) {
Map<String, Object> targets = new LinkedHashMap<>();
for (ClusterWeight clusterWeight : clusterWeights) {
Expand All @@ -292,7 +291,7 @@ public void onError(Status error) {
ImmutableMap.of("targets", targets));
}

private static Map<String, ?> generateCdsRawConfig(String clusterName) {
private static ImmutableMap<String, ?> generateCdsRawConfig(String clusterName) {
return ImmutableMap.of(XdsLbPolicies.CDS_POLICY_NAME, ImmutableMap.of("cluster", clusterName));
}

Expand Down
4 changes: 4 additions & 0 deletions xds/src/main/java/io/grpc/xds/internal/sds/SdsProtocolNegotiators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
@VisibleForTesting
public final class SdsProtocolNegotiators {

// Prevent instantiation.

@sanjaypujare sanjaypujare Apr 7, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being removed?

@voidzcy voidzcy Apr 7, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is to be added.

private SdsProtocolNegotiators() {
}

private static final Logger logger = Logger.getLogger(SdsProtocolNegotiators.class.getName());

private static final AsciiString SCHEME = AsciiString.of("https");
Expand Down