Changeset 5229

Timestamp:

01/07/11 00:39:31 (13 years ago)

Author:

bfarka

Message:

restructure of service project #1218

Location:

branches/OKBJavaConnector/HLOKBWebClient

Files:

• .classpath (modified) (1 diff)
• .project (modified) (2 diffs)
• generated (deleted)
• pom.xml (modified) (3 diffs)
• src/main/java/at/hl/okb/wsclient/OKBServiceClient.java (modified) (3 diffs)
• src/main/java/at/hl/okb/wsclient/Utilities.java (added)
• src/test/at/hl/wsclient/okb/AllTests.java (deleted)
• src/test/at/hl/wsclient/okb/OKBClientTest.java (modified) (2 diffs)
• src/test/java (added)
• src/test/java/at (added)
• src/test/java/at/hl (added)
• src/test/java/at/hl/okb (added)
• src/test/java/at/hl/okb/wsclient (added)
• src/test/java/at/hl/okb/wsclient/OKBClientTest.java (added)

branches/OKBJavaConnector/HLOKBWebClient/.classpath

@@ -2 +2 @@
 <classpath>
   <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-  <classpathentry kind="src" path="generated/jax-ws"/>
+  <classpathentry kind="src" output="target/classes" path="target/jaxws/wsimport/java"/>
   <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+  <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
   <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

branches/OKBJavaConnector/HLOKBWebClient/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>HLOKBWSClient</name>
-  <comment></comment>
+  <name>connector</name>
+  <comment>contains a java client for HeuristicLab OKB WCF-Service. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
   <projects>
   </projects>
@@ -21 +21 @@
     <nature>org.eclipse.jdt.core.javanature</nature>
   </natures>
-  <linkedResources>
-    <link>
-      <name>jax-ws</name>
-      <type>2</type>
-      <location>C:/Users/HolperM/workspace/HLOKBWSClient/generated/jax-ws</location>
-    </link>
-  </linkedResources>
 </projectDescription>

branches/OKBJavaConnector/HLOKBWebClient/pom.xml

@@ -57 +57 @@
             <configuration>
               <packageName>at.hl.wsclient.okb</packageName>
-              <sourceDestDir>${basedir}/generated/jax-ws</sourceDestDir>
+              
               <wsdlLocation>http://localhost:8732/Design_Time_Addresses/OKB-3.3/OKBService?wsdl</wsdlLocation>
               <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
@@ -64 +64 @@
               </wsdlFiles><!-- <wsdlUrls> <wsdlUrl>http://localhost:8732/Design_Time_Addresses/OKB-3.3/OKBService?wsdl</wsdlUrl> 
                 </wsdlUrls> -->
-              <xnocompile>true</xnocompile>
               <extension>true</extension>
-              <verbose>true</verbose>
               <!-- <bindingDirectory>/bindings</bindingDirectory> -->
             </configuration>
@@ -95 +93 @@
       <version>2.1-b17</version>
     </dependency>
-
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r07</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.metro</groupId>

branches/OKBJavaConnector/HLOKBWebClient/src/main/java/at/hl/okb/wsclient/OKBServiceClient.java

@@ -1 +1 @@
 package at.hl.okb.wsclient;
+
+import static at.hl.okb.wsclient.Utilities.createNameFilter;
 
 import java.util.ArrayList;
@@ -5 +7 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
+
+import com.google.common.collect.Iterables;
 
 import at.hl.wsclient.okb.Algorithm;
@@ -15 +21 @@
 import at.hl.wsclient.okb.IOKBService;
 import at.hl.wsclient.okb.OKBService;
