meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed ScanErrorCallback error in ReceiverWebAPI

android-scanner
Laura Radaelli 2017-03-20 18:20:30 +02:00
parent 09ee63eca4
commit ed7b50de23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
polling-station/src/main/java/meerkat/pollingstation/ReceiverWebAPI.java
View File

@ -2,7 +2,9 @@ package meerkat.pollingstation;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.protobuf.BoolValue; import com.google.protobuf.BoolValue;
import meerkat.pollingstation.controller.callbacks.ScanCallback;
import meerkat.pollingstation.controller.callbacks.ScanDataCallback; import meerkat.pollingstation.controller.callbacks.ScanDataCallback;
import meerkat.pollingstation.controller.callbacks.ScanErrorCallback;
import meerkat.protobuf.PollingStation; import meerkat.protobuf.PollingStation;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
@ -28,7 +30,7 @@ public class ReceiverWebAPI implements PollingStationScanner.Producer {
@Context @Context
ServletContext servletContext; ServletContext servletContext;
LinkedBlockingQueue<FutureCallback<PollingStation.ScannedData>> callbacks; LinkedBlockingQueue<ScanCallback> callbacks;
/** /**
* This method is called by the Jetty engine when instantiating the servlet * This method is called by the Jetty engine when instantiating the servlet
@ -39,7 +41,7 @@ public class ReceiverWebAPI implements PollingStationScanner.Producer {
Object context = servletContext.getAttribute(ReceiverScanHandler.CALLBACKS_ATTRIBUTE_NAME); Object context = servletContext.getAttribute(ReceiverScanHandler.CALLBACKS_ATTRIBUTE_NAME);
try { try {
callbacks = (LinkedBlockingQueue<FutureCallback<PollingStation.ScannedData>>) context; callbacks = (LinkedBlockingQueue<ScanCallback>) context;
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw e; throw e;
} }
@ -89,7 +91,7 @@ public class ReceiverWebAPI implements PollingStationScanner.Producer {
// //
// } // }
ScanDataCallback callback = new ScanDataCallback(errorMsg); ScanErrorCallback callback = new ScanErrorCallback(errorMsg);
// scanner.subscribe(callback); // scanner.subscribe(callback);
callbacks.add(callback); callbacks.add(callback);

4
polling-station/src/main/java/meerkat/pollingstation/controller/callbacks/ScanErrorCallback.java
View File

@ -8,9 +8,9 @@ import meerkat.protobuf.PollingStation;
*/ */
public class ScanErrorCallback extends ScanCallback implements FutureCallback<PollingStation.ErrorMsg> { public class ScanErrorCallback extends ScanCallback implements FutureCallback<PollingStation.ErrorMsg> {
private final String expectedErrorMessage; private final PollingStation.ErrorMsg expectedErrorMessage;
public ScanErrorCallback(String expectedErrorMessage) { public ScanErrorCallback(PollingStation.ErrorMsg expectedErrorMessage) {
this.expectedErrorMessage = expectedErrorMessage; this.expectedErrorMessage = expectedErrorMessage;
} }