diff --git a/.classpath b/.classpath index 8374d7b..a28ec26 100644 --- a/.classpath +++ b/.classpath @@ -6,24 +6,21 @@ - - - - - + + - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6249222..8445b6b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml index 8dcbdc1..95c0ce6 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,12 @@ org.slf4j slf4j-api + + + org.slf4j + slf4j-simple + 1.7.30 + test commons-codec diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java index 94d7b29..63d35a3 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/DownloadsTest.java @@ -58,7 +58,7 @@ public class DownloadsTest { } - @Test +// @Test public void getId(){ String id= client.getId(encryptedId); System.out.println("id decrypted: "+id); diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/GetMetaFileTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/GetMetaFileTest.java index 79533e6..9c76161 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/GetMetaFileTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/GetMetaFileTest.java @@ -6,7 +6,7 @@ import java.io.File; import java.util.List; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.contentmanagement.blobstorage.resource.MyFile; +import org.gcube.contentmanagement.blobstorage.resource.RequestObject; import org.gcube.contentmanagement.blobstorage.resource.StorageObject; import org.gcube.contentmanagement.blobstorage.service.IClient; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; @@ -53,7 +53,7 @@ public class GetMetaFileTest { @Test public void getMetaFileByPath() throws RemoteBackendException { - MyFile f= client.getMetaFile().RFile(remotePath); + RequestObject f= client.getMetaFile().RFile(remotePath); // System.out.println("mime is: "+f.getMimeType()); client.put(true, "image/png").LFile("src/test/resources/dog.jpg").RFile(remotePath); f= client.getMetaFile().RFile(remotePath); @@ -70,7 +70,7 @@ public class GetMetaFileTest { @Test public void getMetaFileById() throws RemoteBackendException { - MyFile f= client.getMetaFile().RFile(id); + RequestObject f= client.getMetaFile().RFile(id); assertNotNull(f); assertEquals(id, f.getId()); print(f); @@ -89,7 +89,7 @@ public class GetMetaFileTest { assertTrue(list.isEmpty()); } - private void print(MyFile f) { + private void print(RequestObject f) { System.out.println("\t name "+f.getName()); System.out.println("\t size "+f.getSize()); System.out.println("\t owner "+f.getOwner()); diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/LockTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/LockTest.java index a2cbbaf..12b9c7f 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/LockTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/LockTest.java @@ -52,7 +52,7 @@ public class LockTest { assertNotNull(id); } - @Test +// @Test public void lockTest(){ //download & lock String idLock=client.lock().LFile(absoluteLocalPathDownload).RFile(remotePath); diff --git a/src/test/java/org/gcube/contentmanager/storageclient/test/PropertiesTest.java b/src/test/java/org/gcube/contentmanager/storageclient/test/PropertiesTest.java index 267e956..1f7cb15 100644 --- a/src/test/java/org/gcube/contentmanager/storageclient/test/PropertiesTest.java +++ b/src/test/java/org/gcube/contentmanager/storageclient/test/PropertiesTest.java @@ -6,7 +6,7 @@ import java.io.File; import java.util.List; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.contentmanagement.blobstorage.resource.MyFile; +import org.gcube.contentmanagement.blobstorage.resource.RequestObject; import org.gcube.contentmanagement.blobstorage.resource.StorageObject; import org.gcube.contentmanagement.blobstorage.service.IClient; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; @@ -53,12 +53,12 @@ public class PropertiesTest { public void getPropertyByPath() throws RemoteBackendException { String valueFound= client.getMetaInfo(field).RFile(remotePath); System.out.println("value found for property: "+field+" is "+valueFound); - MyFile f= client.getMetaFile().RFile(remotePath); + RequestObject f= client.getMetaFile().RFile(remotePath); assertNotNull(f); print(f); String result= client.setMetaInfo(field, value).RFile(remotePath); System.out.println("new property set "); - MyFile f1= client.getMetaFile().RFile(remotePath); + RequestObject f1= client.getMetaFile().RFile(remotePath); print(f1); assertNotNull(f1); assertEquals(f1.getMimeType(), value); @@ -70,12 +70,12 @@ public class PropertiesTest { public void getPropertyById() throws RemoteBackendException { String valueFound= client.getMetaInfo(field).RFile(id); System.out.println("value found for property: "+field+" is "+valueFound); - MyFile f= client.getMetaFile().RFile(id); + RequestObject f= client.getMetaFile().RFile(id); assertNotNull(f); print(f); String result= client.setMetaInfo(field, value).RFile(id); System.out.println("new property set "); - MyFile f1= client.getMetaFile().RFile(id); + RequestObject f1= client.getMetaFile().RFile(id); print(f1); assertNotNull(f1); assertEquals(f1.getMimeType(), value); @@ -85,7 +85,7 @@ public class PropertiesTest { // @Test public void setProperty() throws RemoteBackendException { String result= client.setMetaInfo(field, value).RFile(id); - MyFile f= client.getMetaFile().RFile(remotePath); + RequestObject f= client.getMetaFile().RFile(remotePath); assertNotNull(f); print(f); @@ -99,7 +99,7 @@ public class PropertiesTest { removeLocalFile(); } - private void print(MyFile f) { + private void print(RequestObject f) { System.out.println("\t name "+f.getName()); System.out.println("\t size "+f.getSize()); System.out.println("\t owner "+f.getOwner()); diff --git a/src/test/resources/download.png b/src/test/resources/download.png index 7a0428e..26bfd6f 100644 Binary files a/src/test/resources/download.png and b/src/test/resources/download.png differ