From 9702709ea6969cddf9047c8367b0e42d68827e7e Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Thu, 8 Sep 2016 20:33:34 +0000 Subject: [PATCH] fixed hashtag regex: only one dot is allowed git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/social-networking/social-util-library@131260 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../org/gcube/social_networking/socialutillibrary/Utils.java | 4 ++-- .../gcube/social_networking/socialutillibrary/TestUnit.java | 3 ++- 2 files changed, 4 insertions(+), 3 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 04cf2e6..f6a2c6c 100644 --- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java +++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java @@ -38,9 +38,9 @@ public class Utils { /** * Hashtag regex enhanced for ticket #4937 - * If you want to accept hashtags of type #X, then you will need to use ^#\\w*[.]*\\w+|\\s#\\w*[.]*\\w+ + * If you want to accept hashtags of type #X, then you will need to use ^#\\w*[.]?\\w+|\\s#\\w*[.]?\\w+ */ - private static final String HASHTAG_REGEX = "^#\\w+[.]*\\w+|\\s#\\w+[.]*\\w+"; + private static final String HASHTAG_REGEX = "^#\\w+[.]?\\w+|\\s#\\w+[.]?\\w+"; /** * 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 09f77d4..47966ad 100644 --- a/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java +++ b/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java @@ -2,12 +2,13 @@ package org.gcube.social_networking.socialutillibrary; import java.util.List; + 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."; + String text = "This is a test with hashtag #T6 and #T6.1 but also #T6. that has '.' that is useless and #T43..43 ."; List hashtags = Utils.getHashTags(text); System.out.println("Hashtags are " + hashtags); }