From 79aadacf635aadd0f8454fa2de0e7d1ebaffebb5 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 10 Jan 2017 15:52:45 +0100
Subject: [PATCH] Fix compilation (remove used import on gson)
---
duniter4j-es-assembly/pom.xml | 2 +-
.../duniter/elasticsearch/gchange/service/CommentService.java | 4 +---
.../gchange/service/CommentUserEventService.java | 1 -
.../duniter/elasticsearch/user/service/UserEventService.java | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/duniter4j-es-assembly/pom.xml b/duniter4j-es-assembly/pom.xml
index 3d127216..a027b0a9 100644
--- a/duniter4j-es-assembly/pom.xml
+++ b/duniter4j-es-assembly/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.duniter</groupId>
<artifactId>duniter4j</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>0.6.1</version>
</parent>
<groupId>org.duniter</groupId>
diff --git a/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java b/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java
index deadf771..8bd5dff7 100644
--- a/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java
+++ b/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java
@@ -24,7 +24,6 @@ package org.duniter.elasticsearch.gchange.service;
import com.fasterxml.jackson.databind.JsonNode;
-import com.google.gson.JsonSyntaxException;
import org.apache.commons.collections4.MapUtils;
import org.duniter.core.client.model.elasticsearch.RecordComment;
import org.duniter.core.exception.TechnicalException;
@@ -34,7 +33,6 @@ import org.duniter.elasticsearch.exception.NotFoundException;
import org.duniter.elasticsearch.gchange.PluginSettings;
import org.duniter.elasticsearch.gchange.model.event.GchangeEventCodes;
import org.duniter.elasticsearch.gchange.model.market.MarketRecord;
-import org.duniter.elasticsearch.gchange.service.AbstractService;
import org.duniter.elasticsearch.threadpool.ThreadPool;
import org.duniter.elasticsearch.user.model.UserEvent;
import org.duniter.elasticsearch.user.service.HistoryService;
@@ -247,7 +245,7 @@ public class CommentService extends AbstractService {
SearchResponse response = searchRequest.execute().actionGet();
return response.getHits().getTotalHits();
}
- catch(SearchPhaseExecutionException | JsonSyntaxException e) {
+ catch(SearchPhaseExecutionException e) {
// Failed or no item on index
logger.error(String.format("Error while counting comment replies: %s", e.getMessage()), e);
}
diff --git a/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentUserEventService.java b/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentUserEventService.java
index 8ff57dbd..bc8bb500 100644
--- a/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentUserEventService.java
+++ b/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentUserEventService.java
@@ -38,7 +38,6 @@ import org.duniter.core.util.websocket.WebsocketClientEndpoint;
import org.duniter.elasticsearch.gchange.PluginSettings;
import org.duniter.elasticsearch.gchange.model.event.GchangeEventCodes;
import org.duniter.elasticsearch.gchange.model.market.MarketRecord;
-import org.duniter.elasticsearch.gchange.service.AbstractService;
import org.duniter.elasticsearch.service.BlockchainService;
import org.duniter.elasticsearch.service.changes.ChangeEvent;
import org.duniter.elasticsearch.service.changes.ChangeService;
diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
index d795b763..79277567 100644
--- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
+++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/UserEventService.java
@@ -26,7 +26,6 @@ package org.duniter.elasticsearch.user.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.ImmutableList;
-import com.google.gson.JsonSyntaxException;
import org.duniter.core.exception.TechnicalException;
import org.duniter.core.service.CryptoService;
import org.duniter.core.service.MailService;
@@ -446,7 +445,7 @@ public class UserEventService extends AbstractService implements ChangeService.C
// last flush
flushDeleteBulk(INDEX, EVENT_TYPE, bulkRequest);
}
- catch(SearchPhaseExecutionException | JsonSyntaxException e) {
+ catch(SearchPhaseExecutionException e) {
// Failed or no item on index
logger.error(String.format("Error while deleting by reference: %s. Skipping deletions.", e.getMessage()), e);
}
--
GitLab