From 7428cbf4a30041954862dec12c6935fd656ba7da Mon Sep 17 00:00:00 2001 From: Dominik Golonka Date: Mon, 23 Jan 2017 21:43:02 +0100 Subject: [PATCH] minor updates --- server_extensions_api/src/main/main.iml | 12 ++++++++++++ .../extensions/extra/tokencoin/TKNExtension.java | 8 ++++---- .../tokencoin/sources/FixPriceRateSource.java | 2 +- .../{tokencoid => tokencoind}/TokenWallet.java | 6 ++---- .../{tokencoid => tokencoind}/TokenWalletAPI.java | 14 +++++++------- .../{tokencoid => tokencoind}/dto/Account.java | 2 +- .../dto/AccountResponse.java | 2 +- .../dto/SendResponse.java | 2 +- .../dto/TokenAccountsResponse.java | 2 +- .../dto/TokenResponse.java | 2 +- .../dto/TokenSendResponse.java | 2 +- server_extensions_extra/src/main/main2.iml | 14 ++++++++++++++ server_extensions_test/src/main/main1.iml | 13 +++++++++++++ 13 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 server_extensions_api/src/main/main.iml rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/TokenWallet.java (96%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/TokenWalletAPI.java (80%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/dto/Account.java (98%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/dto/AccountResponse.java (99%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/dto/SendResponse.java (97%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/dto/TokenAccountsResponse.java (98%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/dto/TokenResponse.java (98%) rename server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/{tokencoid => tokencoind}/dto/TokenSendResponse.java (98%) create mode 100644 server_extensions_extra/src/main/main2.iml create mode 100644 server_extensions_test/src/main/main1.iml diff --git a/server_extensions_api/src/main/main.iml b/server_extensions_api/src/main/main.iml new file mode 100644 index 0000000..185686e --- /dev/null +++ b/server_extensions_api/src/main/main.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java index 1828c1e..278580b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/TKNExtension.java @@ -27,7 +27,7 @@ import com.generalbytes.batm.server.extensions.IPaymentProcessor; import com.generalbytes.batm.server.extensions.IRateSource; import com.generalbytes.batm.server.extensions.IWallet; import com.generalbytes.batm.server.extensions.extra.tokencoin.sources.FixPriceRateSource; -import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.TokenWallet; +import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.TokenWallet; import com.generalbytes.batm.server.extensions.watchlist.IWatchList; import java.math.BigDecimal; @@ -48,7 +48,7 @@ public class TKNExtension implements IExtension{ StringTokenizer st = new StringTokenizer(walletLogin,":"); String walletType = st.nextToken(); - if ("tokencoid".equalsIgnoreCase(walletType)) { + if ("tokencoind".equalsIgnoreCase(walletType)) { //"nud:protocol:user:password:ip:port:accountname" String host = st.nextToken(); @@ -84,7 +84,7 @@ public class TKNExtension implements IExtension{ StringTokenizer st = new StringTokenizer(sourceLogin,":"); String rsType = st.nextToken(); - if ("tknfix".equalsIgnoreCase(rsType)) { + if ("tknfix".equalsIgnoreCase(rsType)) { // fixed price BigDecimal rate = BigDecimal.ZERO; if (st.hasMoreTokens()) { try { @@ -92,7 +92,7 @@ public class TKNExtension implements IExtension{ } catch (Throwable e) { } } - String preferedFiatCurrency = ICurrencies.USD; + String preferedFiatCurrency = ICurrencies.EUR; if (st.hasMoreTokens()) { preferedFiatCurrency = st.nextToken(); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java index b2a50bd..f55d548 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/sources/FixPriceRateSource.java @@ -28,7 +28,7 @@ import java.util.Set; public class FixPriceRateSource implements IRateSource { private BigDecimal rate = BigDecimal.ZERO; - private String preferedFiatCurrency = ICurrencies.USD; + private String preferedFiatCurrency = ICurrencies.EUR; public FixPriceRateSource(BigDecimal rate, String preferedFiatCurrency) { this.rate = rate; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/TokenWallet.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java similarity index 96% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/TokenWallet.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java index 42be4c3..f206180 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/TokenWallet.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWallet.java @@ -16,18 +16,16 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind; import com.generalbytes.batm.server.extensions.ICurrencies; import com.generalbytes.batm.server.extensions.IWallet; -import com.generalbytes.batm.server.extensions.extra.tokencoin.TKNAddressValidator; -import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto.*; +import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import si.mazi.rescu.RestProxyFactory; import java.math.BigDecimal; -import java.math.BigInteger; import java.util.HashSet; import java.util.Set; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/TokenWalletAPI.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWalletAPI.java similarity index 80% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/TokenWalletAPI.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWalletAPI.java index d921e8f..526ff3c 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/TokenWalletAPI.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/TokenWalletAPI.java @@ -16,12 +16,12 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind; -import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto.AccountResponse; -import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto.TokenAccountsResponse; -import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto.TokenSendResponse; -import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto.SendResponse; +import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto.AccountResponse; +import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto.TokenAccountsResponse; +import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto.TokenSendResponse; +import com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto.SendResponse; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @@ -43,6 +43,6 @@ public interface TokenWalletAPI { public TokenSendResponse send(@FormParam("email") String email, @FormParam("password") String password, @FormParam("masterPassword") String masterPassword, @FormParam("accountId") String accountId, @FormParam("recipient") String recipient, @QueryParam("amount") BigDecimal amountNQT, @FormParam("message") String message); @POST - @Path("/{id}/{recipient}/{amount}/{message}/send") - public SendResponse send2( @PathParam("accountId") String accountId, @PathParam("recipient") String recipient, @PathParam("amount") BigDecimal amountNQT, @PathParam("message") String requestType); + @Path("/Accounts/{id}/{recipient}/{amount}/{message}/send") + public SendResponse send2( @PathParam("id") String accountId, @PathParam("recipient") String recipient, @PathParam("amount") BigDecimal amountNQT, @PathParam("message") String requestType); } diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/Account.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/Account.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/Account.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/Account.java index cde2863..a4e8da2 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/Account.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/Account.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto; public class Account { private String id_account; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/AccountResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/AccountResponse.java similarity index 99% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/AccountResponse.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/AccountResponse.java index 5fdc57c..00272d8 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/AccountResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/AccountResponse.java @@ -15,7 +15,7 @@ * Web : http://www.generalbytes.com * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto; import java.math.BigDecimal; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/SendResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/SendResponse.java similarity index 97% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/SendResponse.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/SendResponse.java index d3cb0ed..3aca06b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/SendResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/SendResponse.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto; public class SendResponse { private String transaction; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenAccountsResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenAccountsResponse.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenAccountsResponse.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenAccountsResponse.java index 6eb1322..ad2402c 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenAccountsResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenAccountsResponse.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto; public class TokenAccountsResponse extends TokenResponse { private Data data; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenResponse.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenResponse.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenResponse.java index 7317abd..656961b 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenResponse.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto; public abstract class TokenResponse { private String status; diff --git a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenSendResponse.java b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenSendResponse.java similarity index 98% rename from server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenSendResponse.java rename to server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenSendResponse.java index caa5d92..1a65c04 100644 --- a/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoid/dto/TokenSendResponse.java +++ b/server_extensions_extra/src/main/java/com/generalbytes/batm/server/extensions/extra/tokencoin/wallets/tokencoind/dto/TokenSendResponse.java @@ -16,7 +16,7 @@ * ************************************************************************************/ -package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoid.dto; +package com.generalbytes.batm.server.extensions.extra.tokencoin.wallets.tokencoind.dto; public class TokenSendResponse extends TokenResponse { private Data data; diff --git a/server_extensions_extra/src/main/main2.iml b/server_extensions_extra/src/main/main2.iml new file mode 100644 index 0000000..defc7d1 --- /dev/null +++ b/server_extensions_extra/src/main/main2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server_extensions_test/src/main/main1.iml b/server_extensions_test/src/main/main1.iml new file mode 100644 index 0000000..4f9f371 --- /dev/null +++ b/server_extensions_test/src/main/main1.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file