This is an automated email from the ASF dual-hosted git repository. okram pushed a commit to branch tp4 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push: new 230dfbf made Request and inner class of RemoteMachine. Its only used by RemoteMachine and MachineServer... no need to expose it. 230dfbf is described below commit 230dfbfb2f53724b81c7bb0a1206751bb94e061b Author: Marko A. Rodriguez <okramma...@gmail.com> AuthorDate: Tue Mar 26 14:49:26 2019 -0600 made Request and inner class of RemoteMachine. Its only used by RemoteMachine and MachineServer... no need to expose it. --- .../machine/species/remote/MachineServer.java | 6 +-- .../machine/species/remote/RemoteMachine.java | 35 +++++++++++++ .../tinkerpop/machine/species/remote/Request.java | 57 ---------------------- 3 files changed, 38 insertions(+), 60 deletions(-) diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java index 18acf8e..073f664 100644 --- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java +++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java @@ -91,11 +91,11 @@ public final class MachineServer implements AutoCloseable { final ObjectInputStream input = new ObjectInputStream(this.clientSocket.getInputStream()); final ObjectOutputStream output = new ObjectOutputStream(this.clientSocket.getOutputStream()); while (true) { - final Request<Object> request = (Request<Object>) input.readObject(); - if (Request.Type.register == request.type) { + final RemoteMachine.Request<Object> request = (RemoteMachine.Request<Object>) input.readObject(); + if (RemoteMachine.Request.Type.register == request.type) { output.writeObject(MachineServer.this.machine.register(request.bytecode)); output.flush(); - } else if (Request.Type.submit == request.type) { + } else if (RemoteMachine.Request.Type.submit == request.type) { final Socket traverserServerSocket = new Socket(request.traverserServerLocation, request.traverserServerPort); final ObjectOutputStream traverserOutput = new ObjectOutputStream(traverserServerSocket.getOutputStream()); final Iterator<Traverser<Object, Object>> iterator = MachineServer.this.machine.submit(request.bytecode); diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/RemoteMachine.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/RemoteMachine.java index 156193d..a15d3b5 100644 --- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/RemoteMachine.java +++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/RemoteMachine.java @@ -25,6 +25,7 @@ import org.apache.tinkerpop.machine.traverser.Traverser; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serializable; import java.net.InetAddress; import java.net.Socket; import java.util.Iterator; @@ -100,4 +101,38 @@ public final class RemoteMachine implements Machine, AutoCloseable { throw new RuntimeException(e.getMessage(), e); } } + + /** + * @author Marko A. Rodriguez (http://markorodriguez.com) + */ + static final class Request<C> implements Serializable { + + public enum Type { + register, submit, close; + } + + public final Type type; + public final Bytecode<C> bytecode; + final String traverserServerLocation; + final int traverserServerPort; + + private Request(final Type type, final Bytecode<C> bytecode, final String traverserServerLocation, final int traverserServerPort) { + this.type = type; + this.bytecode = bytecode; + this.traverserServerLocation = traverserServerLocation; + this.traverserServerPort = traverserServerPort; + } + + static <C> Request<C> register(final Bytecode<C> bytecode) { + return new Request<>(Request.Type.register, bytecode, null, -1); + } + + static <C> Request<C> submit(final Bytecode<C> bytecode, final String traverserServerLocation, final int traverserServerPort) { + return new Request<>(Request.Type.submit, bytecode, traverserServerLocation, traverserServerPort); + } + + static <C> Request<C> close(final Bytecode<C> bytecode) { + return new Request<>(Request.Type.close, bytecode, null, -1); + } + } } diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/Request.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/Request.java deleted file mode 100644 index 48e471c..0000000 --- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/Request.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.tinkerpop.machine.species.remote; - -import org.apache.tinkerpop.machine.bytecode.Bytecode; - -import java.io.Serializable; - -/** - * @author Marko A. Rodriguez (http://markorodriguez.com) - */ -final class Request<C> implements Serializable { - - public enum Type { - register, submit, close; - } - - public final Type type; - public final Bytecode<C> bytecode; - final String traverserServerLocation; - final int traverserServerPort; - - private Request(final Type type, final Bytecode<C> bytecode, final String traverserServerLocation, final int traverserServerPort) { - this.type = type; - this.bytecode = bytecode; - this.traverserServerLocation = traverserServerLocation; - this.traverserServerPort = traverserServerPort; - } - - static <C> Request<C> register(final Bytecode<C> bytecode) { - return new Request<>(Type.register, bytecode, null, -1); - } - - static <C> Request<C> submit(final Bytecode<C> bytecode, final String traverserServerLocation, final int traverserServerPort) { - return new Request<>(Type.submit, bytecode, traverserServerLocation, traverserServerPort); - } - - static <C> Request<C> close(final Bytecode<C> bytecode) { - return new Request<>(Type.close, bytecode, null, -1); - } -}