Updating iota version
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java
index 53cb6ad..aa013e6 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAConstants.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.iota;
-import jota.utils.Constants;
+import org.iota.jota.utils.Constants;
public final class IOTAConstants {
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
index 7cdcfbc..2b25dfb 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAEndpoint.java
@@ -18,7 +18,7 @@
import java.net.URL;
-import jota.IotaAPI;
+import org.iota.jota.IotaAPI;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -74,7 +74,7 @@
@Override
protected void doStart() throws Exception {
final URL u = new URL(url);
- apiClient = new IotaAPI.Builder().protocol(u.getProtocol()).host(u.getHost()).port(String.valueOf(u.getPort())).build();
+ apiClient = new IotaAPI.Builder().protocol(u.getProtocol()).host(u.getHost()).port(u.getPort()).build();
super.doStart();
}
@@ -92,7 +92,7 @@
/**
* Component name
- *
+ *
* @param url
*/
public void setName(String name) {
@@ -105,7 +105,7 @@
/**
* Node url
- *
+ *
* @param url
*/
public void setUrl(String url) {
@@ -118,7 +118,7 @@
/**
* TAG
- *
+ *
* @param tag
*/
public void setTag(String tag) {
@@ -131,7 +131,7 @@
/**
* Address security level
- *
+ *
* @param security level
*/
public void setSecurityLevel(Integer securityLevel) {
@@ -146,7 +146,7 @@
* The minWeightMagnitude is the minimum number of zeroes that a
* proof-of-work output/transaction hash must end with to be considered
* valid by full nodes
- *
+ *
* @param minWeightMagnitude
*/
@@ -160,7 +160,7 @@
/**
* The depth determines how deep the tangle is analysed for getting Tips
- *
+ *
* @param depth
*/
public void setDepth(Integer depth) {
@@ -177,7 +177,7 @@
/**
* Supported operations are 'sendTransfer', 'getNewAddress'
- *
+ *
* @param operation
*/
public void setOperation(String operation) {
diff --git a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java
index bc4b28d..2cb15d8 100644
--- a/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java
+++ b/components/camel-iota/src/main/java/org/apache/camel/component/iota/IOTAProducer.java
@@ -19,11 +19,12 @@
import java.util.ArrayList;
import java.util.List;
-import jota.dto.response.GetNewAddressResponse;
-import jota.dto.response.GetTransferResponse;
-import jota.dto.response.SendTransferResponse;
-import jota.model.Transfer;
-import jota.utils.TrytesConverter;
+import org.iota.jota.builder.AddressRequest;
+import org.iota.jota.dto.response.GetNewAddressResponse;
+import org.iota.jota.dto.response.GetTransferResponse;
+import org.iota.jota.dto.response.SendTransferResponse;
+import org.iota.jota.model.Transfer;
+import org.iota.jota.utils.TrytesConverter;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
import org.apache.commons.lang3.StringUtils;
@@ -74,10 +75,15 @@
exchange.getIn().setBody(response.getTransactions());
} else if (endpoint.getOperation().equals(IOTAConstants.GET_NEW_ADDRESS_OPERATION)) {
-
+
Integer index = exchange.getIn().getHeader(IOTAConstants.ADDRESS_INDEX_HEADER, Integer.class);
- GetNewAddressResponse response = endpoint.getApiClient().getNewAddress(seed, endpoint.getSecurityLevel(), index, true, 1, false);
+ AddressRequest addressRequest = new AddressRequest.Builder(seed, endpoint.getSecurityLevel())
+ .index(index)
+ .checksum(true)
+ .amount(1)
+ .build();
+ GetNewAddressResponse response = endpoint.getApiClient().generateNewAddresses(addressRequest);
exchange.getIn().setBody(response.getAddresses());
} else if (endpoint.getOperation().equals(IOTAConstants.GET_TRANSFERS_OPERATION)) {
Integer startIdx = exchange.getIn().getHeader(IOTAConstants.ADDRESS_START_INDEX_HEADER, Integer.class);
@@ -85,7 +91,7 @@
GetTransferResponse response = endpoint.getApiClient().getTransfers(seed, endpoint.getSecurityLevel(), startIdx, endIdx, true);
exchange.getIn().setBody(response.getTransfers());
- }
+ }
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index b41eccb..62b57a0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -365,7 +365,7 @@
<jmh-version>1.22</jmh-version>
<jodatime-bundle-version>1.6.2</jodatime-bundle-version>
<jodatime2-bundle-version>2.10.4</jodatime2-bundle-version>
- <jota-version>1.0.0-beta3</jota-version>
+ <jota-version>1.0.0-beta7</jota-version>
<jolokia-version>1.6.2</jolokia-version>
<jolt-version>0.1.1</jolt-version>
<jolt-bundle-version>0.1.1_1</jolt-bundle-version>
diff --git a/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml b/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml
index 32ca7dc..201061c 100644
--- a/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
