forgot to do zookeeper

go travisci go

.gitignore

@@ -1,6 +1,6 @@
-target/
-.settings/
-.classpath
-.project
-/target/
-*.swp
+target/
+.settings/
+.classpath
+.project
+/target/
+*.swp

.travis.yml

@@ -1,18 +1,4 @@
 language: java
 jdk:
   - openjdk7
-env:
-  global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "kd49BqB0JXweutiUMSwO2iH6R2A0AW/EsY7bkQUhOnEF8zKQUpazSDcPhuVO9Ax2BLgrZMR0NFpsTDqaAUea/LJS47Iq2w5Hf75kDAH6LM0STgxPRuNzGjT4CxNlCUF6aq/74yrFQuMfLXSRrWdIJa/0JEEJdGPqMY61+4eXBuE="
-
-addons:
-  coverity_scan:
-    project:
-      name: "JHUAPL/AccumuloGraph"
-      description: "Build submitted via Travis CI"
-    notification_email: webbrl1@live.com
-    build_command_prepend: "mvn clean"
-    build_command:   "mvn -DskipTests=true compile"
-    branch_pattern: coverity_scan
+  

LICENSE

@@ -1,201 +1,201 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -28,7 +28,7 @@ to Maven Central.
 <dependency>
 	<groupId>edu.jhuapl.tinkerpop</groupId>
 	<artifactId>blueprints-accumulo-graph</artifactId>
