usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [03/51] [abbrv] git commit: Merge branch 'two-dot-o' into unique-properties
Date Mon, 20 Jan 2014 05:21:34 GMT
Merge branch 'two-dot-o' into unique-properties


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

Branch: refs/pull/18/head
Commit: 88d797b4d86c0b20d785ae6bde358e7d0e8bc215
Parents: 3fff296 5a57e87
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Mon Jan 13 13:40:45 2014 -0500
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Mon Jan 13 13:40:45 2014 -0500

----------------------------------------------------------------------
 .../persistence/graph/guice/GraphModule.java    |  17 +
 .../persistence/graph/impl/EdgeManagerImpl.java |  17 +-
 .../graph/impl/SimpleSearchIdType.java          |   2 +-
 .../graph/serialization/impl/CassUtils.java     |  51 ++
 .../impl/EdgeMetadataSerializationImpl.java     |  55 ++-
 .../impl/EdgeSerializationImpl.java             |   2 +-
 .../impl/parse/ColumnNameIterator.java          |   7 +-
 .../impl/parse/ObservableIterator.java          |   3 +
 .../stage/write/EdgeWriteStage.java             |   7 +-
 .../persistence/graph/EdgeManagerIT.java        |  63 +--
 .../EdgeMetadataSerializationTest.java          | 460 +++++++++++++++++++
 .../graph/test/util/EdgeTestUtils.java          | 140 ++++++
 .../rest/applications/ApplicationResource.java  |   6 -
 .../main/resources/swagger/applications.json    |   4 +-
 14 files changed, 749 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/88d797b4/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeSerializationImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/88d797b4/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
index eef5748,f7c5eb0..5a7c95a
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/EdgeManagerIT.java
@@@ -53,15 -54,20 +53,19 @@@ import static org.junit.Assert.assertEq
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertNull;
  import static org.junit.Assert.assertTrue;
 +import org.junit.Ignore;
  import static org.mockito.Mockito.mock;
+ 
+ 
  import static org.mockito.Mockito.when;
  
+ import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.*;
+ 
  
 -/**
 - *
 - *
 - */
 +@Ignore // tests fail due to unimplemented methods in EdgeManagerImpl that return null
 +
  @RunWith( JukitoRunner.class )
- @UseModules( { CollectionModule.class, GraphModule.class } )
+ @UseModules( { GraphModule.class } )
  public class EdgeManagerIT {
  
  


Mime
View raw message