This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 130
PAN-2485#Add net_services json rpc endpoint #1295
Merged
shemnon
merged 4 commits into
PegaSysEng:master
from
usmananwar:PAN-2485#net_services-endpoint
Apr 17, 2019
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
10cfd9d
PAN-2485#Add net_services json rpc endpoint
usmananwar b609d95
Fixed the ImmutableMap.builder in NetServices
usmananwar 3c01078
Fixed errorprone BadImport error
usmananwar 1a3f8d9
Merge branch 'master' into PAN-2485#net_services-endpoint
shemnon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...pc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetServices.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright 2018 ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
| package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; | ||
|
|
||
| import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; | ||
| import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; | ||
| import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; | ||
| import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; | ||
| import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; | ||
| import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; | ||
| import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; | ||
|
|
||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
|
|
||
| public class NetServices implements JsonRpcMethod { | ||
|
|
||
| private final ImmutableMap<String, ImmutableMap<String, String>> services; | ||
|
|
||
| public NetServices( | ||
| final JsonRpcConfiguration jsonRpcConfiguration, | ||
| final WebSocketConfiguration webSocketConfiguration, | ||
| final P2PNetwork p2pNetwork, | ||
| final MetricsConfiguration metricsConfiguration) { | ||
|
|
||
| Map<String, ImmutableMap<String, String>> activeServices = | ||
| new LinkedHashMap<String, ImmutableMap<String, String>>(); | ||
|
|
||
| if (jsonRpcConfiguration.isEnabled()) { | ||
| activeServices.put( | ||
| "jsonrpc", | ||
| createServiceDetailsMap(jsonRpcConfiguration.getHost(), jsonRpcConfiguration.getPort())); | ||
| } | ||
| if (webSocketConfiguration.isEnabled()) { | ||
| activeServices.put( | ||
| "ws", | ||
| createServiceDetailsMap( | ||
| webSocketConfiguration.getHost(), webSocketConfiguration.getPort())); | ||
| } | ||
| if (p2pNetwork.isP2pEnabled()) { | ||
| if (p2pNetwork.isP2pEnabled()) { | ||
| p2pNetwork | ||
| .getLocalEnode() | ||
| .ifPresent( | ||
| enode -> { | ||
| activeServices.put( | ||
| "p2p", createServiceDetailsMap(enode.getIp(), enode.getListeningPort())); | ||
| }); | ||
| } | ||
| } | ||
| if (metricsConfiguration.isEnabled()) { | ||
| activeServices.put( | ||
| "metrics", | ||
| createServiceDetailsMap(metricsConfiguration.getHost(), metricsConfiguration.getPort())); | ||
| } | ||
|
|
||
| services = | ||
| ImmutableMap.<String, ImmutableMap<String, String>>builder().putAll(activeServices).build(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "net_services"; | ||
| } | ||
|
|
||
| @Override | ||
| public JsonRpcResponse response(final JsonRpcRequest req) { | ||
| return new JsonRpcSuccessResponse(req.getId(), services); | ||
| } | ||
|
|
||
| private ImmutableMap<String, String> createServiceDetailsMap(final String host, final int port) { | ||
| return ImmutableMap.of("host", host, "port", String.valueOf(port)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use an ImmutalbeMap.Builder instead of filling a mutable map and copying it into an ImmutableMap