Due to newest packages.
This commit is contained in:
@ -1,9 +1,5 @@
|
|||||||
#
|
#
|
||||||
<<<<<<< HEAD
|
#Fri Nov 27 11:43:12 CET 2015
|
||||||
#Thu Oct 29 09:13:22 CET 2015
|
|
||||||
=======
|
|
||||||
#Wed Oct 28 12:53:12 CET 2015
|
|
||||||
>>>>>>> refs/heads/master
|
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||||
|
@ -9,8 +9,6 @@ import java.util.regex.Pattern;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import org.apache.commons.lang.NotImplementedException;
|
|
||||||
|
|
||||||
import ch.psi.daq.cassandra.reader.CassandraReader;
|
import ch.psi.daq.cassandra.reader.CassandraReader;
|
||||||
import ch.psi.daq.cassandra.reader.query.PulseIdRangeQuery;
|
import ch.psi.daq.cassandra.reader.query.PulseIdRangeQuery;
|
||||||
import ch.psi.daq.cassandra.reader.query.TimeRangeQuery;
|
import ch.psi.daq.cassandra.reader.query.TimeRangeQuery;
|
||||||
@ -111,9 +109,10 @@ public class DummyCassandraReader implements CassandraReader {
|
|||||||
if (ceq instanceof ChannelEventQueryInfo) {
|
if (ceq instanceof ChannelEventQueryInfo) {
|
||||||
result.add(getEvent((ChannelEventQueryInfo) ceq));
|
result.add(getEvent((ChannelEventQueryInfo) ceq));
|
||||||
} else {
|
} else {
|
||||||
throw new NotImplementedException("This is not yet implemented!");
|
throw new UnsupportedOperationException("This is not yet implemented!");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return result.stream();
|
return result.stream();
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@ -193,7 +192,7 @@ public class DummyCassandraReader implements CassandraReader {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public CompletableFuture<ChannelEvent> getEventAsync(ChannelEventQueryInfo queryInfo, String... columns) {
|
public CompletableFuture<ChannelEvent> getEventAsync(ChannelEventQueryInfo queryInfo, String... columns) {
|
||||||
throw new NotImplementedException();
|
throw new UnsupportedOperationException();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user