From aa907f685650ba1b9fa3d008dd30824666113085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=A4rki?= <fabian.maerki@psi.ch>
Date: Fri, 27 Nov 2015 11:44:15 +0100
Subject: [PATCH] Due to newest packages.

---
 .settings/org.eclipse.jdt.core.prefs                       | 6 +-----
 .../psi/daq/test/queryrest/query/DummyCassandraReader.java | 7 +++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 2ed8f44..78d92f6 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,5 @@
 #
-<<<<<<< HEAD
-#Thu Oct 29 09:13:22 CET 2015
-=======
-#Wed Oct 28 12:53:12 CET 2015
->>>>>>> refs/heads/master
+#Fri Nov 27 11:43:12 CET 2015
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
index 7966d29..65ee474 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
@@ -9,8 +9,6 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang.NotImplementedException;
-
 import ch.psi.daq.cassandra.reader.CassandraReader;
 import ch.psi.daq.cassandra.reader.query.PulseIdRangeQuery;
 import ch.psi.daq.cassandra.reader.query.TimeRangeQuery;
@@ -111,9 +109,10 @@ public class DummyCassandraReader implements CassandraReader {
          if (ceq instanceof ChannelEventQueryInfo) {
             result.add(getEvent((ChannelEventQueryInfo) ceq));
          } else {
-            throw new NotImplementedException("This is not yet implemented!");
+            throw new UnsupportedOperationException("This is not yet implemented!");
          }
       });
+      
       return result.stream();
    }
    /**
@@ -193,7 +192,7 @@ public class DummyCassandraReader implements CassandraReader {
     */
    @Override
    public CompletableFuture<ChannelEvent> getEventAsync(ChannelEventQueryInfo queryInfo, String... columns) {
-      throw new NotImplementedException();
+      throw new UnsupportedOperationException();
    }
 
    /**