From 33daac32ef5c68185ea3d53eaad806ab536ebca2 Mon Sep 17 00:00:00 2001 From: pinpong Date: Mon, 14 Nov 2016 23:00:18 +0100 Subject: [PATCH] Updated pom.xml to buld fat jar --- node_config.properties | 2 +- pom.xml | 43 ++++++++++++------- .../jota/dto/response/GetBundleResponse.java | 4 +- .../dto/response/GetNeighborsResponse.java | 16 +++---- .../dto/response/GetNodeInfoResponse.java | 36 ++++++++-------- 5 files changed, 56 insertions(+), 45 deletions(-) diff --git a/node_config.properties b/node_config.properties index f3c3793..e5e5a5a 100644 --- a/node_config.properties +++ b/node_config.properties @@ -1,5 +1,5 @@ iota.node.protocol=http #iota.node.host=138.68.126.141 -iota.node.host=127.0.0.1 +iota.node.host=node.iotawallet.info iota.node.port=14265 diff --git a/pom.xml b/pom.xml index b8ed23d..70b381e 100644 --- a/pom.xml +++ b/pom.xml @@ -66,21 +66,32 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - ${java-version} - ${java-version} - ${java-version} - ${java-version} - - - - - + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + ${java-version} + ${java-version} + ${java-version} + ${java-version} + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + + + diff --git a/src/main/java/jota/dto/response/GetBundleResponse.java b/src/main/java/jota/dto/response/GetBundleResponse.java index 1333014..c508f78 100644 --- a/src/main/java/jota/dto/response/GetBundleResponse.java +++ b/src/main/java/jota/dto/response/GetBundleResponse.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; public class GetBundleResponse extends AbstractResponse { - private Transactions[] transactions; + public Transactions[] transactions; private String warning; @@ -17,7 +17,7 @@ public class GetBundleResponse extends AbstractResponse { return transactions; } - static class Transactions { + public static class Transactions { private String signatureMessageChunk; private String index; private String approvalNonce; diff --git a/src/main/java/jota/dto/response/GetNeighborsResponse.java b/src/main/java/jota/dto/response/GetNeighborsResponse.java index 784b2cc..550a546 100644 --- a/src/main/java/jota/dto/response/GetNeighborsResponse.java +++ b/src/main/java/jota/dto/response/GetNeighborsResponse.java @@ -2,32 +2,32 @@ package jota.dto.response; public class GetNeighborsResponse extends AbstractResponse { - private Neighbors[] neighbors; + public Neighbors[] neighbors; public Neighbors[] getNeighbors() { return neighbors; } - static class Neighbors { + public static class Neighbors { private String address; - private String numberOfAllTransactions; - private String numberOfInvalidTransactions; - private String numberOfNewTransactions; + private Integer numberOfAllTransactions; + private Integer numberOfInvalidTransactions; + private Integer numberOfNewTransactions; public String getAddress() { return address; } - public String getNumberOfAllTransactions() { + public Integer getNumberOfAllTransactions() { return numberOfAllTransactions; } - public String getNumberOfInvalidTransactions() { + public Integer getNumberOfInvalidTransactions() { return numberOfInvalidTransactions; } - public String getNumberOfNewTransactions() { + public Integer getNumberOfNewTransactions() { return numberOfNewTransactions; } } diff --git a/src/main/java/jota/dto/response/GetNodeInfoResponse.java b/src/main/java/jota/dto/response/GetNodeInfoResponse.java index a674517..5cb3666 100644 --- a/src/main/java/jota/dto/response/GetNodeInfoResponse.java +++ b/src/main/java/jota/dto/response/GetNodeInfoResponse.java @@ -6,17 +6,17 @@ public class GetNodeInfoResponse extends AbstractResponse { private String appVersion; private Integer jreAvailableProcessors; private Integer jreFreeMemory; - private float jreMaxMemory; - private float jreTotalMemory; + private Integer jreMaxMemory; + private Integer jreTotalMemory; private String latestMilestone; - private Integer latestMilestoneIndex; + private Long latestMilestoneIndex; private String latestSolidSubtangleMilestone; - private Integer latestSolidSubtangleMilestoneIndex; - private Integer neighbors; - private Integer packetsQueueSize; - private long time; - private Integer tips; - private Integer transactionsToRequest; + private Long latestSolidSubtangleMilestoneIndex; + private Long neighbors; + private Long packetsQueueSize; + private Long time; + private Long tips; + private Long transactionsToRequest; public String getAppName() { return appName; @@ -34,11 +34,11 @@ public class GetNodeInfoResponse extends AbstractResponse { return jreFreeMemory; } - public float getJreMaxMemory() { + public Integer getJreMaxMemory() { return jreMaxMemory; } - public float getJreTotalMemory() { + public Integer getJreTotalMemory() { return jreTotalMemory; } @@ -46,7 +46,7 @@ public class GetNodeInfoResponse extends AbstractResponse { return latestMilestone; } - public Integer getLatestMilestoneIndex() { + public Long getLatestMilestoneIndex() { return latestMilestoneIndex; } @@ -54,27 +54,27 @@ public class GetNodeInfoResponse extends AbstractResponse { return latestSolidSubtangleMilestone; } - public Integer getLatestSolidSubtangleMilestoneIndex() { + public Long getLatestSolidSubtangleMilestoneIndex() { return latestSolidSubtangleMilestoneIndex; } - public Integer getNeighbors() { + public Long getNeighbors() { return neighbors; } - public Integer getPacketsQueueSize() { + public Long getPacketsQueueSize() { return packetsQueueSize; } - public long getTime() { + public Long getTime() { return time; } - public Integer getTips() { + public Long getTips() { return tips; } - public Integer getTransactionsToRequest() { + public Long getTransactionsToRequest() { return transactionsToRequest; }