usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [4/5] incubator-usergrid git commit: [USERGRID-342] Added unimplemented remove method to ElasticSearchQueryExecutor. Fixed merge artifact in AdminEmailEncodingIT
Date Wed, 01 Apr 2015 18:28:07 GMT
[USERGRID-342] Added unimplemented remove method to ElasticSearchQueryExecutor. Fixed merge
artifact in AdminEmailEncodingIT


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d20267bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d20267bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d20267bb

Branch: refs/heads/two-dot-o_exception_verification
Commit: d20267bb5bc179e77f5174f1c338fbf7c7df9b99
Parents: 2d1c8b8
Author: ryan bridges <ryanb@apache.org>
Authored: Fri Mar 27 12:48:43 2015 -0400
Committer: ryan bridges <ryanb@apache.org>
Committed: Fri Mar 27 12:48:43 2015 -0400

----------------------------------------------------------------------
 .../corepersistence/results/ElasticSearchQueryExecutor.java    | 5 +++++
 .../rest/management/organizations/AdminEmailEncodingIT.java    | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d20267bb/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java
index 535af36..2b1b75e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ElasticSearchQueryExecutor.java
@@ -208,4 +208,9 @@ public class ElasticSearchQueryExecutor implements QueryExecutor {
 
         return toReturn;
     }
+
+    @Override
+    public void remove() {
+        throw new RuntimeException("Remove not implemented!!");
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d20267bb/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
index 379a359..eab9864 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -88,13 +88,9 @@ public class AdminEmailEncodingIT extends AbstractRestIT {
      * Given an organization name and an arbitrary character or string,
      * ensure that an organization and admin user can be created when
      * the given string is a part of the admin email address
-<<<<<<< HEAD
-     * @param symbol
-=======
      *
      * @param symbol
-     * @throws IOException
->>>>>>> b4727f1db4b3e3e312b6f40d25a42ee66246cfd7
+     * @throws UniformInterfaceException
      */
     private void doTest(String symbol) throws UniformInterfaceException {
 


Mime
View raw message