.stream()
.filter(r -> r.getQName().equals(e.getValue()))
.findFirst()
- .get()))
+ .orElseThrow()))
.collect(Collector.of(ImmutableBiMap::<Method, RpcDefinition>builder,
(builder, entry) -> builder.put(entry.getKey(), entry.getValue()),
(k, v) -> k.putAll(v.build()), ImmutableBiMap.Builder<Method, RpcDefinition>::build));
.filter(h -> h.hasMethod(request.getMethod()))
.findFirst();
if (handler.isPresent()) {
- handler.get().handleRequest(request, replyBuilder);
+ handler.orElseThrow().handleRequest(request, replyBuilder);
} else {
replyBuilder.error(new JsonRpcErrorObject(-32601, "No such method : " + request.getMethod(), null));
}
try {
final Optional<Class<?>> knownType = getClassType(type);
if (elem != null && knownType.isPresent()
- && !(JsonElement.class.isAssignableFrom((Class<?>) knownType.get()))) {
- final Class<?> clazz = knownType.get();
+ && !(JsonElement.class.isAssignableFrom((Class<?>) knownType.orElseThrow()))) {
+ final Class<?> clazz = knownType.orElseThrow();
if (elem.isJsonPrimitive() && !canRepresentJsonPrimitive(clazz) && !isArrayLikeType(clazz)) {
fixed = wrap(elem.getAsJsonPrimitive(), clazz, field -> field.getType().isPrimitive());
} else if (elem.isJsonObject() && isArrayLikeType(clazz)) {
.concat(candidates.stream().filter(c -> c.getPostInvokeFailure() != null),
candidates.stream().filter(c -> c.getPreInvokeFailure() != null))
.findFirst()
- .get()
+ .orElseThrow()
.getFailure();
}
@Override
public boolean isClientConnected(Object proxyOrSession) {
if (Proxy.isProxyClass(proxyOrSession.getClass())) {
- final Optional<BaseSession> session = proxyCache.asMap()
+ return proxyCache.asMap()
.values()
.stream()
.map(x -> x.getProxySession(proxyOrSession))
.filter(Optional::isPresent)
- .map(Optional::get)
- .findFirst();
- return session.isPresent() && (session.get() instanceof ClientSession)
- && ((ClientSession) session.get()).isConnectionReady();
+ .map(Optional::orElseThrow)
+ .findFirst()
+ .filter(session -> session instanceof ClientSession client && client.isConnectionReady())
+ .isPresent();
} else {
- return (proxyOrSession instanceof ClientSession) && ((ClientSession) proxyOrSession).isConnectionReady();
+ return proxyOrSession instanceof ClientSession clientSession && clientSession.isConnectionReady();
}
}
parent = next;
} else {
final JsonElement next = isNextKeyed(copy) ? new JsonArray() : new JsonObject();
- parent.getAsJsonObject().add(current.name.get(), next);
+ parent.getAsJsonObject().add(current.name.orElseThrow(), next);
parent = next;
}
}
if (!result.isPresent()) {
sender().tell(new EmptyReadResponse(), self());
} else {
- sender().tell(new PathAndDataMsg(path, result.get()), self());
+ sender().tell(new PathAndDataMsg(path, result.orElseThrow()), self());
}
}
}
}, MoreExecutors.directExecutor());
}
-}
\ No newline at end of file
+}
await().atMost(TEN_SECONDS).until(() -> getOpState(masterTestCustomizer.getDataBroker()).isPresent());
- final Optional<ActualEndpoints> opState = getOpState(masterTestCustomizer.getDataBroker());
- assertTrue(opState.isPresent());
- assertEquals(MountStatus.Mounted, opState.get().getMountStatus());
- assertNotNull(opState.get().getManagedBy());
+ final ActualEndpoints opState = getOpState(masterTestCustomizer.getDataBroker()).orElseThrow();
+ assertEquals(MountStatus.Mounted, opState.getMountStatus());
+ assertNotNull(opState.getManagedBy());
- DOMRpcService rpcService = getMountPoint(masterTestCustomizer.getDOMMountPointService()).get()
+ DOMRpcService rpcService = getMountPoint(masterTestCustomizer.getDOMMountPointService()).orElseThrow()
.getService(DOMRpcService.class)
- .get();
+ .orElseThrow();
RpcDefinition rpc = Util.findNode(masterTestCustomizer.getSchemaService().getGlobalContext(),
"test-model-rpc:removeCoffeePot", Module::getRpcs)
- .get();
+ .orElseThrow();
ListenableFuture<? extends DOMRpcResult> rpcResult = rpcService.invokeRpc(rpc.getQName(), null);
assertNotNull(rpcResult.get());
- DOMDataBroker domDataBroker = getMountPoint(masterTestCustomizer.getDOMMountPointService()).get()
+ DOMDataBroker domDataBroker = getMountPoint(masterTestCustomizer.getDOMMountPointService()).orElseThrow()
.getService(DOMDataBroker.class)
- .get();
+ .orElseThrow();
NormalizedNode data = masterConverter
.dataCodec(YangInstanceIdentifier.builder().node(NetworkTopology.QNAME).build())
await().atMost(TEN_SECONDS)
.until(() -> getMountPoint(slaveTestCustomizer.getDOMMountPointService()).isPresent());
- DOMRpcService rpcService = getMountPoint(slaveTestCustomizer.getDOMMountPointService()).get()
+ DOMRpcService rpcService = getMountPoint(slaveTestCustomizer.getDOMMountPointService()).orElseThrow()
.getService(DOMRpcService.class)
- .get();
+ .orElseThrow();
RpcDefinition rpc = Util
.findNode(slaveTestCustomizer.getSchemaService().getGlobalContext(), "test-model-rpc:removeCoffeePot",
Module::getRpcs)
- .get();
+ .orElseThrow();
ListenableFuture<? extends DOMRpcResult> rpcResult = rpcService.invokeRpc(rpc.getQName(), null);
assertNotNull(rpcResult.get());
}
final Optional<EnumTreeNode<I, K, D>> candidate = current.lookupChild(id);
if (candidate.isPresent()) {
- current = candidate.get();
+ current = candidate.orElseThrow();
if (current.value(key) != null) {
value = current.value(key);
}
while (iterator.hasNext()) {
final I id = iterator.next();
final Optional<EnumTreeNode<I, K, D>> candidate = current.lookupChild(id);
- current = candidate.isPresent() ? candidate.get() : current.appendChild(id);
+ current = candidate.isPresent() ? candidate.orElseThrow() : current.appendChild(id);
}
final D previousValue = current.value(key);
current.setValue(key, data);
return false;
}
errors = txs.stream().map(DataModificationContext::extractError)
- .flatMap(o -> o.isPresent() ? Stream.of(o.get()) : Stream.empty()).collect(Collectors.toList());
+ .flatMap(o -> o.map(Stream::of).orElse(Stream.empty())).collect(Collectors.toList());
return errors.isEmpty();
} finally {
completed.set(System.currentTimeMillis());
*
* @return immutable copy of errors, if no errors occurred, list is empty (never NULL).
*/
- @NonNull
- public List<Throwable> getErrors() {
+ public @NonNull List<Throwable> getErrors() {
return ImmutableList.copyOf(errors);
}
final QNameModule qm = def.getQName().getModule();
final String localName = def.getQName().getLocalName();
final Optional<Module> possibleModule = schemaContext.findModule(qm.getNamespace(), qm.getRevision());
- final JsonObject path = createRootPath(possibleModule.get(), def.getQName());
+ final JsonObject path = createRootPath(possibleModule.orElseThrow(), def.getQName());
final String endpoint = getEndpoint(DataType.NOTIFICATION, governance, path);
if (endpoint != null) {
LOG.debug("Notification '{}' mapped to {}", localName, endpoint);
final QNameModule qm = def.getQName().getModule();
final String localName = def.getQName().getLocalName();
final Optional<Module> possibleModule = schemaContext.findModule(qm.getNamespace(), qm.getRevision());
- final JsonObject path = createRootPath(possibleModule.get(), def.getQName());
+ final JsonObject path = createRootPath(possibleModule.orElseThrow(), def.getQName());
final String endpoint = getEndpoint(DataType.RPC, governance, path);
if (endpoint != null) {
LOG.info("[{}] RPC '{}' mapped to {}", localName, endpoint, peer.getName());
dependencies.getYangXPathParserFactory());
}
if (governanceProvider.get().isPresent()) {
- return new GovernanceSchemaContextProvider(governanceProvider.get().get(),
+ return new GovernanceSchemaContextProvider(governanceProvider.get().orElseThrow(),
dependencies.getYangXPathParserFactory());
}
return new BuiltinSchemaContextProvider(dependencies.getSchemaService().getGlobalContext());
modules.stream()
.forEach(m -> resolved.addAll(m.getImports()
.stream()
- .map(mi -> schemaContext.findModule(mi.getModuleName().getLocalName(), mi.getRevision()).get())
+ .map(mi -> schemaContext.findModule(mi.getModuleName().getLocalName(), mi.getRevision())
+ .orElseThrow())
.collect(Collectors.toSet())));
return new EffectiveModelContextAdapter(resolved);
}
if (name.indexOf(':') != -1) {
final String[] parts = name.split(":");
final Optional<? extends Module> modOpt = findModule(schemaContext, parts[0]);
- if (!modOpt.isPresent()) {
+ if (modOpt.isEmpty()) {
return Optional.empty();
} else {
- return findNode(mapper.apply(modOpt.get()).stream(), parts[1]);
+ return findNode(mapper.apply(modOpt.orElseThrow()).stream(), parts[1]);
}
} else {
return findNode(schemaContext.getModules().stream().flatMap(m -> mapper.apply(m).stream()), name);
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final HierarchicalEnumMap<JsonElement, Types, String> map = HierarchicalEnumHashMap.create(Types.class, CODEC);
map.put(parse("{}"), Types.A, "uri://localhost");
map.put(parse(PATH1), Types.A, "xyz");
- assertEquals("uri://localhost", map.lookup(JsonParser.parseString(PATH2), Types.A).get());
+ assertEquals(Optional.of("uri://localhost"), map.lookup(JsonParser.parseString(PATH2), Types.A));
assertNull(map.put(parse(getData("path3")), Types.A, "HERE"));
assertNull(map.put(parse(getData("path4")), Types.A, "another"));
assertNull(map.put(parse(getData("path5")), Types.A, "123456"));
assertNull(map.put(parse(getData("path5")), Types.C, "123456"));
assertEquals("123456", map.put(parse(getData("path5")), Types.A, "987654"));
assertEquals("123456", map.put(parse(getData("path5")), Types.C, "987654"));
- assertEquals("987654", map.lookup(parse(getData("path5")), Types.A).get());
- assertEquals("another", map.lookup(parse(getData("path4")), Types.A).get());
+ assertEquals(Optional.of("987654"), map.lookup(parse(getData("path5")), Types.A));
+ assertEquals(Optional.of("another"), map.lookup(parse(getData("path4")), Types.A));
LOG.info(map.dump());
Map<JsonElement, String> map2 = map.toMap(Types.A);
LOG.info("{}", map2);
port = getFreeTcpPort();
governance = mock(RemoteGovernance.class);
when(governance.governance(anyInt(), anyString(), any())).thenReturn(getPath());
- mod = schemaContext.findModule("test-model-notification", Revision.of("2020-10-14")).get();
+ mod = schemaContext.findModule("test-model-notification", Revision.of("2020-10-14")).orElseThrow();
transportFactory = new DefaultTransportFactory();
svc = new JsonRPCNotificationService(getPeer(),
*/
package org.opendaylight.jsonrpc.provider.common;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
// Read using JSON-RPC databroker
final DOMDataTreeReadTransaction rtx = jrbroker.newReadOnlyTransaction();
final Optional<NormalizedNode> result = rtx.read(LogicalDatastoreType.OPERATIONAL, e.getKey()).get();
- assertNotNull(result.get());
+ assertTrue(result.isPresent());
}
@Test
// Read using DOM databroker
final DOMDataTreeReadTransaction rtx = getDomBroker().newReadOnlyTransaction();
final Optional<NormalizedNode> result = rtx.read(LogicalDatastoreType.OPERATIONAL, e.getKey()).get();
- assertNotNull(result.get());
+ assertTrue(result.isPresent());
}
@Test
rwtx.commit().get();
final DOMDataTreeReadWriteTransaction rwtx2 = jrbroker.newReadWriteTransaction();
Optional<NormalizedNode> result = rwtx2.read(LogicalDatastoreType.OPERATIONAL, e.getKey()).get();
- assertNotNull(result.get());
+ assertTrue(result.isPresent());
}
/*
final FluentFuture<Optional<NormalizedNode>> fopt = trx
.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(NetworkTopology.QNAME));
- final NormalizedNode nn = fopt.get(5, TimeUnit.SECONDS).get();
+ final NormalizedNode nn = fopt.get(5, TimeUnit.SECONDS).orElseThrow();
LOG.info("Read output : {}", nn);
assertEquals(NetworkTopology.QNAME.getNamespace(), nn.getIdentifier().getNodeType().getNamespace());
assertNotNull(nn.body());
Util.populateFromEndpointList(pathMap, peer.getRpcEndpoints().values(), DataType.RPC);
bridge = new JsonRPCtoRPCBridge(peer, schemaContext, pathMap, mock(RemoteGovernance.class), transportFactory,
new JsonRpcCodecFactory(schemaContext));
- mod = schemaContext.findModule("test-model-rpc", Revision.of("2020-10-14")).get();
+ mod = schemaContext.findModule("test-model-rpc", Revision.of("2020-10-14")).orElseThrow();
logTestName("START");
TimeUnit.MILLISECONDS.sleep(250);
}
.stream()
.filter(r -> "method-with-anyxml".equals(r.getQName().getLocalName()))
.findFirst()
- .get();
+ .orElseThrow();
try (JsonParserStream parser = JsonParserStream.create(writer,
JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(schemaContext),
SchemaInferenceStack.of(schemaContext, Absolute.of(rpcDef.getQName())).toInference())) {
ctrl = new RemoteControl(getDomBroker(), schemaContext, transportFactory, getDOMNotificationRouter(),
getDOMRpcRouter().getRpcService(), codecFactory);
NotificationDefinition path = findNode(schemaContext, "test-model-notification:notification1",
- Module::getNotifications).get();
+ Module::getNotifications).orElseThrow();
latch = new CountDownLatch(1);
reg = getDOMNotificationRouter().registerNotificationListener(new DOMNotificationListener() {
@Override
return false;
}
- final Optional<Config> peersConfState = getConfig(LogicalDatastoreType.CONFIGURATION);
- if (!peersConfState.isPresent()) {
+ final Optional<Config> optPeersConfState = getConfig(LogicalDatastoreType.CONFIGURATION);
+ if (optPeersConfState.isEmpty()) {
// in case entire config was wiped, we still need to unconfigure
// existing peers, hence supply empty list
unmountPeers(new ConfigBuilder().setConfiguredEndpoints(Map.of()).build());
LOG.info("{} configuration absent", ME);
return false;
}
- boolean result = mountPeers(peersConfState.get());
- result &= unmountPeers(peersConfState.get());
+ final Config peersConfState = optPeersConfState.orElseThrow();
+ boolean result = mountPeers(peersConfState);
+ result &= unmountPeers(peersConfState);
return result;
}
.build());
retryAction(TimeUnit.SECONDS, 2, () -> getPeerOpState("test-model-op-only").isPresent()
- && getPeerOpState("test-model-op-only").get().getMountStatus().equals(MountStatus.Failed));
+ && getPeerOpState("test-model-op-only").orElseThrow().getMountStatus().equals(MountStatus.Failed));
updateConfig(new ConfigBuilder().build());
// wait until nothing there
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
try {
final Optional<YangModuleInfo> bundled = findBundledModule(arg);
if (bundled.isPresent()) {
- return bundled.get().getYangTextCharSource().read();
+ return bundled.orElseThrow().getYangTextCharSource().read();
}
final Optional<Path> opt = findYangFile(arg);
if (opt.isPresent()) {
- // TODO : java11 has Files.readString(), for now use Files.readAllBytes() for backward compatibility
- return new String(Files.readAllBytes(opt.get()), StandardCharsets.UTF_8);
+ return Files.readString(opt.orElseThrow());
}
} catch (IOException e) {
throw new IllegalStateException(e);
private Set<ModuleInfo> dependsInternal(ModuleInfo module) {
final Optional<YangModuleInfo> bundledOpt = findBundledModule(module);
if (bundledOpt.isPresent()) {
- return parseDependencies(bundledOpt.get());
+ return parseDependencies(bundledOpt.orElseThrow());
}
try {
final Optional<Path> optFile = findYangFile(module);
if (optFile.isPresent()) {
- return yangFileImportCache.getUnchecked(optFile.get());
+ return yangFileImportCache.getUnchecked(optFile.orElseThrow());
}
} catch (IOException e) {
throw new IllegalStateException(e);
Code Review / jsonrpc.git / commitdiff