Compatibility fixes with OODT-0.8

huikyole · Nov 6, 2014 · c893e50 · c893e50
1 parent b5470c1
commit c893e50
Show file tree

Hide file tree

Showing 6 changed files with 260 additions and 221 deletions.
diff --git a/oodt-adapter/pom.xml b/oodt-adapter/pom.xml
@@ -13,12 +13,12 @@
   <parent>
     <groupId>edu.isi.wings</groupId>
     <artifactId>wings-core</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>4.0-SNAPSHOT</version>
     <relativePath>../core/pom.xml</relativePath>
   </parent>
 
   <properties>
-    <oodt.version>0.7-SNAPSHOT</oodt.version>
+    <oodt.version>0.8-SNAPSHOT</oodt.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>

diff --git a/oodt-adapter/src/main/java/edu/isi/wings/catalog/data/api/impl/oodt/CurationServiceAPI.java b/oodt-adapter/src/main/java/edu/isi/wings/catalog/data/api/impl/oodt/CurationServiceAPI.java
@@ -36,25 +36,23 @@ private String query(String method, String op, Object... args) {
 						+ URLEncoder.encode(args[i+1].toString(), "UTF-8");
 			}
 
-			if("GET".equals(method)) {
-				URL urlobj = new URL(url + "?" + params);
-				return IOUtils.toString(urlobj);
-			}
-			else {
-				URL urlobj = new URL(url);
-				HttpURLConnection con = (HttpURLConnection) urlobj.openConnection();
-				con.setRequestMethod(method);
-				con.setDoOutput(true);
-				DataOutputStream out = new DataOutputStream(con.getOutputStream());
-				out.writeBytes(params);
-				out.flush();
-				out.close();
-
-				String result = IOUtils.toString(con.getInputStream());
-				con.disconnect();
-				return result;
+			URL urlobj = new URL(url);
+			if("GET".equals(method))
+			  urlobj = new URL(url + "?" + params);
+			HttpURLConnection con = (HttpURLConnection) urlobj.openConnection();
+			con.setRequestMethod(method);
+			if(!"GET".equals(method)) {
+			  con.setDoOutput(true);
+			  DataOutputStream out = new DataOutputStream(con.getOutputStream());
+			  out.writeBytes(params);
+			  out.flush();
+			  out.close();
 			}
 
+			String result = IOUtils.toString(con.getInputStream());
+			con.disconnect();
+			return result;
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

diff --git a/oodt-adapter/src/main/java/edu/isi/wings/catalog/data/api/impl/oodt/DataCreationFM.java b/oodt-adapter/src/main/java/edu/isi/wings/catalog/data/api/impl/oodt/DataCreationFM.java
@@ -336,6 +336,12 @@ public boolean moveDatatypeParent(String dtypeid, String fromtypeid, String toty
 		// Not currently supported
 		return false;
 	}
+
+  @Override
+  public boolean moveDataParent(String arg0, String arg1, String arg2) {
+    // Not currently supported
+    return false;
+  }
 
 	@Override
 	public boolean addData(String dataid, String dtypeid) {

diff --git a/...adapter/src/main/java/edu/isi/wings/catalog/data/api/impl/oodt/DataCreationFM_Simple.java b/...adapter/src/main/java/edu/isi/wings/catalog/data/api/impl/oodt/DataCreationFM_Simple.java
@@ -262,6 +262,12 @@ public boolean moveDatatypeParent(String dtypeid, String fromtypeid, String toty
 		// Not currently supported
 		return false;
 	}
+
+  @Override
+  public boolean moveDataParent(String arg0, String arg1, String arg2) {
+    // Not currently supported
+    return false;
+  }
 
 	@Override
 	public boolean addData(String dataid, String dtypeid) {