This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 510206d RATIS-390. Fix package of LogServiceClient
510206d is described below
commit 510206dc54d334e5adf26c350a2dde27cbcda020
Author: cxorm <[email protected]>
AuthorDate: Wed Oct 16 16:38:58 2019 +0800
RATIS-390. Fix package of LogServiceClient
Closes #40
Signed-off-by: Josh Elser <[email protected]>
---
.../apache/ratis/logservice/{client => api}/LogServiceClient.java | 7 +------
.../src/main/java/org/apache/ratis/logservice/shell/Command.java | 2 +-
.../java/org/apache/ratis/logservice/shell/LogServiceShell.java | 2 +-
.../apache/ratis/logservice/shell/commands/ArchiveLogCommand.java | 2 +-
.../apache/ratis/logservice/shell/commands/CreateLogCommand.java | 2 +-
.../apache/ratis/logservice/shell/commands/DeleteLogCommand.java | 2 +-
.../org/apache/ratis/logservice/shell/commands/ExitCommand.java | 2 +-
.../apache/ratis/logservice/shell/commands/ExportLogCommand.java | 2 +-
.../org/apache/ratis/logservice/shell/commands/HelpCommand.java | 2 +-
.../apache/ratis/logservice/shell/commands/ListLogsCommand.java | 2 +-
.../apache/ratis/logservice/shell/commands/PutToLogCommand.java | 2 +-
.../org/apache/ratis/logservice/shell/commands/ReadLogCommand.java | 2 +-
.../java/org/apache/ratis/logservice/tool/VerificationTool.java | 2 +-
.../java/org/apache/ratis/logservice/server/TestMetaServer.java | 2 +-
.../org/apache/ratis/logservice/tool/TestVerificationTool.java | 2 +-
.../java/org/apache/ratis/logservice/util/LogServiceCluster.java | 2 +-
16 files changed, 16 insertions(+), 21 deletions(-)
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/client/LogServiceClient.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/api/LogServiceClient.java
similarity index 97%
rename from
ratis-logservice/src/main/java/org/apache/ratis/logservice/client/LogServiceClient.java
rename to
ratis-logservice/src/main/java/org/apache/ratis/logservice/api/LogServiceClient.java
index 1a40005..d83fa93 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/client/LogServiceClient.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/api/LogServiceClient.java
@@ -15,15 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.ratis.logservice.client;
+package org.apache.ratis.logservice.api;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
-import org.apache.ratis.logservice.api.LogInfo;
-import org.apache.ratis.logservice.api.LogName;
-import org.apache.ratis.logservice.api.LogServiceConfiguration;
-import org.apache.ratis.logservice.api.LogStream;
import org.apache.ratis.logservice.api.LogStream.State;
import org.apache.ratis.logservice.common.Constants;
import org.apache.ratis.logservice.impl.ArchivedLogStreamImpl;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/Command.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/Command.java
index 4ff9fa2..5b2fcb1 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/Command.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/Command.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.logservice.shell;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/LogServiceShell.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/LogServiceShell.java
index cd02fad..f7124e9 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/LogServiceShell.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/LogServiceShell.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.Map.Entry;
import java.util.Objects;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.commands.ExitCommand;
import org.jline.reader.EndOfFileException;
import org.jline.reader.History;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ArchiveLogCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ArchiveLogCommand.java
index 11e60b4..c4f9f98 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ArchiveLogCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ArchiveLogCommand.java
@@ -18,7 +18,7 @@
package org.apache.ratis.logservice.shell.commands;
import org.apache.ratis.logservice.api.LogName;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/CreateLogCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/CreateLogCommand.java
index 3dfce3d..31fae65 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/CreateLogCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/CreateLogCommand.java
@@ -19,7 +19,7 @@ package org.apache.ratis.logservice.shell.commands;
import org.apache.ratis.logservice.api.LogName;
import org.apache.ratis.logservice.api.LogStream;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/DeleteLogCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/DeleteLogCommand.java
index 053f806..96081f9 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/DeleteLogCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/DeleteLogCommand.java
@@ -20,7 +20,7 @@ package org.apache.ratis.logservice.shell.commands;
import java.io.IOException;
import org.apache.ratis.logservice.api.LogName;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExitCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExitCommand.java
index 736adc5..11a30d1 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExitCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExitCommand.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.logservice.shell.commands;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExportLogCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExportLogCommand.java
index 11c1df7..02b0a6f 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExportLogCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ExportLogCommand.java
@@ -18,7 +18,7 @@
package org.apache.ratis.logservice.shell.commands;
import org.apache.ratis.logservice.api.LogName;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/HelpCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/HelpCommand.java
index 648f5e4..c139f59 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/HelpCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/HelpCommand.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.logservice.shell.commands;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.apache.ratis.logservice.shell.CommandFactory;
import org.jline.reader.LineReader;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ListLogsCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ListLogsCommand.java
index b790124..8b8e03b 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ListLogsCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ListLogsCommand.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.ratis.logservice.api.LogInfo;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/PutToLogCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/PutToLogCommand.java
index 86f6d55..8f0a617 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/PutToLogCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/PutToLogCommand.java
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.ratis.logservice.api.LogName;
import org.apache.ratis.logservice.api.LogStream;
import org.apache.ratis.logservice.api.LogWriter;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ReadLogCommand.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ReadLogCommand.java
index ce5c954..e321bf0 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ReadLogCommand.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/shell/commands/ReadLogCommand.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.ratis.logservice.api.LogName;
import org.apache.ratis.logservice.api.LogReader;
import org.apache.ratis.logservice.api.LogStream;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.shell.Command;
import org.jline.reader.LineReader;
import org.jline.terminal.Terminal;
diff --git
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/tool/VerificationTool.java
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/tool/VerificationTool.java
index 5b76fb9..0c778df 100644
---
a/ratis-logservice/src/main/java/org/apache/ratis/logservice/tool/VerificationTool.java
+++
b/ratis-logservice/src/main/java/org/apache/ratis/logservice/tool/VerificationTool.java
@@ -34,7 +34,7 @@ import org.apache.ratis.logservice.api.LogName;
import org.apache.ratis.logservice.api.LogReader;
import org.apache.ratis.logservice.api.LogStream;
import org.apache.ratis.logservice.api.LogWriter;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.common.LogNotFoundException;
import org.apache.ratis.logservice.server.LogStateMachine;
import org.slf4j.Logger;
diff --git
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/server/TestMetaServer.java
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/server/TestMetaServer.java
index 3767190..8a478c4 100644
---
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/server/TestMetaServer.java
+++
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/server/TestMetaServer.java
@@ -20,7 +20,7 @@ package org.apache.ratis.logservice.server;
import org.apache.ratis.logservice.api.*;
import org.apache.ratis.logservice.api.LogStream.State;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.common.LogAlreadyExistException;
import org.apache.ratis.logservice.common.LogNotFoundException;
import org.apache.ratis.logservice.metrics.LogServiceMetricsRegistry;
diff --git
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/tool/TestVerificationTool.java
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/tool/TestVerificationTool.java
index 617f763..904193d 100644
---
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/tool/TestVerificationTool.java
+++
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/tool/TestVerificationTool.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.nio.ByteBuffer;
import org.apache.ratis.logservice.api.LogName;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.tool.VerificationTool.Operation;
import org.junit.Test;
diff --git
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/util/LogServiceCluster.java
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/util/LogServiceCluster.java
index 29999dd..3ed4f0f 100644
---
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/util/LogServiceCluster.java
+++
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/util/LogServiceCluster.java
@@ -22,7 +22,7 @@ package org.apache.ratis.logservice.util;
import org.apache.ratis.BaseTest;
import org.apache.ratis.logservice.api.LogName;
import org.apache.ratis.logservice.api.LogStream;
-import org.apache.ratis.logservice.client.LogServiceClient;
+import org.apache.ratis.logservice.api.LogServiceClient;
import org.apache.ratis.logservice.server.LogServer;
import org.apache.ratis.logservice.server.MetadataServer;
