From 9f8f9e375c121d889c3428fee6715acaabc18d70 Mon Sep 17 00:00:00 2001
From: Lucio Lelii <lucio@192.168.1.66>
Date: Fri, 29 Nov 2024 10:59:46 +0100
Subject: [PATCH] updated

---
 CHANGELOG.md                                  |   2 +-
 pom.xml                                       | 238 +++++++++---------
 .../access/storagehub/fs/StorageHubFS.java    |   1 +
 .../data/access/storagehub/fuse/FuseTest.java |  17 +-
 4 files changed, 132 insertions(+), 126 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3dc57d..1bdb82d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.data-access.sh-fuse-integration
 
-## [v2.1.0]
+## [v2.1.0-SNAPSHOT]
 
 - porting to storagehub-client-2.0.0
 
diff --git a/pom.xml b/pom.xml
index d0aa9b2..1194f79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,127 +1,133 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.gcube.data-access</groupId>
-	<artifactId>sh-fuse-integration</artifactId>
-	<version>2.1.0</version>
-	<name>SHFuseIntegration</name>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.gcube.data-access</groupId>
+    <artifactId>sh-fuse-integration</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    <name>SHFuseIntegration</name>
 
-	<parent>
-		<artifactId>maven-parent</artifactId>
-		<groupId>org.gcube.tools</groupId>
-		<version>1.2.0</version>
-		<relativePath />
-	</parent>
+    <parent>
+        <artifactId>maven-parent</artifactId>
+        <groupId>org.gcube.tools</groupId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-	<scm>
-		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/sh-fuse-integration.git</connection>
-		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/sh-fuse-integration.git</developerConnection>
-		<url>https://code-repo.d4science.org/gCubeSystem/sh-fuse-integration</url>
-	</scm>
+    <scm>
+        <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/sh-fuse-integration.git</connection>
+        <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/sh-fuse-integration.git
+        </developerConnection>
+        <url>https://code-repo.d4science.org/gCubeSystem/sh-fuse-integration</url>
+    </scm>
 
-	<repositories>
-		<repository>
-			<id>central</id>
-			<name>bintray</name>
-			<url>https://jcenter.bintray.com</url>
-		</repository>
-	</repositories>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.gcube.distribution</groupId>
-				<artifactId>gcube-bom</artifactId>
-				<version>2.4.1</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>bintray</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.github.serceman</groupId>
-			<artifactId>jnr-fuse</artifactId>
-			<version>0.5.7</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>gxJRS</artifactId>
-		</dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.gcube.distribution</groupId>
+                <artifactId>gcube-bom</artifactId>
+                <version>2.4.1-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>common-authorization</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.github.serceman</groupId>
+            <artifactId>jnr-fuse</artifactId>
+            <version>0.5.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.gcube.common</groupId>
+            <artifactId>gxJRS</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-client-library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-model</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-gcube-calls</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cache2k</groupId>
-			<artifactId>cache2k-jcache</artifactId>
-			<version>1.2.0.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.gcube.common</groupId>
+            <artifactId>common-authorization</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.gcube.common</groupId>
+            <artifactId>storagehub-client-library</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.gcube.common</groupId>
+            <artifactId>storagehub-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.gcube.core</groupId>
+            <artifactId>common-gcube-calls</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.cache2k</groupId>
+            <artifactId>cache2k-jcache</artifactId>
+            <version>1.2.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<archive>
-								<manifest>
-									<mainClass>org.gcube.data.access.storagehub.fs.StorageHubFuseLauncher
-									</mainClass>
-								</manifest>
-							</archive>
-							<descriptorRefs>
-								<descriptorRef>jar-with-dependencies</descriptorRef>
-							</descriptorRefs>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<target>1.8</target>
-					<source>1.8</source>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.gcube.data.access.storagehub.fs.StorageHubFuseLauncher
+                                    </mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <target>1.8</target>
+                    <source>1.8</source>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/data/access/storagehub/fs/StorageHubFS.java b/src/main/java/org/gcube/data/access/storagehub/fs/StorageHubFS.java
index 41d38d1..511fa36 100644
--- a/src/main/java/org/gcube/data/access/storagehub/fs/StorageHubFS.java
+++ b/src/main/java/org/gcube/data/access/storagehub/fs/StorageHubFS.java
@@ -11,6 +11,7 @@ import org.cache2k.Cache;
 import org.cache2k.Cache2kBuilder;
 import org.gcube.common.authorization.library.AuthorizedTasks;
 import org.gcube.common.authorization.library.provider.AccessTokenProvider;
+import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.storagehub.client.dsl.ContainerType;
 import org.gcube.common.storagehub.client.dsl.FileContainer;
diff --git a/src/test/java/org/gcube/data/access/storagehub/fuse/FuseTest.java b/src/test/java/org/gcube/data/access/storagehub/fuse/FuseTest.java
index b080282..edf6bdc 100644
--- a/src/test/java/org/gcube/data/access/storagehub/fuse/FuseTest.java
+++ b/src/test/java/org/gcube/data/access/storagehub/fuse/FuseTest.java
@@ -1,6 +1,7 @@
 package org.gcube.data.access.storagehub.fuse;
 
 import java.nio.file.Paths;
+import java.util.Objects;
 
 import org.gcube.data.access.storagehub.fs.StorageHubFS;
 import org.junit.Test;
@@ -11,17 +12,15 @@ public class FuseTest {
 
 	@Test
 	public void mount() {
-		StorageHubFS memfs = new StorageHubFS("AccessToken","/gcube");
+		StorageHubFS memfs = new StorageHubFS("eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJSSklZNEpoNF9qdDdvNmREY0NlUDFfS1l0akcxVExXVW9oMkQ2Tzk1bFNBIn0","/gcube");
 		try {
 			String path;
-			switch (Platform.getNativePlatform().getOS()) {
-			case WINDOWS:
-				System.out.println("Im here");
-				path = "J:\\";
-				break;
-			default:
-				path = "/home/lucio/java/mnt";
-			}
+            if (Objects.requireNonNull(Platform.getNativePlatform().getOS()) == Platform.OS.WINDOWS) {
+                System.out.println("Im here");
+                path = "J:\\";
+            } else
+                path = "/home/lucio/java/mnt";
+
 			memfs.mount(Paths.get(path), true, true);
 		} finally {
 			memfs.umount();