[GRAPHDB-487] service interface update

sones · Oct 10, 2011 · 757e986 · 757e986
1 parent 3edd59c
commit 757e986
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 39 deletions.
diff --git a/...ces/Implementations/RemoteAPIService/DataContracts/PayloadObjects/ServiceInsertPayload.cs b/...ces/Implementations/RemoteAPIService/DataContracts/PayloadObjects/ServiceInsertPayload.cs
@@ -36,11 +36,8 @@ public class ServiceInsertPayload
         [DataMember]
         public List<UnstructuredProperty> UnstructuredProperties;
 
-        //[DataMember]
-        //public List<ServiceEdgeTypePredefinition> EdgesToAdd;
-
         [DataMember]
-        public Int64 UUID;
+        public Nullable<Int64> UUID;
 
         [DataMember]
         public String Comment;
@@ -50,7 +47,5 @@ public class ServiceInsertPayload
 
         [DataMember]
         public List<ServiceEdgePredefinition> Edges;
-
-
     }
 }
diff --git a/...DS/Services/Implementations/RemoteAPIService/ServiceContractImplementation/GraphDS_API.cs b/...DS/Services/Implementations/RemoteAPIService/ServiceContractImplementation/GraphDS_API.cs
@@ -152,6 +152,15 @@ public ServiceEdgeType GetEdgeType(SecurityToken mySecurityToken, Int64 myTransa
             return new ServiceEdgeType(Response);
         }
 