-	<version>0.2.1</version>
+	<version>0.2.0</version>
 </dependency>
 ```
 

src/main/java/edu/jhuapl/tinkerpop/AccumuloEdge.java

@@ -49,10 +49,8 @@ public class AccumuloEdge extends AccumuloElement implements Edge {
 
   @Override
   public Vertex getVertex(Direction direction) throws IllegalArgumentException {
-
     if (!Direction.IN.equals(direction) && !Direction.OUT.equals(direction)) {
       throw new IllegalArgumentException("Invalid direction: "+direction);
-
     }
 
     // The vertex information needs to be loaded.

src/main/java/edu/jhuapl/tinkerpop/AccumuloGraph.java

@@ -177,7 +177,6 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph {
 
   @Override
   public void removeVertex(Vertex vertex) {
-
     vertex.remove();
   }
 

src/main/java/edu/jhuapl/tinkerpop/AccumuloGraphConfiguration.java

@@ -19,6 +19,8 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -75,7 +77,7 @@ implements Serializable {
   /**
    * Temp directory used by getInstance when a Mini InstanceType is used.
    */
-  private String miniClusterTempDir;
+  private File miniClusterTempDir;
   private MiniAccumuloCluster accumuloMiniCluster;
 
 
@@ -254,6 +256,7 @@ implements Serializable {
         InstanceType.Mini.equals(type)) {
       setUser("root");
       setPassword("");
+      setInstanceName("");
       setCreate(true);
     }
 
@@ -895,6 +898,20 @@ implements Serializable {
     if (connector == null) {
       Instance inst = null;
       switch (getInstanceType()) {
+        case Mini:
+          if (miniClusterTempDir == null) {
+            miniClusterTempDir = Files.createTempDirectory("accumulo-mini").toFile();
+          } 
+          accumuloMiniCluster = new MiniAccumuloCluster(miniClusterTempDir, ""); // conf.getString(PASSWORD)
+          try {
+            accumuloMiniCluster.start();
+          } catch (Exception ex) {
+            throw new AccumuloGraphException(ex);
+          }
+          this.setInstanceName(accumuloMiniCluster.getInstanceName());
+          this.setZooKeeperHosts(accumuloMiniCluster.getZooKeepers());
+          this.setPassword("");
+          
         case Distributed:
           if (getInstanceName() == null) {
             throw new IllegalArgumentException("Must specify instance name for distributed mode");
@@ -904,24 +921,7 @@ implements Serializable {
           inst = new ZooKeeperInstance(getInstanceName(), getZooKeeperHosts());
           break;
 
-        case Mini:
-          File dir = null;
-          if (miniClusterTempDir == null) {
-            dir = createTempDir();
-            dir.deleteOnExit();
-          } else {
-            // already set by setMiniClusterTempDir(), It should be cleaned up outside of this class.
-            dir = new File(miniClusterTempDir);
-          }
-          accumuloMiniCluster = new MiniAccumuloCluster(dir, ""); // conf.getString(PASSWORD)
-          try {
-            accumuloMiniCluster.start();
-          } catch (Exception ex) {
-            throw new AccumuloGraphException(ex);
-          }
-          inst = new ZooKeeperInstance(accumuloMiniCluster.getInstanceName(), accumuloMiniCluster.getZooKeepers());
-          throw new UnsupportedOperationException("TODO");
-
+     
         case Mock:
           inst = new MockInstance(getInstanceName());
           break;
@@ -971,7 +971,7 @@ implements Serializable {
    * @param miniClusterTempDir
    */
   public AccumuloGraphConfiguration setMiniClusterTempDir(String miniClusterTempDir) {
-    this.miniClusterTempDir = miniClusterTempDir;
+    this.miniClusterTempDir = new File(miniClusterTempDir);
     return this;
   }
 
@@ -1046,8 +1046,8 @@ implements Serializable {
         checkPropertyValue(Keys.PASSWORD, getPassword(), false);
         // no break intentional
       case Mini:
-        checkPropertyValue(Keys.INSTANCE, getInstanceName(), false);
-        checkPropertyValue(Keys.PASSWORD, getPassword(), true);
+//        checkPropertyValue(Keys.INSTANCE, getInstanceName(), false);
+  //      checkPropertyValue(Keys.PASSWORD, getPassword(), true);
         // no break intentional
       case Mock:
         checkPropertyValue(Keys.GRAPH_NAME, getGraphName(), false);
@@ -1089,13 +1089,6 @@ implements Serializable {
     }
   }
 
-  private File createTempDir() throws IOException {
-    File temp = File.createTempFile(AccumuloGraphConfiguration
-        .class.getSimpleName(), ".mini.tmp");
-    Files.delete(temp.toPath());
-    Files.createDirectory(temp.toPath());
-    return temp;
-  }
 
   /**
    * Print out this configuration.

src/main/java/edu/jhuapl/tinkerpop/AccumuloGraphException.java

@@ -1,36 +1,36 @@
-/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.jhuapl.tinkerpop;
-
-public class AccumuloGraphException extends RuntimeException {
-
-  private static final long serialVersionUID = 2179662107592532517L;
-
-  public AccumuloGraphException() {
-
-  }
-
-  public AccumuloGraphException(String reason) {
-    super(reason);
-  }
-
-  public AccumuloGraphException(Throwable cause) {
-    super(cause);
-  }
-
-  public AccumuloGraphException(String reason, Throwable cause) {
-    super(reason, cause);
-  }
-}
+/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package edu.jhuapl.tinkerpop;
+
+public class AccumuloGraphException extends RuntimeException {
+
+  private static final long serialVersionUID = 2179662107592532517L;
+
+  public AccumuloGraphException() {
+
+  }
+
+  public AccumuloGraphException(String reason) {
+    super(reason);
+  }
+
+  public AccumuloGraphException(Throwable cause) {
+    super(cause);
+  }
+
+  public AccumuloGraphException(String reason, Throwable cause) {
+    super(reason, cause);
+  }
+}

src/main/java/edu/jhuapl/tinkerpop/AccumuloRexsterGraphConfiguration.java

@@ -1,50 +1,50 @@
-/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.jhuapl.tinkerpop;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-
-import com.tinkerpop.blueprints.Graph;
-import com.tinkerpop.blueprints.GraphFactory;
-import com.tinkerpop.rexster.Tokens;
-import com.tinkerpop.rexster.config.GraphConfiguration;
-import com.tinkerpop.rexster.config.GraphConfigurationContext;
-import com.tinkerpop.rexster.config.GraphConfigurationException;
-
-import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
-
-public class AccumuloRexsterGraphConfiguration implements GraphConfiguration {
-
-  @Override
-  public Graph configureGraphInstance(GraphConfigurationContext context) throws GraphConfigurationException {
-
-    Configuration conf = context.getProperties();
-    try {
-      conf = ((HierarchicalConfiguration) conf).configurationAt(Tokens.REXSTER_GRAPH_PROPERTIES);
-    } catch (IllegalArgumentException iae) {
-      throw new GraphConfigurationException("Check graph configuration. Missing or empty configuration element: " + Tokens.REXSTER_GRAPH_PROPERTIES);
-    }
-
-    AccumuloGraphConfiguration cfg = new AccumuloGraphConfiguration(conf);
-    if (cfg.getInstanceType().equals(InstanceType.Mock)) {
-      cfg.setPassword("".getBytes());
-      cfg.setUser("root");
-    }
-    cfg.setGraphName(context.getProperties().getString(Tokens.REXSTER_GRAPH_NAME));
-    return GraphFactory.open(cfg.getConfiguration());
-  }
-
-}
+/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package edu.jhuapl.tinkerpop;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.HierarchicalConfiguration;
+
+import com.tinkerpop.blueprints.Graph;
+import com.tinkerpop.blueprints.GraphFactory;
+import com.tinkerpop.rexster.Tokens;
+import com.tinkerpop.rexster.config.GraphConfiguration;
+import com.tinkerpop.rexster.config.GraphConfigurationContext;
+import com.tinkerpop.rexster.config.GraphConfigurationException;
+
+import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
+
+public class AccumuloRexsterGraphConfiguration implements GraphConfiguration {
+
+  @Override
+  public Graph configureGraphInstance(GraphConfigurationContext context) throws GraphConfigurationException {
+
+    Configuration conf = context.getProperties();
+    try {
+      conf = ((HierarchicalConfiguration) conf).configurationAt(Tokens.REXSTER_GRAPH_PROPERTIES);
+    } catch (IllegalArgumentException iae) {
+      throw new GraphConfigurationException("Check graph configuration. Missing or empty configuration element: " + Tokens.REXSTER_GRAPH_PROPERTIES);
+    }
+
+    AccumuloGraphConfiguration cfg = new AccumuloGraphConfiguration(conf);
+    if (cfg.getInstanceType().equals(InstanceType.Mock)) {
+      cfg.setPassword("".getBytes());
+      cfg.setUser("root");
+    }
+    cfg.setGraphName(context.getProperties().getString(Tokens.REXSTER_GRAPH_NAME));
+    return GraphFactory.open(cfg.getConfiguration());
+  }
+
+}

src/main/java/edu/jhuapl/tinkerpop/mapreduce/MapReduceEdge.java

@@ -1,76 +1,76 @@
-/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.jhuapl.tinkerpop.mapreduce;
-
-import com.tinkerpop.blueprints.Direction;
-import com.tinkerpop.blueprints.Edge;
-import com.tinkerpop.blueprints.Vertex;
-import com.tinkerpop.blueprints.util.ExceptionFactory;
-
-import edu.jhuapl.tinkerpop.AccumuloGraph;
-
-public class MapReduceEdge extends MapReduceElement implements Edge {
-
-  String sourceId;
-  String label;
-  String destinationId;
-
-  MapReduceEdge(AccumuloGraph parent) {
-    super(parent);
-  }
-
-  void setSourceId(String id) {
-    sourceId = id;
-  }
-
-  void setDestId(String id) {
-    destinationId = id;
-  }
-
-  MapReduceEdge(AccumuloGraph parent, String id, String src, String label, String dest) {
-    super(parent);
-    prepareId(id);
-    this.sourceId = src;
-    this.label = label;
-    this.destinationId = dest;
-  }
-
-  @Override
-  public String getLabel() {
-    return label;
-  }
-
-  @Override
-  public Vertex getVertex(Direction direction) throws IllegalArgumentException {
-    return parent.getVertex(getVertexId(direction));
-  }
-
-  public String getVertexId(Direction direction) throws IllegalArgumentException {
-    switch (direction) {
-      case IN:
-        return destinationId;
-      case OUT:
-        return sourceId;
-      case BOTH:
-      default:
-        throw ExceptionFactory.bothIsNotSupported();
-    }
-  }
-
-  public void setLabel(String label) {
-    this.label = label;
-  }
-
-}
+/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package edu.jhuapl.tinkerpop.mapreduce;
+
+import com.tinkerpop.blueprints.Direction;
+import com.tinkerpop.blueprints.Edge;
+import com.tinkerpop.blueprints.Vertex;
+import com.tinkerpop.blueprints.util.ExceptionFactory;
+
+import edu.jhuapl.tinkerpop.AccumuloGraph;
+
+public class MapReduceEdge extends MapReduceElement implements Edge {
+
+  String sourceId;
+  String label;
+  String destinationId;
+
+  MapReduceEdge(AccumuloGraph parent) {
+    super(parent);
+  }
+
+  void setSourceId(String id) {
+    sourceId = id;
+  }
+
+  void setDestId(String id) {
+    destinationId = id;
+  }
+
+  MapReduceEdge(AccumuloGraph parent, String id, String src, String label, String dest) {
+    super(parent);
+    prepareId(id);
+    this.sourceId = src;
+    this.label = label;
+    this.destinationId = dest;
+  }
+
+  @Override
+  public String getLabel() {
+    return label;
+  }
+
+  @Override
+  public Vertex getVertex(Direction direction) throws IllegalArgumentException {
+    return parent.getVertex(getVertexId(direction));
+  }
+
+  public String getVertexId(Direction direction) throws IllegalArgumentException {
+    switch (direction) {
+      case IN:
+        return destinationId;
+      case OUT:
+        return sourceId;
+      case BOTH:
+      default:
+        throw ExceptionFactory.bothIsNotSupported();
+    }
+  }
+
+  public void setLabel(String label) {
+    this.label = label;
+  }
+
+}

src/main/java/edu/jhuapl/tinkerpop/mapreduce/MapReduceVertex.java

@@ -117,7 +117,7 @@ public class MapReduceVertex extends MapReduceElement implements Vertex {
                 return e.getVertex(direction);
               case BOTH:
                 Vertex v = e.getVertex(Direction.IN);
-                if (v.getId().equals(id)) {
+                if (this.equals(v)) {
                   return e.getVertex(Direction.OUT);
                 } else {
                   return v;

src/test/java/edu/jhuapl/tinkerpop/AccumuloGraphTestUtils.java

@@ -1,32 +1,32 @@
-/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.jhuapl.tinkerpop;
-
-import com.tinkerpop.blueprints.Graph;
-import com.tinkerpop.blueprints.GraphFactory;
-
-import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
-
-public class AccumuloGraphTestUtils {
-
-  public static AccumuloGraphConfiguration generateGraphConfig(String graphDirectoryName) {
-    return new AccumuloGraphConfiguration().setInstanceType(InstanceType.Mock)
-        .setGraphName(graphDirectoryName).setCreate(true);
-  }
-
-  public static Graph makeGraph(String name) {
-    return GraphFactory.open(generateGraphConfig(name));
-  }
-}
+/* Copyright 2014 The Johns Hopkins University Applied Physics Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package edu.jhuapl.tinkerpop;
+
+import com.tinkerpop.blueprints.Graph;
+import com.tinkerpop.blueprints.GraphFactory;
+
+import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
+
+public class AccumuloGraphTestUtils {
+
+  public static AccumuloGraphConfiguration generateGraphConfig(String graphDirectoryName) {
+    return new AccumuloGraphConfiguration().setInstanceType(InstanceType.Mini)
+        .setGraphName(graphDirectoryName).setCreate(true);
+  }
+
+  public static Graph makeGraph(String name) {
+    return GraphFactory.open(generateGraphConfig(name));
+  }
+}

src/test/java/edu/jhuapl/tinkerpop/mapreduce/ElementOutputFormatTest.java

@@ -1,111 +1,111 @@
-package edu.jhuapl.tinkerpop.mapreduce;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.IOException;
-
-import org.apache.accumulo.core.util.CachedConfiguration;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.conf.Configured;
-import org.apache.hadoop.io.NullWritable;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.Job;
-import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.hadoop.util.Tool;
-import org.apache.hadoop.util.ToolRunner;
-import org.junit.Test;
-
-import com.tinkerpop.blueprints.Element;
-import com.tinkerpop.blueprints.Graph;
-import com.tinkerpop.blueprints.GraphFactory;
-import com.tinkerpop.blueprints.Vertex;
-
-import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration;
-import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
-
-public class ElementOutputFormatTest {
-  private static AssertionError e1 = null;
-  private static AssertionError e2 = null;
-
-  private static class MRTester extends Configured implements Tool {
-
-    private static class TestVertexMapper extends Mapper<Text,Vertex,NullWritable,Element> {
-      int count = 0;
-
-      @Override
-      protected void map(Text k, Vertex v, Context context) throws IOException, InterruptedException {
-        try {
-          assertEquals(k.toString(), v.getId().toString());
-
-          v.setProperty("NAME", "BANANA" + v.getId());
-          context.write(NullWritable.get(), v);
-        } catch (AssertionError e) {
-          e1 = e;
-        }
-        count++;
-      }
-
-      @Override
-      protected void cleanup(Context context) throws IOException, InterruptedException {
-        try {
-          assertEquals(100, count);
-        } catch (AssertionError e) {
-          e2 = e;
-        }
-      }
-    }
-
-    @Override
-    public int run(String[] args) throws Exception {
-
-      setConf(new Configuration());
-
-      getConf().set("fs.default.name", "local");
-
-      Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
-      job.setJarByClass(this.getClass());
-      AccumuloGraphConfiguration cfg = new AccumuloGraphConfiguration().setInstanceName("_mapreduce_instance2").setUser("root").setPassword("".getBytes())
-          .setGraphName("_mapreduce_table_2").setInstanceType(InstanceType.Mock).setCreate(true);
-      job.setInputFormatClass(VertexInputFormat.class);
-      
-      VertexInputFormat.setAccumuloGraphConfiguration(job, cfg);
-      
-      ElementOutputFormat.setAccumuloGraphConfiguration(job, cfg);
-
-      job.setMapperClass(TestVertexMapper.class);
-
-      job.setMapOutputKeyClass(NullWritable.class);
-      job.setMapOutputValueClass(Element.class);
-      job.setOutputFormatClass(ElementOutputFormat.class);
-
-      job.setNumReduceTasks(0);
-
-      job.waitForCompletion(true);
-
-      return job.isSuccessful() ? 0 : 1;
-    }
-
-    public static int main(String[] args) throws Exception {
-      return ToolRunner.run(CachedConfiguration.getInstance(), new MRTester(), args);
-    }
-  }
-
-  @Test
-  public void testVertexOutputFormatMap() throws Exception {
-    final String INSTANCE_NAME = "_mapreduce_instance2";
-    final String TEST_TABLE_1 = "_mapreduce_table_2";
-
-    if (!System.getProperty("os.name").startsWith("Windows")) {
-      Graph g = GraphFactory.open(new AccumuloGraphConfiguration().setInstanceName(INSTANCE_NAME).setUser("root").setPassword("".getBytes())
-          .setGraphName(TEST_TABLE_1).setInstanceType(InstanceType.Mock).setCreate(true).getConfiguration());
-      for (int i = 0; i < 100; i++) {
-        g.addVertex(i + "");
-      }
-      assertEquals(0, MRTester.main(new String[] {}));
-      assertNull(e1);
-      assertNull(e2);
-      assertEquals(g.getVertex("1").getProperty("NAME"), "BANANA1");
-    }
-  }
-}
+package edu.jhuapl.tinkerpop.mapreduce;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+
+import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
+import org.junit.Test;
+
+import com.tinkerpop.blueprints.Element;
+import com.tinkerpop.blueprints.Graph;
+import com.tinkerpop.blueprints.GraphFactory;
+import com.tinkerpop.blueprints.Vertex;
+
+import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration;
+import edu.jhuapl.tinkerpop.AccumuloGraphConfiguration.InstanceType;
+
+public class ElementOutputFormatTest {
+  private static AssertionError e1 = null;
+  private static AssertionError e2 = null;
+
+  private static class MRTester extends Configured implements Tool {
+
+    private static class TestVertexMapper extends Mapper<Text,Vertex,NullWritable,Element> {
+      int count = 0;
+
+      @Override
+      protected void map(Text k, Vertex v, Context context) throws IOException, InterruptedException {
+        try {
+          assertEquals(k.toString(), v.getId().toString());
+
+          v.setProperty("NAME", "BANANA" + v.getId());
+          context.write(NullWritable.get(), v);
+        } catch (AssertionError e) {
+          e1 = e;
+        }
+        count++;
+      }
+
+      @Override
+      protected void cleanup(Context context) throws IOException, InterruptedException {
+        try {
+          assertEquals(100, count);
+        } catch (AssertionError e) {
+          e2 = e;
+        }
+      }
+    }
+
+    @Override
+    public int run(String[] args) throws Exception {
+
+      setConf(new Configuration());
+
+      getConf().set("fs.default.name", "local");
+
+      Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
+      job.setJarByClass(this.getClass());
+      AccumuloGraphConfiguration cfg = new AccumuloGraphConfiguration().setInstanceName("_mapreduce_instance2").setUser("root").setPassword("".getBytes())
+          .setGraphName("_mapreduce_table_2").setInstanceType(InstanceType.Mock).setCreate(true);
+      job.setInputFormatClass(VertexInputFormat.class);
+      
+      VertexInputFormat.setAccumuloGraphConfiguration(job, cfg);
+      
+      ElementOutputFormat.setAccumuloGraphConfiguration(job, cfg);
+
+      job.setMapperClass(TestVertexMapper.class);
+
+      job.setMapOutputKeyClass(NullWritable.class);
+      job.setMapOutputValueClass(Element.class);
+      job.setOutputFormatClass(ElementOutputFormat.class);
+
+      job.setNumReduceTasks(0);
+
+      job.waitForCompletion(true);
+
+      return job.isSuccessful() ? 0 : 1;
+    }
+
+    public static int main(String[] args) throws Exception {
+      return ToolRunner.run(CachedConfiguration.getInstance(), new MRTester(), args);
+    }
+  }
+
+  @Test
+  public void testVertexOutputFormatMap() throws Exception {
+    final String INSTANCE_NAME = "_mapreduce_instance2";
+    final String TEST_TABLE_1 = "_mapreduce_table_2";
+
+    if (!System.getProperty("os.name").startsWith("Windows")) {
+      Graph g = GraphFactory.open(new AccumuloGraphConfiguration().setInstanceName(INSTANCE_NAME).setUser("root").setPassword("".getBytes())
+          .setGraphName(TEST_TABLE_1).setInstanceType(InstanceType.Mock).setCreate(true).getConfiguration());
+      for (int i = 0; i < 100; i++) {
+        g.addVertex(i + "");
+      }
+      assertEquals(0, MRTester.main(new String[] {}));
+      assertNull(e1);
+      assertNull(e2);
+      assertEquals(g.getVertex("1").getProperty("NAME"), "BANANA1");
+    }
+  }
+}