+import at.hl.wsclient.okb.ObjectFactory;
 import at.hl.wsclient.okb.Platform;
 import at.hl.wsclient.okb.Problem;
 
 public class OKBServiceClient {
-  OKBService srv = null;
-  IOKBService port = null;
+    OKBService srv = null;
+    IOKBService port = null;
 
-  public OKBServiceClient() {
-    this.srv = new OKBService();
-    this.port = srv.getWSHttpBindingIOKBService1();
-  }  
+    public OKBServiceClient() {
+  this.srv = new OKBService();
+  this.port = srv.getWSHttpBindingIOKBService();
+    }
+
+    public Long getPlatformId(String platformName) {
+  Platform returnValue = Iterables.find(
+    port.getPlatforms().getPlatform(),
+    createNameFilter(platformName));
+  if (returnValue == null)
+      createPlatform(platformName);
+
+  returnValue = Iterables.find(port.getPlatforms().getPlatform(),
+    createNameFilter(platformName));
+  return returnValue.getId();
+
+    }
+
+    private void createPlatform(String name) {
   
-  public Long getPlatformId(String platformName) {
-    Long platformId = null;
-    
-    ArrayOfPlatform allPlatforms = port.getPlatforms();
-    for (Platform platform:allPlatforms.getPlatform()) {
-      if (platform.getName().getValue()==platformName) {
-        platformId = platform.getId();
-      }
-    }
-    return platformId;
+  ObjectFactory factory = new ObjectFactory();
+  Platform platform = factory.createPlatform();
+  
+  platform.setName(factory.createNamedOKBItemName(name));
+  port.addPlatform(platform);
+    }
+
+    public Long getAlgorithmId(String algorithmName) {
+  Long algorithmId = null;
+
+  ArrayOfAlgorithm allAlgorithms = port.getAlgorithms();
+  for (Algorithm algo : allAlgorithms.getAlgorithm()) {
+      if (algo.getName().getValue() == algorithmName) {
+    algorithmId = algo.getId();
+      }
+  }
+  return algorithmId;
+    }
+
+    public Long getProblemId(String problemName) {
+  Long problemId = null;
+
+  ArrayOfProblem allProblems = port.getProblems();
+  for (Problem problem : allProblems.getProblem()) {
+      if (problem.getName().getValue() == problemName) {
+    problemId = problem.getId();
+      }
+  }
+  return problemId;
+    }
+
+    public void checkAlgoParamsExists(Long algorithmId,
+      Map<String, Object> ecjAlgoParams) {
+
+  List<String> missingParams = new ArrayList<String>();
+
+  ArrayOfAlgorithmParameter hlAlgoParams = port
+    .getAlgorithmParameters(algorithmId);
+  Map<String, Object> hlAlgoParamMap = new HashMap<String, Object>();
+
+  for (AlgorithmParameter algoParam : hlAlgoParams
+    .getAlgorithmParameter()) {
+      hlAlgoParamMap.put(algoParam.getName().getValue(), null); // value
+                      // hangs
+                      // on
+                      // Experiments
   }
 
-  public Long getAlgorithmId(String algorithmName) {
-    Long algorithmId = null;
-    
-    ArrayOfAlgorithm allAlgorithms = port.getAlgorithms();
-    for (Algorithm algo:allAlgorithms.getAlgorithm()) {
-      if (algo.getName().getValue()==algorithmName) {
-        algorithmId = algo.getId();
-      }
-    }
-    return algorithmId;
-  }
-  
-  public Long getProblemId(String problemName) {
-    Long problemId = null;
-    
-    ArrayOfProblem allProblems = port.getProblems();
-    for (Problem problem:allProblems.getProblem()) {
-      if (problem.getName().getValue()==problemName) {
-        problemId = problem.getId();
-      }
-    }
-    return problemId;
+  String[] ecjparamNames = (String[]) ecjAlgoParams.keySet().toArray();
+
+  for (int i = 0; i < ecjparamNames.length; i++) {
+      if (!hlAlgoParamMap.containsKey(ecjparamNames[i])) {
+    missingParams.add(new String(ecjparamNames[i]));
+      }
   }
 
-  public void checkAlgoParamsExists(Long algorithmId,
-      Map<String, Object> ecjAlgoParams) {
-    
-    List<String> missingParams = new ArrayList<String>();
-    
-    ArrayOfAlgorithmParameter hlAlgoParams = port.getAlgorithmParameters(algorithmId);
-    Map<String, Object> hlAlgoParamMap = new HashMap<String, Object>();
-    
-    for (AlgorithmParameter algoParam:hlAlgoParams.getAlgorithmParameter()) {
-      hlAlgoParamMap.put(algoParam.getName().getValue(), null); //value hangs on Experiments
-    }
-    
-    
-    String[] ecjparamNames = (String[]) ecjAlgoParams.keySet().toArray();
-    
-    for (int i=0;i<ecjparamNames.length;i++) {
-      if (!hlAlgoParamMap.containsKey(ecjparamNames[i])) {
-        missingParams.add(new String(ecjparamNames[i]));
-      }
-    }
-    
-    
-  }
-
-
+    }
 
 }

branches/OKBJavaConnector/HLOKBWebClient/src/test/at/hl/wsclient/okb/OKBClientTest.java

@@ -12 +12 @@
 import org.junit.Test;
 
+import at.hl.okb.wsclient.OKBServiceClient;
 import at.hl.okb.wsclient.Exception.OKBWebServiceFailedException;
 
@@ -20 +21 @@
 public class OKBClientTest {
   
-  OKBService srv = null;
-  IOKBService port = null;  
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-  }
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-  }
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @Before
-  public void setUp() throws Exception {
-    this.srv = new OKBService();
-    this.port = srv.getWSHttpBindingIOKBService1();
-  }
-
-  /**
-   * @throws java.lang.Exception
-   */
-  @After
-  public void tearDown() throws Exception {
-  }
-  
+    
+      OKBServiceClient client = new OKBServiceClient();
   @Test
-  public void AddAlgorithmTest() throws Exception  {
-    
-        ObjectFactory fac = new ObjectFactory();
-        AddAlgorithm addA = fac.createAddAlgorithm();
-        addA.setDto(fac.createAddAlgorithmDto(fac.createAlgorithm()));
-        Long retval = 0L;
-
-        Algorithm a = fac.createAlgorithm();
-        a.setAlgorithmClassId(1L);
-        a.setDescription(fac.createNamedOKBItemDescription("a new Algo"));
-        a.setId(2L);
-        a.setName(fac.createNamedOKBItemName("Algorithm Name 6"));
-        a.setPlatformId(1L);
-        try {
-        retval = port.addAlgorithm(a);
-        } catch (Exception e) {
-          throw new OKBWebServiceFailedException(e.getMessage());
-        }
-        assertTrue("Algortihm wasn't added", retval>0);
-  }
-  
-  @Test
-  public void GetAlgorithms() {
-    
-    ArrayOfAlgorithm algos = port.getAlgorithms();
-    
-    for (Algorithm algo:algos.getAlgorithm()) {
-      System.out.println("algo ClassId:="+algo.getAlgorithmClassId());
-      System.out.println("algo Id:="+algo.getId());
-      System.out.println("algo PlattformId:="+algo.getPlatformId());
-      System.out.println("algo Class:="+algo.getClass());
-      System.out.println("algo Description:="+algo.getDescription().getValue());
-      System.out.println("algo Name:="+algo.getName().getValue());
-    }
-    assertTrue("No Algorithms found!", algos.getAlgorithm().size()>0);
-  }
-  
-  @Test
-  public void GetDataTypes() {
-    
-    ArrayOfDataType dataTypes = port.getDataTypes();
-    
-    for (DataType dataType:dataTypes.getDataType()) {
-      System.out.println("algo Id:="+dataType.getId());
-      System.out.println("algo platformId:="+dataType.getPlatformId());
-      System.out.println("algo Name:="+dataType.getName());
-      System.out.println("algo Class:="+dataType.getClass());
-      System.out.println("algo SQLName:="+dataType.getSqlName().getValue());
-    }
-    assertTrue("No dataTypes found!", dataTypes.getDataType().size()>0);
-  } 
-  
-  
-  
-  @Test
-  public void GetIds(){
-    
+      public void testGetPlatform()
+  {
+      client.getPlatformId("ECJ");
   }