diff --git a/.classpath b/.classpath
index 75f5880..1ab41ba 100644
--- a/.classpath
+++ b/.classpath
@@ -13,6 +13,7 @@
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..700f5f6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,49 @@
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [v1.5.1-SNAPSHOT] - 2020-11-17
+
+#### Fixes
+
+[21267] Fixed the slf4j-log4j12 dependency
+Moved to gcube-bom 2.0.1
+
+## [v1.5.0] - 2019-11-26
+
+[Task #16415] Migrate to Firebase Dynamic Links APIs
+
+
+## [v1.2.0] - 2017-06-14
+
+[Support #8940] src/it/simple-it/pom.xm
+
+
+## [v1.1.1] - 2016-12-19
+
+removed lo4j dependency from pom
+
+
+## [v1.1.0] - 2016-09-27
+
+removed jump of scope during read of Runtime HTTP-URL-Shortener
+
+removed constructor with the parameter scope
+
+
+## [v1.0.2] - 2016-06-30
+
+removed maven portal bom dependency
+
+
+## [v1.0.1] - 2016-04-26
+
+maven-bom replaced by portal-bom
+
+
+## [v1.0.0] - 2014-10-13
+
+First Release
diff --git a/pom.xml b/pom.xml
index 32a4112..ab50c7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
4.0.0
org.gcube.portlets.user
gcube-url-shortener
- 1.5.0
+ 1.5.1-SNAPSHOT
jar
gcube-url-shortener
The Gcube Url Shortener uses the Firebase Dynamic Links Short Links API provided by Google (at https://firebase.google.com/docs/reference/dynamic-links/link-shortener).
@@ -51,7 +51,7 @@
org.gcube.distribution
gcube-bom
- 1.4.0
+ 2.0.1
pom
import
@@ -95,10 +95,17 @@
test
+
+ org.slf4j
+ slf4j-api
+ provided
+
+
org.slf4j
slf4j-log4j12
- 1.6.4
+ 1.7.25
+ provided
diff --git a/src/main/java/org/gcube/portlets/user/urlshortener/UrlShortener.java b/src/main/java/org/gcube/portlets/user/urlshortener/UrlShortener.java
index 7320d07..df09032 100644
--- a/src/main/java/org/gcube/portlets/user/urlshortener/UrlShortener.java
+++ b/src/main/java/org/gcube/portlets/user/urlshortener/UrlShortener.java
@@ -191,6 +191,15 @@ public final class UrlShortener {
JSONObject jsonObj = new JSONObject();
//jsonObj.put(LONG_URL, longUrl);
String toLongURL = String.format("%s?link=%s",dynamicLink,longUrl);
+
+ /*String toRequestShortURL = longUrl;
+ if(toRequestShortURL.contains("?")) {
+ //I need to encode the URL before submit the request to Google DL
+ toRequestShortURL = URLEncoder.encode(longUrl, "UTF-8");
+
+ }
+
+ String toLongURL = String.format("%s?link=%s",dynamicLink,toRequestShortURL);*/
jsonObj.put(LONG_DYNAMIC_LINK, toLongURL);
JSONObject jsonObjSuffix = null;
diff --git a/src/test/java/org/gcube/portlets/user/urlshortener/Encoder.java b/src/test/java/org/gcube/portlets/user/urlshortener/Encoder.java
index 35eb98e..14c16a8 100644
--- a/src/test/java/org/gcube/portlets/user/urlshortener/Encoder.java
+++ b/src/test/java/org/gcube/portlets/user/urlshortener/Encoder.java
@@ -2,12 +2,10 @@ package org.gcube.portlets.user.urlshortener;
import java.util.HashMap;
-import org.junit.Test;
-
public class Encoder {
- @Test
+ //@Test
public void encode() {
// System.out.println(UrlEncoderUtil.encodeQuery("request=GetStyles", "layers=test Name", "service=WMS", "version=1.1.1"));
diff --git a/src/test/java/org/gcube/portlets/user/urlshortener/Shortener.java b/src/test/java/org/gcube/portlets/user/urlshortener/Shortener.java
index fc6cf62..63d026b 100644
--- a/src/test/java/org/gcube/portlets/user/urlshortener/Shortener.java
+++ b/src/test/java/org/gcube/portlets/user/urlshortener/Shortener.java
@@ -1,6 +1,5 @@
package org.gcube.portlets.user.urlshortener;
import org.gcube.common.scope.api.ScopeProvider;
-import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,7 +17,7 @@ public class Shortener {
protected static Logger logger = LoggerFactory.getLogger(Shortener.class);
protected static int tnt = 0;
- @Test
+ //@Test
public void testShortener(){
Thread th = new Thread(){
diff --git a/src/test/java/org/gcube/portlets/user/urlshortener/TestUrlShortener.java b/src/test/java/org/gcube/portlets/user/urlshortener/TestUrlShortener.java
index a50fc74..40f9106 100644
--- a/src/test/java/org/gcube/portlets/user/urlshortener/TestUrlShortener.java
+++ b/src/test/java/org/gcube/portlets/user/urlshortener/TestUrlShortener.java
@@ -1,5 +1,6 @@
package org.gcube.portlets.user.urlshortener;
import org.gcube.common.scope.api.ScopeProvider;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,7 +18,7 @@ public class TestUrlShortener {
protected static Logger logger = LoggerFactory.getLogger(TestUrlShortener.class);
protected static int tnt = 0;
-// @Test
+ @Test
public void testShortener(){
Thread th = new Thread(){
@@ -27,7 +28,7 @@ public class TestUrlShortener {
ScopeProvider.instance.set(scope);
UrlShortener urlSh = new UrlShortener();
System.out.println("UrlShortener: "+urlSh);
- String shorten = urlSh.shorten("http://data.d4science.org/uri-resolver/UUFYTGtkaEtiK2s0TURzdTBQckpBSDJmbVkrOXAzazVHbWJQNStIS0N6Yz0");
+ String shorten = urlSh.shorten("https://data.dev.d4science.org/shub/E_YjVxTHljYUQ1WXdqeExVMUJBTG16cHhUTEF0OVBsdWZydzAvNHgwNG9pNkFUVEVNck1uOGd4YmVsUDJiei9DMw==");
//String shorten = urlSh.shorten("https://developers.google.com/url-shortener/v1/getting_started?hl=it "+new Random().nextDouble());
System.out.println("Shorted: "+shorten);
} catch (Exception e) {
diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore
new file mode 100644
index 0000000..3197e17
--- /dev/null
+++ b/src/test/resources/.gitignore
@@ -0,0 +1,6 @@
+/devNext.gcubekey
+/devsec.gcubekey
+/gcube.gcubekey
+/log4j.properties
+/pred4s.gcubekey
+/preprod.gcubekey