From da639e719deeb6217284902cebea8c25b903167f Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Mon, 16 Oct 2017 16:29:42 +0200 Subject: [PATCH] [fix] HTTP: Fix URL generated by HttpRequest --- .../core/client/service/HttpServiceImpl.java | 3 +- .../CurrencyRegistryRemoteServiceTest.java | 37 ------------------- .../duniter4j-core-client-test.properties | 4 +- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/HttpServiceImpl.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/HttpServiceImpl.java index 417d5b3e..d0cb4558 100644 --- a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/HttpServiceImpl.java +++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/HttpServiceImpl.java @@ -198,8 +198,7 @@ public class HttpServiceImpl implements HttpService, Closeable, InitializingBean } public String getPath(Peer peer, String... absolutePath) { - return pathJoiner.join(peer.getUrl(), - pathJoiner.skipNulls().join(absolutePath)); + return peer.getUrl() + pathJoiner.skipNulls().join(absolutePath).replaceAll("//+", "/"); } diff --git a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/elasticsearch/CurrencyRegistryRemoteServiceTest.java b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/elasticsearch/CurrencyRegistryRemoteServiceTest.java index 2976fb38..3eca5837 100644 --- a/duniter4j-core-client/src/test/java/org/duniter/core/client/service/elasticsearch/CurrencyRegistryRemoteServiceTest.java +++ b/duniter4j-core-client/src/test/java/org/duniter/core/client/service/elasticsearch/CurrencyRegistryRemoteServiceTest.java @@ -66,41 +66,4 @@ public class CurrencyRegistryRemoteServiceTest { Assert.assertTrue(isNodeAlive); } - @Test - public void getAllCurrencyNames() { - List<String> currencyNames = service.getAllCurrencyNames(); - for (String currencyName: currencyNames) { - log.info(" - " + currencyName); - } - } - - /* -- internal methods -- */ - - protected Wallet createTestWallet() { - Wallet wallet = new Wallet( - resource.getFixtures().getCurrency(), - resource.getFixtures().getUid(), - CryptoUtils.decodeBase58(resource.getFixtures().getUserPublicKey()), - CryptoUtils.decodeBase58(resource.getFixtures().getUserSecretKey())); - - return wallet; - } - - protected void assertResults(String queryText, List<Currency> result) { - log.info(String.format("Results for a search on [%s]", queryText)); - Assert.assertNotNull(result); - Assert.assertTrue(result.size() > 0); - for (Currency currency: result) { - log.info(" - " + currency.getCurrencyName()); - } - } - - protected void assertSuggestions(String queryText, List<String> result) { - log.info(String.format("Suggestions for [%s]", queryText)); - Assert.assertNotNull(result); - Assert.assertTrue(result.size() > 0); - for (String suggestion: result) { - log.info(" - " + suggestion); - } - } } diff --git a/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties b/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties index de6f268f..2b5c5ba5 100644 --- a/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties +++ b/duniter4j-core-client/src/test/resources/duniter4j-core-client-test.properties @@ -1,5 +1,5 @@ -duniter4j.node.host=g1-test.duniter.org -duniter4j.node.port=10900 +duniter4j.node.host=g1-test.cgeek.fr +duniter4j.node.port=80 duniter4j.node.elasticsearch.host=localhost duniter4j.node.elasticsearch.port=9200 -- GitLab