From df13c3264b96ce8e2210b68096a3785abedc6194 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Tue, 23 May 2017 09:33:47 +0000 Subject: [PATCH] minor regex for hashtag fix git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/social-networking/social-util-library@148948 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/social_networking/socialutillibrary/Utils.java | 2 +- .../gcube/social_networking/socialutillibrary/TestUnit.java | 4 +--- 2 files changed, 2 insertions(+), 4 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 eba6069..196e1fd 100644 --- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java +++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java @@ -39,7 +39,7 @@ public class Utils { /** * Hashtag regex enhanced for ticket #4937 */ - private static final String HASHTAG_REGEX = "^#\\w+([.]?\\w+)*|\\s#\\w+([.]?\\w+)*|#\\w+([.]?\\w+)*"; + private static final String HASHTAG_REGEX = "^#\\w+([.]?\\w+)*|\\s#\\w+([.]?\\w+)*|(?<=[\\[({])#\\w+([.]?\\w+)"; /** * Pattern for URLS 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 65eba2c..099421d 100644 --- a/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java +++ b/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java @@ -2,14 +2,12 @@ package org.gcube.social_networking.socialutillibrary; import java.util.List; -import org.junit.Test; - public class TestUnit { //@Test public void testHashtag() { - String text = "This is a test with hashtag #T6 and #T6.1 but also #T6. that has '.' that is useless and #T43.43 and #gcube4.1.0gcore #gcube4.1.0 and (#ga) tewrw"; + String text = "This is a test with hashtag #T6 and #T6.1 but also #T6. that has '.' that is useless and #T43.43 and #gcube4.1.0gcore #gcube4.1.0 and (#ga) tewrw and https://www.local.it/#here"; List hashtags = Utils.getHashTags(text); System.out.println("Hashtags are " + hashtags); }