aboutsummaryrefslogtreecommitdiff
path: root/juick-server
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-09-25 10:28:54 +0300
committerGravatar Vitaly Takmazov2018-09-25 10:28:54 +0300
commit85abc3e201539f81500754a7fb0e4f3a9d148fc4 (patch)
tree7d2e037fd6d0caea78162b9820b01d89aec1010d /juick-server
parent933e5702864d0babcd9f8cbc1791078f387b24c7 (diff)
fix new message tags extracting
Diffstat (limited to 'juick-server')
-rw-r--r--juick-server/src/main/java/com/juick/service/TagServiceImpl.java14
-rw-r--r--juick-server/src/test/java/com/juick/server/tests/ServerTests.java8
2 files changed, 15 insertions, 7 deletions
diff --git a/juick-server/src/main/java/com/juick/service/TagServiceImpl.java b/juick-server/src/main/java/com/juick/service/TagServiceImpl.java
index 3ee21aec..aa6c3713 100644
--- a/juick-server/src/main/java/com/juick/service/TagServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/TagServiceImpl.java
@@ -23,6 +23,7 @@ import com.juick.server.helpers.TagStats;
import com.juick.util.StreamUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.support.GeneratedKeyHolder;
@@ -38,8 +39,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import java.util.stream.Stream;
/**
@@ -209,12 +210,15 @@ public class TagServiceImpl extends BaseJdbcService implements TagService {
}
@Override
- public List<Tag> fromString(final String txt) {
+ public Pair<String, List<Tag>> fromString(final String txt) {
String firstLine = txt.split("\\n", 2)[0];
- return StreamUtils.takeWhile(Arrays.stream(firstLine.split("\\ ")),
- t -> !t.equals("*") && t.startsWith("*"))
- .map(t -> getTag(t.substring(1), true))
+ Supplier<Stream<String>> tagsStream = () -> StreamUtils.takeWhile(Arrays.stream(firstLine.split("\\ ")),
+ t -> !t.equals("*") && t.startsWith("*"));
+ int tagsLength = tagsStream.get().collect(Collectors.joining(" ")).length();
+ String body = txt.substring(tagsLength);
+ List<Tag> tags = tagsStream.get().map(t -> getTag(t.substring(1), true))
.distinct().collect(Collectors.toList());
+ return Pair.of(body, tags);
}
@Transactional(readOnly = true)
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index c4915acf..924864f6 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -1692,8 +1692,12 @@ public class ServerTests {
}
@Test
public void newMessageShouldNotContainDuplicatedTags() throws Exception {
- CommandResult result = commandsManager.processCommand(ugnich, "*test *test test", emptyUri);
+ CommandResult result = commandsManager.processCommand(ugnich, "*test1 *test2 *test1 test3", emptyUri);
assertThat(result.getNewMessage().isPresent(), is(true));
- assertThat(result.getNewMessage().get().getTags().size(), is (1));
+ Message msg = result.getNewMessage().get();
+ assertThat(msg.getTags().size(), is (2));
+ assertThat(msg.getTags().get(0).getName(), is("test1"));
+ assertThat(msg.getTags().get(1).getName(), is("test2"));
+ assertThat(msg.getText(), is("test3"));
}
}