Changeset 3039

Timestamp:

Dec 18, 2006, 9:58:58 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

Added web services for listing projects and experiments

Location:

branches/webservices/src

Files:

• test/TestWebservices.java (modified) (3 diffs)
• webservices/client/java/net/sf/basedb/ws/client/ExperimentClient.java (added)
• webservices/client/java/net/sf/basedb/ws/client/ProjectClient.java (modified) (2 diffs)
• webservices/client/java/net/sf/basedb/ws/info (added)
• webservices/client/java/net/sf/basedb/ws/info/ItemInfo.java (added)
• webservices/server/META-INF/services.xml (modified) (1 diff)
• webservices/server/net/sf/basedb/ws/server/ExperimentService.java (added)
• webservices/server/net/sf/basedb/ws/server/ProjectService.java (modified) (2 diffs)

branches/webservices/src/test/TestWebservices.java

@@ -23 +23 @@
 */
 import net.sf.basedb.core.Config;
+import net.sf.basedb.ws.client.ExperimentClient;
 import net.sf.basedb.ws.client.ProjectClient;
 import net.sf.basedb.ws.client.SessionClient;
+import net.sf.basedb.ws.info.ItemInfo;
 
 
@@ -47 +49 @@
     int projectId = TestProject.test_create(true);
     testSetActiveProject(client, projectId);
+    testListProjects(client);
+    int experimentId = testListExperiments(client);
+    testListRawBioAssays(client, experimentId);
     testLogout(client);
     TestProject.test_delete(projectId);
@@ -132 +137 @@
   }
   
-
+  static void testListProjects(SessionClient client)
+  {
+    if (client == null) return;
+    try
+    {
+      ProjectClient projectClient = new ProjectClient(client);
+      ItemInfo[] projects = projectClient.getProjects();
+      if (projects != null)
+      {
+        for (ItemInfo p : projects)
+        {
+          write(p.getId() + "\t" + p.getName());
+        }
+      }
+          write("--List projects OK");
+    }
+    catch (Throwable t)
+    {
+      write("--List projects FAILED");
+      t.printStackTrace();
+      ok = false;
+    }
+  }
+
+  static int testListExperiments(SessionClient client)
+  {
+    if (client == null) return 0;
+    int experimentId = 0;
+    try
+    {
+      ExperimentClient experimentClient = new ExperimentClient(client);
+      ItemInfo[] experiments = experimentClient.getExperiments();
+      if (experiments != null)
+      {
+        for (ItemInfo p : experiments)
+        {
+          if (experimentId == 0) experimentId = p.getId();
+          write(p.getId() + "\t" + p.getName());
+        }
+      }
+          write("--List experiments OK");
+    }
+    catch (Throwable t)
+    {
+      write("--List experiments FAILED");
+      t.printStackTrace();
+      ok = false;
+    }
+    return experimentId;
+  }
+
+  static void testListRawBioAssays(SessionClient client, int experimentId)
+  {
+    if (client == null || experimentId == 0) return;
+    try
+    {
+      ExperimentClient experimentClient = new ExperimentClient(client);
+      ItemInfo[] rawBioAssays = experimentClient.getRawBioAssays(experimentId);
+      if (rawBioAssays != null)
+      {
+        for (ItemInfo p : rawBioAssays)
+        {
+          write(p.getId() + "\t" + p.getName());
+        }
+      }
+          write("--List rawbioassays OK");
+    }
+    catch (Throwable t)
+    {
+      write("--List rawbioassays FAILED");
+      t.printStackTrace();
+      ok = false;
+    }
+  }
+
+  
+  
 }

branches/webservices/src/webservices/client/java/net/sf/basedb/ws/client/ProjectClient.java

@@ -24 +24 @@
 package net.sf.basedb.ws.client;
 
+import net.sf.basedb.ws.info.ItemInfo;
+
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.rpc.client.RPCServiceClient;
 
 public class ProjectClient 
@@ -44 +47 @@
   }
   
+  public ItemInfo[] getProjects()
+    throws AxisFault
+  {
+    RPCServiceClient service = getService();
+    ItemInfo[] result = invokeBlocking("getProjects", ItemInfo[].class, session.getId());
+    return result;
+  }
+  
 }

branches/webservices/src/webservices/server/META-INF/services.xml

@@ -24 +24 @@
     <parameter name="ServiceClass" locked="false">net.sf.basedb.ws.server.ProjectService</parameter>
   </service>
+  <service name="Experiment" scope="application">
+    <description>
+      This service handles experiments
+    </description>
+    <messageReceivers>
+      <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" 
+        class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+      <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only" 
+        class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
+    </messageReceivers>
+    <parameter name="ServiceClass" locked="false">net.sf.basedb.ws.server.ExperimentService</parameter>
+  </service>
 </serviceGroup>

branches/webservices/src/webservices/server/net/sf/basedb/ws/server/ProjectService.java

@@ -24 +24 @@
 package net.sf.basedb.ws.server;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import net.sf.basedb.core.DbControl;
+import net.sf.basedb.core.ItemQuery;
 import net.sf.basedb.core.Project;
 import net.sf.basedb.core.SessionControl;
+import net.sf.basedb.ws.info.ItemInfo;
 
 public class ProjectService
@@ -52 +57 @@
     sc.setActiveProject(project);   
   }
+  
+  public ItemInfo[] getProjects(String ID)
+  {
+    SessionControl sc = getSessionControl(ID);
+    DbControl dc = sc.newDbControl();
+    List<ItemInfo> projects = new LinkedList<ItemInfo>();
+    try
+    {
+      ItemQuery<Project> query = Project.getQuery();
+      for (Project project : query.list(dc))
+      {
+        projects.add(new ItemInfo(project));
+      }
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+    ItemInfo[] ii = new ItemInfo[projects.size()];
+    return projects.toArray(ii);
+  }
 }