+        public ServiceEdgeType GetEdgeType(SecurityToken mySecurityToken, Int64 myTransactionToken,
+            Int64 myEdgeTypeID, String myEdition = null)
+        {
+            var Request = ServiceRequestFactory.MakeRequestGetEdgeType(myEdgeTypeID, myEdition);
+            var Response = this.GraphDS.GetEdgeType<IEdgeType>(mySecurityToken, myTransactionToken, Request,
+                ServiceReturnConverter.ConvertOnlyEdgeType);
+            return new ServiceEdgeType(Response);
+        }
+
         public ServiceVertexInstance GetVertex(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceVertexType myVertexType, Int64 myVertexID)
         {
@@ -282,7 +291,6 @@ public List<ServiceVertexInstance> Update(SecurityToken mySecurityToken, Int64 m
             return Response.Select(x => new ServiceVertexInstance(x)).ToList();
         }
 
-
         public ServiceVertexType GetVertexType(SecurityToken mySecurityToken, Int64 myTransToken, string myVertexTypeName)
         {
             var Request = ServiceRequestFactory.MakeRequestGetVertexType(myVertexTypeName);
@@ -291,6 +299,13 @@ public ServiceVertexType GetVertexType(SecurityToken mySecurityToken, Int64 myTr
             return new ServiceVertexType(Response);
         }
 
+        public ServiceVertexType GetVertexType(SecurityToken mySecurityToken, Int64 myTransToken, Int64 myVertexTypeID)
+        {
+            var Request = ServiceRequestFactory.MakeRequestGetVertexType(myVertexTypeID);
+            var Response = this.GraphDS.GetVertexType<IVertexType>(mySecurityToken, myTransToken, Request,
+                ServiceReturnConverter.ConvertOnlyVertexType);
+            return new ServiceVertexType(Response);
+        }
 
         public void CommitTransaction(SecurityToken mySecurityToken, Int64 myTransToken)
         {

diff --git a/...S/Services/Implementations/RemoteAPIService/ServiceContracts/API Services/IGraphDS_API.cs b/...S/Services/Implementations/RemoteAPIService/ServiceContracts/API Services/IGraphDS_API.cs
@@ -42,34 +42,37 @@ namespace sones.GraphDS.Services.RemoteAPIService.API_Services
     public interface IGraphDS_API
     {
         [OperationContract]
-        ServiceVertexType CreateVertexType(SecurityToken mySecurityToken, Int64 myTransToken,
+        ServiceVertexType CreateVertexType(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceVertexTypePredefinition myVertexTypePreDef);
 
         [OperationContract]
-        ServiceVertexType AlterVertexType(SecurityToken mySecurityToken, Int64 myTransToken,
+        ServiceVertexType AlterVertexType(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceVertexType myVertexType, ServiceAlterVertexChangeset myChangeset);
 
         [OperationContract]
-        ServiceEdgeType AlterEdgeType(SecurityToken mySecurityToken, Int64 myTransToken,
+        ServiceEdgeType AlterEdgeType(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceEdgeType myEdgeType, ServiceAlterEdgeChangeset myChangeset);
 
-        [OperationContract]
+        [OperationContract(Name="GetVertexTypeByName")]
-        ServiceVertexType GetVertexType(SecurityToken mySecurityToken, Int64 myTransToken, String myVertexTypeName);
+        ServiceVertexType GetVertexType(SecurityToken mySecurityToken, Int64 myTransactionToken, String myVertexTypeName);
+
+        [OperationContract(Name="GetVertexTypeByID")]
+        ServiceVertexType GetVertexType(SecurityToken mySecurityToken, Int64 myTransactionToken, Int64 myVertexTypeID);
 
         [OperationContract]
         Int64 BeginTransaction(SecurityToken mySecurityToken);
 
         [OperationContract]
-        void CommitTransaction(SecurityToken mySecurityToken, Int64 myTransToken);
+        void CommitTransaction(SecurityToken mySecurityToken, Int64 myTransactionToken);
 
         [OperationContract]
-        void RollbackTransaction(SecurityToken mySecurityToken, Int64 myTransToken);
+        void RollbackTransaction(SecurityToken mySecurityToken, Int64 myTransactionToken);
 
         [OperationContract]
         void Shutdown(SecurityToken mySecurityToken);
 
         [OperationContract]
-        List<Int64> Clear(SecurityToken mySecurityToken, Int64 myTransToken);
+        List<Int64> Clear(SecurityToken mySecurityToken, Int64 myTransactionToken);
 
         [OperationContract]
         ServiceEdgeType CreateEdgeType(SecurityToken mySecurityToken, Int64 myTransactionToken,
@@ -80,10 +83,10 @@ List<ServiceEdgeType> CreateEdgeTypes(SecurityToken mySecurityToken, Int64 myTra
             IEnumerable<ServiceEdgeTypePredefinition> myEdgeTypePreDef);
 
         [OperationContract]
-        ServiceIndexDefinition CreateIndex(SecurityToken mySecurityToken, Int64 myTransToken, ServiceIndexPredefinition myVertexTypePreDef);
+        ServiceIndexDefinition CreateIndex(SecurityToken mySecurityToken, Int64 myTransactionToken, ServiceIndexPredefinition myVertexTypePreDef);
 
         [OperationContract]
-        List<ServiceVertexType> CreateVertexTypes(SecurityToken mySecurityToken, Int64 myTransToken,
+        List<ServiceVertexType> CreateVertexTypes(SecurityToken mySecurityToken, Int64 myTransactionToken,
             List<ServiceVertexTypePredefinition> myVertexTypePreDef);
 
         [OperationContract]
@@ -95,46 +98,48 @@ ServiceIndexDefinition DescribeIndex(SecurityToken mySecurityToken, Int64 myTran
             String myVertexTypeName, String myIndexName);
 
         [OperationContract]
-        List<ServiceIndexDefinition> DescribeIndices(SecurityToken mySecurityToken, Int64 myTransToken,
+        List<ServiceIndexDefinition> DescribeIndices(SecurityToken mySecurityToken, Int64 myTransactionToken,
             String myVertexTypeName);
 
         [OperationContract]
-        List<ServiceIndexDefinition> DescribeIndicesByNames(SecurityToken mySecurityToken, Int64 myTransToken,
+        List<ServiceIndexDefinition> DescribeIndicesByNames(SecurityToken mySecurityToken, Int64 myTransactionToken,
             String myVertexTypeName, List<String> myIndexNames);
 
         [OperationContract]
-        Dictionary<Int64, String> DropEdgeType(SecurityToken mySecurityToken, Int64 myTransToken,
+        Dictionary<Int64, String> DropEdgeType(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceEdgeType myEdgeType);
 
         [OperationContract]
-        void DropIndex(SecurityToken mySecurityToken, Int64 myTransToken,
+        void DropIndex(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceVertexType myVertexType, String myIndexName, String myEdition);
 
         [OperationContract]
-        Dictionary<Int64, String> DropVertexType(SecurityToken mySecurityToken, Int64 myTransToken,
+        Dictionary<Int64, String> DropVertexType(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceVertexType myVertexType);
 
         [OperationContract]
-        List<ServiceEdgeType> GetAllEdgeTypes(SecurityToken mySecurityToken, Int64 myTransToken,
+        List<ServiceEdgeType> GetAllEdgeTypes(SecurityToken mySecurityToken, Int64 myTransactionToken,
             String myEdition);
 
         [OperationContract]
-        List<ServiceVertexType> GetAllVertexTypes(SecurityToken mySecurityToken, Int64 myTransToken,
+        List<ServiceVertexType> GetAllVertexTypes(SecurityToken mySecurityToken, Int64 myTransactionToken,
             String myEdition);
 
-        [OperationContract]
+        [OperationContract(Name="GetEdgeTypeByName")]
-        ServiceEdgeType GetEdgeType(SecurityToken mySecurityToken, Int64 myTransToken,
+        ServiceEdgeType GetEdgeType(SecurityToken mySecurityToken, Int64 myTransactionToken, String myEdgeTypeName, String myEdition = null);
-            String myEdgeTypeName, String myEdition = null);
+
+        [OperationContract(Name="GetEdgeTypeByID")]
+        ServiceEdgeType GetEdgeType(SecurityToken mySecurityToken, Int64 myTransactionToken, Int64 myEdgeTypeID, String myEdition = null);
 
         [OperationContract]
-        ServiceVertexInstance GetVertex(SecurityToken mySecurityToken, Int64 myTransToken,
+        ServiceVertexInstance GetVertex(SecurityToken mySecurityToken, Int64 myTransactionToken,
             ServiceVertexType myVertexType, Int64 myVertexID);
 
         [OperationContract]
-        UInt64 GetVertexCount(SecurityToken mySecurityToken, Int64 myTransToken, ServiceVertexType myVertexType);
+        UInt64 GetVertexCount(SecurityToken mySecurityToken, Int64 myTransactionToken, ServiceVertexType myVertexType);
 
         [OperationContract(Name = "GetVerticesByType")]
-        List<ServiceVertexInstance> GetVertices(SecurityToken mySecurityToken, Int64 myTransToken, ServiceVertexType myVertexType);
+        List<ServiceVertexInstance> GetVertices(SecurityToken mySecurityToken, Int64 myTransactionToken, ServiceVertexType myVertexType);
 
         [OperationContract(Name = "GetVerticesByExpression")]
         [ServiceKnownType(typeof(ServiceBinaryExpression))]
@@ -145,10 +150,10 @@ ServiceVertexInstance GetVertex(SecurityToken mySecurityToken, Int64 myTransToke
         [ServiceKnownType(typeof(ServiceSingleLiteralExpression))]
         [ServiceKnownType(typeof(ServiceRangeLiteralExpression))]
         [ServiceKnownType(typeof(ServiceCollectionLiteralExpression))]
-        List<ServiceVertexInstance> GetVertices(SecurityToken mySecurityToken, Int64 myTransToken, ServiceBaseExpression myExpression);
+        List<ServiceVertexInstance> GetVertices(SecurityToken mySecurityToken, Int64 myTransactionToken, ServiceBaseExpression myExpression);
 
         [OperationContract]
-        ServiceVertexInstance Insert(SecurityToken mySecurityToken, Int64 myTransToken, String myVertexTypeName,
+        ServiceVertexInstance Insert(SecurityToken mySecurityToken, Int64 myTransactionToken, String myVertexTypeName,
             ServiceInsertPayload myPayload);
 
         [OperationContract]
@@ -160,19 +165,19 @@ ServiceVertexInstance Insert(SecurityToken mySecurityToken, Int64 myTransToken,
         [OperationContract]
         [ServiceKnownType(typeof(ServiceHyperEdgeView))]
         [ServiceKnownType(typeof(ServiceSingleEdgeView))]
-        ServiceQueryResult Query(SecurityToken mySecToken, Int64 myTransToken, String myQueryString, String myLanguage);
+        ServiceQueryResult Query(SecurityToken mySecToken, Int64 myTransactionToken, String myQueryString, String myLanguage);
 
         //[OperationContract] There is no plan to implement the Travers method yet, because there is no way to transport traverser logic from the client
-        //List<ServiceVertexInstance>Traverse(SecurityToken mySecToken, Int64 myTransToken);
+        //List<ServiceVertexInstance>Traverse(SecurityToken mySecToken, Int64 myTransactionToken);
 
         [OperationContract]
-        List<ServiceVertexInstance> Update(SecurityToken mySecurityToken, Int64 myTransToken, ServiceVertexType myVertexType, IEnumerable<Int64> myVertexIDs,
+        List<ServiceVertexInstance> Update(SecurityToken mySecurityToken, Int64 myTransactionToken, ServiceVertexType myVertexType, IEnumerable<Int64> myVertexIDs,
             ServiceUpdateChangeset myUpdateChangeset);
 
         [OperationContract]
-        void RebuildIndices(SecurityToken mySecurityToken, Int64 myTransToken, IEnumerable<String> myVertexTypeNames);
+        void RebuildIndices(SecurityToken mySecurityToken, Int64 myTransactionToken, IEnumerable<String> myVertexTypeNames);
 
         [OperationContract]
-        void TruncateVertexType(SecurityToken mySecurityToken, Int64 myTransToken, String myVertexTypeName);
+        void TruncateVertexType(SecurityToken mySecurityToken, Int64 myTransactionToken, String myVertexTypeName);
     }
 }
diff --git a/...aphDS/Services/Implementations/RemoteAPIService/ServiceConverter/ServiceRequestFactory.cs b/...aphDS/Services/Implementations/RemoteAPIService/ServiceConverter/ServiceRequestFactory.cs
@@ -408,8 +408,8 @@ public static RequestInsertVertex MakeRequestInsertVertex(String myVertexTypeNam
             if(!String.IsNullOrEmpty(myPayload.Edition))
                 Request.SetEdition(myPayload.Edition);
 
-            if (myPayload.UUID != 0)
+            if (myPayload.UUID != null)
-                Request.SetUUID(myPayload.UUID);
+                Request.SetUUID(myPayload.UUID.Value);
 
             if (myPayload.StructuredProperties != null)
             {