Commit 2adb63d6 authored by yannick legoc's avatar yannick legoc
Browse files

Cleaned output.

parent d2eb47b6
...@@ -282,8 +282,6 @@ public class CommandZoneAccessor { ...@@ -282,8 +282,6 @@ public class CommandZoneAccessor {
else { else {
CommandZoneRequests.ExecutionStateResponse.ExecutionState state = response.getState(); CommandZoneRequests.ExecutionStateResponse.ExecutionState state = response.getState();
System.out.println("getExecutionState " + commandBoxID + " " + state);
if (state == CommandZoneRequests.ExecutionStateResponse.ExecutionState.RUNNING) { if (state == CommandZoneRequests.ExecutionStateResponse.ExecutionState.RUNNING) {
return ExecutionPhaseState.RUNNING; return ExecutionPhaseState.RUNNING;
} }
...@@ -412,8 +410,6 @@ public class CommandZoneAccessor { ...@@ -412,8 +410,6 @@ public class CommandZoneAccessor {
LOGGER.log(Level.SEVERE, "command box not found for " + commandBoxID); LOGGER.log(Level.SEVERE, "command box not found for " + commandBoxID);
} }
else { else {
System.out.println("getProgression " + commandBoxID + " " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -545,8 +541,6 @@ public class CommandZoneAccessor { ...@@ -545,8 +541,6 @@ public class CommandZoneAccessor {
processError(response.getError(), commandBoxID); processError(response.getError(), commandBoxID);
} }
else { else {
System.out.println("AtomicCommandBoxPropertyRequest setInt32Value " + commandBoxID + " " + propertyID);
return response.getValue(); return response.getValue();
} }
} }
...@@ -580,8 +574,6 @@ public class CommandZoneAccessor { ...@@ -580,8 +574,6 @@ public class CommandZoneAccessor {
processError(response.getError(), commandBoxID); processError(response.getError(), commandBoxID);
} }
else { else {
System.out.println("AtomicCommandBoxPropertyRequest getInt32Value " + commandBoxID + " " + propertyID + " " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -616,8 +608,6 @@ public class CommandZoneAccessor { ...@@ -616,8 +608,6 @@ public class CommandZoneAccessor {
processError(response.getError(), commandBoxID); processError(response.getError(), commandBoxID);
} }
else { else {
System.out.println("AtomicCommandBoxPropertyRequest setFloat64Value " + commandBoxID + " " + propertyID);
return response.getValue(); return response.getValue();
} }
} }
...@@ -651,8 +641,6 @@ public class CommandZoneAccessor { ...@@ -651,8 +641,6 @@ public class CommandZoneAccessor {
processError(response.getError(), commandBoxID); processError(response.getError(), commandBoxID);
} }
else { else {
System.out.println("AtomicCommandBoxPropertyRequest getFloat64Value " + commandBoxID + " " + propertyID + " " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -936,8 +924,6 @@ public class CommandZoneAccessor { ...@@ -936,8 +924,6 @@ public class CommandZoneAccessor {
try { try {
Common.BooleanResponse response = Common.BooleanResponse.parseFrom(commandBoxRequester.receive()); Common.BooleanResponse response = Common.BooleanResponse.parseFrom(commandBoxRequester.receive());
System.out.println("setPropertyName " + commandBoxID + " " + propertyName);
// Test the error. // Test the error.
if (response.hasError()) { if (response.hasError()) {
processError(response.getError(), commandBoxID); processError(response.getError(), commandBoxID);
...@@ -1121,8 +1107,6 @@ public class CommandZoneAccessor { ...@@ -1121,8 +1107,6 @@ public class CommandZoneAccessor {
if (response.hasError()) { if (response.hasError()) {
processError(response.getError(), commandBoxID); processError(response.getError(), commandBoxID);
} }
System.out.println("setExpression " + expression + " to " + commandBoxID);
} }
catch (InvalidProtocolBufferException e) { catch (InvalidProtocolBufferException e) {
LOGGER.logp(Level.WARNING, this.getClass().getName(), "setExpression", "error in parsing response"); LOGGER.logp(Level.WARNING, this.getClass().getName(), "setExpression", "error in parsing response");
...@@ -1239,8 +1223,6 @@ public class CommandZoneAccessor { ...@@ -1239,8 +1223,6 @@ public class CommandZoneAccessor {
LOGGER.logp(Level.WARNING, this.getClass().getName(), "getExpression", "error in parsing response for command box " + commandBoxID); LOGGER.logp(Level.WARNING, this.getClass().getName(), "getExpression", "error in parsing response for command box " + commandBoxID);
} }
System.out.println("getContent " + content.size());
return content; return content;
} }
......
...@@ -125,8 +125,6 @@ public class DataAccessor { ...@@ -125,8 +125,6 @@ public class DataAccessor {
logError("getInt32Value", response.getError(), propertyID); logError("getInt32Value", response.getError(), propertyID);
} }
else { else {
System.out.println("GetInt32Value " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -161,8 +159,6 @@ public class DataAccessor { ...@@ -161,8 +159,6 @@ public class DataAccessor {
logError("setInt32Value", response.getError(), propertyID); logError("setInt32Value", response.getError(), propertyID);
} }
else { else {
System.out.println("SetInt32Value " + databaseID + " " + propertyID + " " + value + " done");
return response.getValue(); return response.getValue();
} }
} }
...@@ -196,8 +192,6 @@ public class DataAccessor { ...@@ -196,8 +192,6 @@ public class DataAccessor {
logError("getInt64Value", response.getError(), propertyID); logError("getInt64Value", response.getError(), propertyID);
} }
else { else {
System.out.println("GetInt64Value " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -232,9 +226,6 @@ public class DataAccessor { ...@@ -232,9 +226,6 @@ public class DataAccessor {
logError("setInt64Value", response.getError(), propertyID); logError("setInt64Value", response.getError(), propertyID);
} }
else { else {
System.out.println("SetInt64Value " + databaseID + " " + propertyID + " " + value + " done");
return response.getValue(); return response.getValue();
} }
} }
...@@ -268,8 +259,6 @@ public class DataAccessor { ...@@ -268,8 +259,6 @@ public class DataAccessor {
logError("getFloat32Value", response.getError(), propertyID); logError("getFloat32Value", response.getError(), propertyID);
} }
else { else {
System.out.println("GetFloat32Value " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -305,8 +294,6 @@ public class DataAccessor { ...@@ -305,8 +294,6 @@ public class DataAccessor {
logError("setFloat32Value", response.getError(), propertyID); logError("setFloat32Value", response.getError(), propertyID);
} }
else { else {
System.out.println("SetFloat32Value " + databaseID + " " + propertyID + " " + value + " done");
return response.getValue(); return response.getValue();
} }
} }
...@@ -340,8 +327,6 @@ public class DataAccessor { ...@@ -340,8 +327,6 @@ public class DataAccessor {
logError("getFloat64Value", response.getError(), propertyID); logError("getFloat64Value", response.getError(), propertyID);
} }
else { else {
System.out.println("GetFloat64Value " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -376,8 +361,6 @@ public class DataAccessor { ...@@ -376,8 +361,6 @@ public class DataAccessor {
logError("setFloat64Value", response.getError(), propertyID); logError("setFloat64Value", response.getError(), propertyID);
} }
else { else {
System.out.println("SetFloat64Value " + databaseID + " " + propertyID + " " + value + " done");
return response.getValue(); return response.getValue();
} }
} }
...@@ -411,8 +394,6 @@ public class DataAccessor { ...@@ -411,8 +394,6 @@ public class DataAccessor {
logError("getStringValue", response.getError(), propertyID); logError("getStringValue", response.getError(), propertyID);
} }
else { else {
System.out.println("GetStringValue " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -447,8 +428,6 @@ public class DataAccessor { ...@@ -447,8 +428,6 @@ public class DataAccessor {
logError("setStringValue", response.getError(), propertyID); logError("setStringValue", response.getError(), propertyID);
} }
else { else {
System.out.println("SetStringValue " + databaseID + " " + propertyID + " " + value + " done");
return response.getValue(); return response.getValue();
} }
} }
...@@ -482,8 +461,6 @@ public class DataAccessor { ...@@ -482,8 +461,6 @@ public class DataAccessor {
logError("getBooleanValue", response.getError(), propertyID); logError("getBooleanValue", response.getError(), propertyID);
} }
else { else {
System.out.println("GetBooleanValue " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -518,8 +495,6 @@ public class DataAccessor { ...@@ -518,8 +495,6 @@ public class DataAccessor {
logError("setBooleanValue", response.getError(), propertyID); logError("setBooleanValue", response.getError(), propertyID);
} }
else { else {
System.out.println("SetBooleanValue " + databaseID + " " + propertyID + " " + value + " done");
return response.getValue(); return response.getValue();
} }
} }
...@@ -555,8 +530,6 @@ public class DataAccessor { ...@@ -555,8 +530,6 @@ public class DataAccessor {
logError("getArraySize", response.getError(), propertyID); logError("getArraySize", response.getError(), propertyID);
} }
else { else {
System.out.println("GetArraySize " + databaseID + " " + propertyID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -590,8 +563,6 @@ public class DataAccessor { ...@@ -590,8 +563,6 @@ public class DataAccessor {
logError("getInt32Array", response.getError(), propertyID); logError("getInt32Array", response.getError(), propertyID);
} }
else { else {
System.out.println("GetInt32Array " + databaseID + " " + propertyID + " -> " + response.getValueList().size());
int[] result = new int[response.getValueList().size()]; int[] result = new int[response.getValueList().size()];
List<Integer> values = response.getValueList(); List<Integer> values = response.getValueList();
...@@ -656,8 +627,6 @@ public class DataAccessor { ...@@ -656,8 +627,6 @@ public class DataAccessor {
logError("getFloat64Array", response.getError(), propertyID); logError("getFloat64Array", response.getError(), propertyID);
} }
else { else {
System.out.println("GetFloat64Array " + databaseID + " " + propertyID + " -> " + response.getValueList().size());
double[] result = new double[response.getValueList().size()]; double[] result = new double[response.getValueList().size()];
List<Double> values = response.getValueList(); List<Double> values = response.getValueList();
...@@ -705,8 +674,6 @@ public class DataAccessor { ...@@ -705,8 +674,6 @@ public class DataAccessor {
logError("getCommandState", response.getError(), commandID); logError("getCommandState", response.getError(), commandID);
} }
else { else {
System.out.println("GetCommandState " + databaseID + " " + commandID + " -> " + response.getValue());
Common.CommandStateType.Type commandState = response.getValue(); Common.CommandStateType.Type commandState = response.getValue();
if (commandState == Common.CommandStateType.Type.INACTIVE) { if (commandState == Common.CommandStateType.Type.INACTIVE) {
...@@ -769,8 +736,6 @@ public class DataAccessor { ...@@ -769,8 +736,6 @@ public class DataAccessor {
logError("getCommandProgression", response.getError(), commandID); logError("getCommandProgression", response.getError(), commandID);
} }
else { else {
System.out.println("GetCommandProgression " + databaseID + " " + commandID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -804,9 +769,6 @@ public class DataAccessor { ...@@ -804,9 +769,6 @@ public class DataAccessor {
if (response.hasError()) { if (response.hasError()) {
logError("execute", response.getError(), commandID); logError("execute", response.getError(), commandID);
} }
else {
System.out.println("Execute " + databaseID + " " + commandID + " -> " + response.getValue());
}
} }
catch (InvalidProtocolBufferException e) { catch (InvalidProtocolBufferException e) {
LOGGER.logp(Level.WARNING, this.getClass().getName(), "execute", "error in parsing response for command with ID " + commandID); LOGGER.logp(Level.WARNING, this.getClass().getName(), "execute", "error in parsing response for command with ID " + commandID);
...@@ -835,9 +797,6 @@ public class DataAccessor { ...@@ -835,9 +797,6 @@ public class DataAccessor {
if (response.hasError()) { if (response.hasError()) {
logError("stop", response.getError(), commandID); logError("stop", response.getError(), commandID);
} }
else {
System.out.println("Stop " + databaseID + " " + commandID + " -> " + response.getValue());
}
} }
catch (InvalidProtocolBufferException e) { catch (InvalidProtocolBufferException e) {
LOGGER.logp(Level.WARNING, this.getClass().getName(), "stop", "error in parsing response for command with ID " + commandID); LOGGER.logp(Level.WARNING, this.getClass().getName(), "stop", "error in parsing response for command with ID " + commandID);
...@@ -860,7 +819,6 @@ public class DataAccessor { ...@@ -860,7 +819,6 @@ public class DataAccessor {
try { try {
Common.StringResponse response = Common.StringResponse.parseFrom(databaseRequester.receive()); Common.StringResponse response = Common.StringResponse.parseFrom(databaseRequester.receive());
System.out.println("GetWholeScannableProperties " + databaseID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
......
...@@ -141,7 +141,6 @@ public class ServantManagerAccessor { ...@@ -141,7 +141,6 @@ public class ServantManagerAccessor {
try { try {
ServantData response = ServantData.parseFrom(servantManagerRequester.receive()); ServantData response = ServantData.parseFrom(servantManagerRequester.receive());
System.out.println("GetWholeConfiguration " + databaseID);
return response; return response;
} }
...@@ -166,7 +165,6 @@ public class ServantManagerAccessor { ...@@ -166,7 +165,6 @@ public class ServantManagerAccessor {
try { try {
ServantDataUpdate response = ServantDataUpdate.parseFrom(servantManagerRequester.receive()); ServantDataUpdate response = ServantDataUpdate.parseFrom(servantManagerRequester.receive());
System.out.println("GetWholeConfigurationUpdate " + databaseID);
return response; return response;
} }
...@@ -192,7 +190,6 @@ public class ServantManagerAccessor { ...@@ -192,7 +190,6 @@ public class ServantManagerAccessor {
try { try {
ServantDescriptor response = ServantDescriptor.parseFrom(servantManagerRequester.receive()); ServantDescriptor response = ServantDescriptor.parseFrom(servantManagerRequester.receive());
System.out.println("GetControllerConfiguration " + databaseID);
return response; return response;
} }
...@@ -219,7 +216,6 @@ public class ServantManagerAccessor { ...@@ -219,7 +216,6 @@ public class ServantManagerAccessor {
try { try {
ServantSpyProperties response = ServantSpyProperties.parseFrom(servantManagerRequester.receive()); ServantSpyProperties response = ServantSpyProperties.parseFrom(servantManagerRequester.receive());
System.out.println("GetServantSpyProperties " + databaseID);
return response; return response;
} }
...@@ -247,7 +243,6 @@ public class ServantManagerAccessor { ...@@ -247,7 +243,6 @@ public class ServantManagerAccessor {
try { try {
ServantDynamicProperties response = ServantDynamicProperties.parseFrom(servantManagerRequester.receive()); ServantDynamicProperties response = ServantDynamicProperties.parseFrom(servantManagerRequester.receive());
System.out.println("GetServantDynamicProperties " + databaseID);
return response; return response;
} }
...@@ -281,8 +276,6 @@ public class ServantManagerAccessor { ...@@ -281,8 +276,6 @@ public class ServantManagerAccessor {
logError("cloneController", response.getError(), servantID); logError("cloneController", response.getError(), servantID);
} }
else { else {
System.out.println("CloneController " + servantID + " -> " + response.getValue());
return response.getValue(); return response.getValue();
} }
} }
...@@ -316,8 +309,6 @@ public class ServantManagerAccessor { ...@@ -316,8 +309,6 @@ public class ServantManagerAccessor {
logError("removeController", response.getError(), servantID); logError("removeController", response.getError(), servantID);
} }
else { else {
System.out.println("RemoveController " + servantID + " -> " + response.getValue());
return true; return true;
} }
} }
...@@ -343,7 +334,6 @@ public class ServantManagerAccessor { ...@@ -343,7 +334,6 @@ public class ServantManagerAccessor {
try { try {
Common.StringResponse response = Common.StringResponse.parseFrom(servantManagerRequester.receive()); Common.StringResponse response = Common.StringResponse.parseFrom(servantManagerRequester.receive());
System.out.println("GetPropertiesForGeneric");
return response.getValue(); return response.getValue();
} }
...@@ -356,19 +346,13 @@ public class ServantManagerAccessor { ...@@ -356,19 +346,13 @@ public class ServantManagerAccessor {
public void loadWholeConfiguration() throws LoadConfigurationFailure { public void loadWholeConfiguration() throws LoadConfigurationFailure {
System.out.println("ServantManagerAccessor loadWholeConfiguration");
ServantData servantData = getWholeConfiguration(DATABASE_ID); ServantData servantData = getWholeConfiguration(DATABASE_ID);
initAllMaps(servantData); initAllMaps(servantData);
System.out.println("done");
} }
public void updateWholeConfiguration() throws LoadConfigurationFailure { public void updateWholeConfiguration() throws LoadConfigurationFailure {
System.out.println("ServantManagerAccessor updateWholeConfiguration");
ServantDataUpdate servantDataUpdate = getWholeConfigurationUpdate(DATABASE_ID); ServantDataUpdate servantDataUpdate = getWholeConfigurationUpdate(DATABASE_ID);
updateAllMaps(servantDataUpdate.getDriversList(), true); updateAllMaps(servantDataUpdate.getDriversList(), true);
...@@ -724,7 +708,6 @@ public class ServantManagerAccessor { ...@@ -724,7 +708,6 @@ public class ServantManagerAccessor {
try { try {
Common.BooleanResponse response = Common.BooleanResponse.parseFrom(servantManagerRequester.receive()); Common.BooleanResponse response = Common.BooleanResponse.parseFrom(servantManagerRequester.receive());
System.out.println("PauseSpies " + isPaused);
} }
catch (InvalidProtocolBufferException e) { catch (InvalidProtocolBufferException e) {
LOGGER.logp(Level.WARNING, this.getClass().getName(), "pauseSpies", "error in parsing response"); LOGGER.logp(Level.WARNING, this.getClass().getName(), "pauseSpies", "error in parsing response");
...@@ -769,9 +752,6 @@ public class ServantManagerAccessor { ...@@ -769,9 +752,6 @@ public class ServantManagerAccessor {
if (response.hasError()) { if (response.hasError()) {
logError("ReconnectDriver", response.getError(), servantID); logError("ReconnectDriver", response.getError(), servantID);
} }
else {
System.out.println("reconnectDriver " + servantID + " -> " + response.getValue());
}
} }
catch (InvalidProtocolBufferException e) { catch (InvalidProtocolBufferException e) {
LOGGER.logp(Level.WARNING, this.getClass().getName(), "reconnectDriver", "error in parsing response for property with ID " + servantID); LOGGER.logp(Level.WARNING, this.getClass().getName(), "reconnectDriver", "error in parsing response for property with ID " + servantID);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment