diff --git a/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfigurationBinder.java b/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfigurationBinder.java index 1cf98ab..95cc640 100644 --- a/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfigurationBinder.java +++ b/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfigurationBinder.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.stream.Collectors; +import org.gcube.common.security.credentials.Credentials; import org.gcube.smartgears.configuration.ProxyAddress; import org.gcube.smartgears.handlers.container.ContainerHandler; import org.gcube.smartgears.handlers.container.lifecycle.AccountingManager; @@ -16,7 +17,6 @@ import org.gcube.smartgears.persistence.LocalPersistence; import org.gcube.smartgears.persistence.PersistenceWriter; import org.gcube.smartgears.security.AuthorizationProvider; import org.gcube.smartgears.security.AuthorizationProviderFactory; -import org.gcube.smartgears.security.Credentials; import org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory; import org.gcube.smartgears.utils.Utils; import org.ini4j.Ini; diff --git a/src/main/java/org/gcube/smartgears/security/AuthorizationProviderFactory.java b/src/main/java/org/gcube/smartgears/security/AuthorizationProviderFactory.java index c18bcd7..63d9eda 100644 --- a/src/main/java/org/gcube/smartgears/security/AuthorizationProviderFactory.java +++ b/src/main/java/org/gcube/smartgears/security/AuthorizationProviderFactory.java @@ -1,5 +1,7 @@ package org.gcube.smartgears.security; +import org.gcube.common.security.credentials.Credentials; + public interface AuthorizationProviderFactory { T connect(Credentials credentials); diff --git a/src/main/java/org/gcube/smartgears/security/Credentials.java b/src/main/java/org/gcube/smartgears/security/Credentials.java deleted file mode 100644 index 088a338..0000000 --- a/src/main/java/org/gcube/smartgears/security/Credentials.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.gcube.smartgears.security; - -public interface Credentials { - -} diff --git a/src/main/java/org/gcube/smartgears/security/SimpleCredentials.java b/src/main/java/org/gcube/smartgears/security/SimpleCredentials.java index b9aca8b..58ca17b 100644 --- a/src/main/java/org/gcube/smartgears/security/SimpleCredentials.java +++ b/src/main/java/org/gcube/smartgears/security/SimpleCredentials.java @@ -1,5 +1,6 @@ package org.gcube.smartgears.security; +import org.gcube.common.security.credentials.Credentials; import org.gcube.common.validator.annotations.NotEmpty; import org.gcube.common.validator.annotations.NotNull; diff --git a/src/main/java/org/gcube/smartgears/security/defaults/DefaultAuthorizationProviderFactory.java b/src/main/java/org/gcube/smartgears/security/defaults/DefaultAuthorizationProviderFactory.java index ba7fddf..e9d6cb3 100644 --- a/src/main/java/org/gcube/smartgears/security/defaults/DefaultAuthorizationProviderFactory.java +++ b/src/main/java/org/gcube/smartgears/security/defaults/DefaultAuthorizationProviderFactory.java @@ -1,8 +1,8 @@ package org.gcube.smartgears.security.defaults; +import org.gcube.common.security.credentials.Credentials; import org.gcube.common.validator.annotations.NotEmpty; import org.gcube.smartgears.security.AuthorizationProviderFactory; -import org.gcube.smartgears.security.Credentials; import org.gcube.smartgears.security.SimpleCredentials; public class DefaultAuthorizationProviderFactory implements AuthorizationProviderFactory{