From b0fc505c1b789b356319ad7839a8eb2d3118a7d6 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Fri, 19 Jan 2018 13:38:38 +0000 Subject: [PATCH] @ symbol added in the url regex for path, see #10987 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/social-networking/social-util-library@162359 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/social_networking/socialutillibrary/Utils.java | 2 +- .../org/gcube/social_networking/socialutillibrary/TestUnit.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java index 92c6545..59eba62 100644 --- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java +++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java @@ -59,7 +59,7 @@ public class Utils { "(\\w+:\\w+@)?((([-\\w]+\\.)+(com|org|net|gov" + "|mil|biz|info|mobi|name|aero|jobs|museum" + "|travel|[a-z]{2,5}))|("+ IPV4_REGEX +")|(\\["+ IPV6_REGEX +"\\]))(:[\\d]{1,5})?" + - "(((\\/([-\\w~!$+|.,=]|%[a-fA-F\\d]{2})+)+|\\/)+|\\?|#)?" + + "(((\\/([-\\w~!$+@|.,=]|%[a-fA-F\\d]{2})+)+|\\/)+|\\?|#)?" + "((\\?([-\\w~!$+|.,*:]|%[a-fA-F\\d{2}])+=?" + "([-\\w~!$+|.,*:=]|%[a-fA-F\\d]{2})*)" + "(&(?:[-\\w~!$+|.,*:]|%[a-fA-F\\d{2}])+=?" + diff --git a/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java b/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java index df9acd1..4724896 100644 --- a/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java +++ b/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java @@ -17,7 +17,7 @@ public class TestUnit { //@Test public void extractUrl(){ - String url = " test http://[2001:db8:0:1:1:1:1:1]:8080/group/preeco/what-if?p_p_id=simul_WAR_simulfishgrowthportlet&p_p_lifecycle=0 "; + String url = " test http://2001:db8:0:1:1:1:1:1:8080/group/preeco/what-if?p_p_id=simul_WAR_simulfishgrowthportlet&p_p_lifecycle=0 "; String result = Utils.extractURL(url); System.out.println("urls are " + result); }