diff --git a/src/main/java/org/gcube/usecases/ws/thredds/SyncEngine.java b/src/main/java/org/gcube/usecases/ws/thredds/SyncEngine.java index ba899ff..9b33697 100644 --- a/src/main/java/org/gcube/usecases/ws/thredds/SyncEngine.java +++ b/src/main/java/org/gcube/usecases/ws/thredds/SyncEngine.java @@ -36,12 +36,13 @@ public interface SyncEngine { /** * Checked Access Method - * @throws InternalException - * @throws WorkspaceInteractionException */ public void stopSynch(String folderId) throws ProcessNotFoundException, WorkspaceInteractionException, InternalException; + /** + * Checked Access Method + */ public void setSynchronizedFolder(SynchFolderConfiguration config,String folderId) throws WorkspaceInteractionException, InternalException; /** diff --git a/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/WorkspaceFolderManager.java b/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/WorkspaceFolderManager.java index 0d475f2..04c137c 100644 --- a/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/WorkspaceFolderManager.java +++ b/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/WorkspaceFolderManager.java @@ -148,7 +148,7 @@ public class WorkspaceFolderManager { if(isSynched()) throw new WorkspaceInteractionException("Folder "+folderId+" is already configured for synchronization."); log.info("Configuring folder {} as {} ",folderId,toSet); - + // Checking AND initializing remote folder log.debug("Checking remote folder existence .. "); diff --git a/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/security/Security.java b/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/security/Security.java index fc79d7a..b0caed7 100644 --- a/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/security/Security.java +++ b/src/main/java/org/gcube/usecases/ws/thredds/engine/impl/security/Security.java @@ -24,7 +24,7 @@ public class Security { ClientInfo client = null; try{ AuthorizationProvider.instance.get().getClient(); - }catch(Exception e) { + }catch(Throwable e) { log.warn("Unable to get client info ",e); } User toReturn = new User(client,UmaJWTProvider.instance.get(),SecurityTokenProvider.instance.get(),context); @@ -37,7 +37,7 @@ public class Security { public static void set(User toSet) { log.debug("Setting User {} ",toSet); if(toSet.getUma_token()!=null)UmaJWTProvider.instance.set(toSet.getUma_token()); - if(toSet.getGcube_token()!=null)UmaJWTProvider.instance.set(toSet.getUma_token()); + if(toSet.getGcube_token()!=null)SecurityTokenProvider.instance.set(toSet.getGcube_token()); if(ScopeProvider.instance.get()==null)ScopeProvider.instance.set(toSet.getContext()); } diff --git a/src/main/java/org/gcube/usecases/ws/thredds/model/SyncFolderDescriptor.java b/src/main/java/org/gcube/usecases/ws/thredds/model/SyncFolderDescriptor.java index 11ae2da..ce51730 100644 --- a/src/main/java/org/gcube/usecases/ws/thredds/model/SyncFolderDescriptor.java +++ b/src/main/java/org/gcube/usecases/ws/thredds/model/SyncFolderDescriptor.java @@ -23,4 +23,5 @@ public class SyncFolderDescriptor { private ProcessDescriptor localProcessDescriptor=null; + private SynchronizedElementInfo info=null; }