removed http protocol; deprecated old smp classes update to version
3.0.1-SNAPSHOT
This commit is contained in:
parent
83fce2b7e2
commit
8a5cbc8ed3
|
@ -1,5 +1,9 @@
|
|||
# Changelog for storage-manager-wrapper
|
||||
|
||||
## [v3.0.1-SNAPSHOT]
|
||||
* removed http protocol;
|
||||
* deprecated old smp classes
|
||||
|
||||
## [v2.6.0-SNAPSHOT] 2020-11-12
|
||||
|
||||
* adding new constructor with the backendType as input parameter
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -8,7 +8,7 @@
|
|||
</parent>
|
||||
<groupId>org.gcube.contentmanagement</groupId>
|
||||
<artifactId>storage-manager-wrapper</artifactId>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<version>3.0.1-SNAPSHOT</version>
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
|
|
|
@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
|
|||
*
|
||||
* Example: smp://data.gcube.org?uhdnfounhcfnshfnrhbvyaeegytf6dfawiuawgcyg
|
||||
*/
|
||||
@Deprecated
|
||||
public class SMPURLConnectionById extends SMPConnection {
|
||||
|
||||
private Logger logger= LoggerFactory.getLogger(SMPURLConnectionOld.class);
|
||||
|
|
|
@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
|
|||
* @author Roberto Cirillo (ISTI-CNR)
|
||||
*
|
||||
*/
|
||||
@Deprecated
|
||||
public class SMPURLConnectionFactory {
|
||||
|
||||
static Logger logger=LoggerFactory.getLogger(SMPURLConnectionFactory.class);
|
||||
|
@ -65,11 +66,11 @@ public class SMPURLConnectionFactory {
|
|||
private static boolean isNewSmpFormat(String urlString) {
|
||||
logger.debug("check format: "+urlString);
|
||||
String httpString=urlString;
|
||||
httpString=httpString.replace("smp://", "http://");
|
||||
logger.debug("httpUrl conversion: "+httpString);
|
||||
URL httpUrl=null;
|
||||
httpString=httpString.replace("smp://", "https://");
|
||||
logger.debug("httpsUrl conversion: "+httpString);
|
||||
URL httpsUrl=null;
|
||||
try {
|
||||
httpUrl=new URL(httpString);
|
||||
httpsUrl=new URL(httpString);
|
||||
} catch (MalformedURLException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
|
@ -80,7 +81,7 @@ public class SMPURLConnectionFactory {
|
|||
host=Utils.getResolverHost(services.get(0));
|
||||
}
|
||||
logger.debug("uri-resolver host: "+host+" in scope: "+ScopeProvider.instance.get());
|
||||
if((host!=null) && (host.equals(httpUrl.getHost()))){
|
||||
if((host!=null) && (host.equals(httpsUrl.getHost()))){
|
||||
return true;
|
||||
}else{
|
||||
return false;
|
||||
|
|
|
@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
|
|||
* @author Fabio Simeoni (University of Strathclyde), @author Roberto Cirillo (ISTI-CNR)
|
||||
*
|
||||
*/
|
||||
@Deprecated
|
||||
public class SMPURLConnectionOld extends SMPConnection{
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue