afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'refactor_pure' of https://github.com/coreemu/core into refactor_pure

Browse source
This commit is contained in:
Blake Harnden 2019-06-03 16:50:34 -07:00
commit 59fac510c4
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
corefx/src/main/java/com/core/client/grpc/CoreGrpcClient.java
View file

@ -18,6 +18,8 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -527,7 +529,7 @@ public class CoreGrpcClient implements ICoreClient {
.build(); .build();
try { try {
CoreProto.GetNodeServiceFileResponse response = blockingStub.getNodeServiceFile(request); CoreProto.GetNodeServiceFileResponse response = blockingStub.getNodeServiceFile(request);
return response.getData().toStringUtf8(); return response.getData();
} catch (StatusRuntimeException ex) { } catch (StatusRuntimeException ex) {
throw new IOException(ex); throw new IOException(ex);
} }
@ -600,7 +602,7 @@ public class CoreGrpcClient implements ICoreClient {
.setNodeId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.setFile(serviceFile.getName()) .setFile(serviceFile.getName())
.setData(ByteString.copyFromUtf8(serviceFile.getData())) .setData(serviceFile.getData())
.build(); .build();
try { try {
CoreProto.SetNodeServiceFileResponse response = blockingStub.setNodeServiceFile(request); CoreProto.SetNodeServiceFileResponse response = blockingStub.setNodeServiceFile(request);
@ -696,7 +698,7 @@ public class CoreGrpcClient implements ICoreClient {
try { try {
CoreProto.SaveXmlResponse response = blockingStub.saveXml(request); CoreProto.SaveXmlResponse response = blockingStub.saveXml(request);
try (PrintWriter writer = new PrintWriter(file)) { try (PrintWriter writer = new PrintWriter(file)) {
writer.print(response.getData().toStringUtf8()); writer.print(response.getData());
} }
} catch (StatusRuntimeException ex) { } catch (StatusRuntimeException ex) {
throw new IOException(ex); throw new IOException(ex);
@ -705,16 +707,18 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public SessionOverview openSession(File file) throws IOException { public SessionOverview openSession(File file) throws IOException {
ByteString data = ByteString.readFrom(new FileInputStream(file));
CoreProto.OpenXmlRequest request = CoreProto.OpenXmlRequest.newBuilder()
.setData(data)
.build();
try { try {
byte[] encoded = Files.readAllBytes(file.toPath());
String data = new String(encoded, StandardCharsets.UTF_8);
CoreProto.OpenXmlRequest request = CoreProto.OpenXmlRequest.newBuilder()
.setData(data)
.build();
CoreProto.OpenXmlResponse response = blockingStub.openXml(request); CoreProto.OpenXmlResponse response = blockingStub.openXml(request);
SessionOverview sessionOverview = new SessionOverview(); SessionOverview sessionOverview = new SessionOverview();
sessionOverview.setId(response.getSessionId()); sessionOverview.setId(response.getSessionId());
return sessionOverview; return sessionOverview;
} catch (StatusRuntimeException ex) { } catch (IOException | StatusRuntimeException ex) {
throw new IOException(ex); throw new IOException(ex);
} }
} }
@ -873,7 +877,7 @@ public class CoreGrpcClient implements ICoreClient {
public boolean createHook(Hook hook) throws IOException { public boolean createHook(Hook hook) throws IOException {
CoreProto.Hook hookProto = CoreProto.Hook.newBuilder() CoreProto.Hook hookProto = CoreProto.Hook.newBuilder()
.setStateValue(hook.getState()) .setStateValue(hook.getState())
.setData(ByteString.copyFromUtf8(hook.getData())) .setData(hook.getData())
.setFile(hook.getFile()) .setFile(hook.getFile())
.build(); .build();
CoreProto.AddHookRequest request = CoreProto.AddHookRequest.newBuilder() CoreProto.AddHookRequest request = CoreProto.AddHookRequest.newBuilder()
@ -896,7 +900,7 @@ public class CoreGrpcClient implements ICoreClient {
for (CoreProto.Hook protoHook : response.getHooksList()) { for (CoreProto.Hook protoHook : response.getHooksList()) {
Hook hook = new Hook(); Hook hook = new Hook();
hook.setFile(protoHook.getFile()); hook.setFile(protoHook.getFile());
hook.setData(protoHook.getData().toStringUtf8()); hook.setData(protoHook.getData());
hook.setState(protoHook.getStateValue()); hook.setState(protoHook.getStateValue());
hooks.add(hook); hooks.add(hook);
} }
@ -1193,7 +1197,7 @@ public class CoreGrpcClient implements ICoreClient {
// mobility script event // mobility script event
} else if (state.getValue() <= 9) { } else if (state.getValue() <= 9) {
Integer nodeId = event.getNodeId(); Integer nodeId = event.getNodeId();
String[] values = event.getData().toStringUtf8().split("\\s+"); String[] values = event.getData().split("\\s+");
Integer start = Integer.parseInt(values[0].split("=")[1]); Integer start = Integer.parseInt(values[0].split("=")[1]);
Integer end = Integer.parseInt(values[1].split("=")[1]); Integer end = Integer.parseInt(values[1].split("=")[1]);
logger.info(String.format("node(%s) mobility event (%s) - start(%s) stop(%s)", logger.info(String.format("node(%s) mobility event (%s) - start(%s) stop(%s)",