Skip to content

Commit 120ddf6

Browse files
author
Hubert Marteau
committed
3.2 - Correction of NewAddressFilled
1 parent fbdb428 commit 120ddf6

3 files changed

Lines changed: 82 additions & 37 deletions

File tree

‎src/multichain/command/AddressCommand.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/**
2121
* @author Ub - H. MARTEAU
22-
* @version 3.0
22+
* @version 3.2
2323
*/
2424
public class AddressCommand extends QueryBuilderAddress {
2525

@@ -320,8 +320,10 @@ public final Address getNewAddressFilled() throws MultichainException {
320320
Address address = new Address();
321321

322322
Object objectAddress = executeGetNewAddress();
323-
if (verifyInstance(objectAddress, Address.class)) {
324-
address = (Address) objectAddress;
323+
if (verifyInstance(objectAddress, String.class)) {
324+
String stringAddress = (String) objectAddress;
325+
326+
address = validateAddress(stringAddress);
325327
}
326328

327329
return address;

‎src/multichain/object/Address.java‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,42 @@
77
*/
88
package multichain.object;
99

10-
1110
/**
1211
* @author Ub - H. MARTEAU
13-
* @version 1.0
12+
* @version 3.2
1413
*/
1514
public class Address extends AddressInfo {
1615
String address;
17-
// HashMap<String, Permission> permissions;
16+
17+
/*
18+
* (non-Javadoc)
19+
*
20+
* @see java.lang.Object#toString()
21+
*/
22+
@Override
23+
public String toString() {
24+
return "Address [address=" + address + ", " + super.toString() + "]";
25+
}
26+
27+
// HashMap<String, Permission> permissions;
1828
/**
1929
*
2030
*/
2131
public Address() {
2232
super();
2333

24-
// permissions = new HashMap<String, Permission>();
34+
// permissions = new HashMap<String, Permission>();
2535
}
2636

27-
2837
/**
2938
* @param address
3039
*/
3140
public Address(String address) {
3241
super();
3342
this.address = address;
34-
// permissions = new HashMap<String, Permission>();
43+
// permissions = new HashMap<String, Permission>();
3544
}
3645

37-
3846
/**
3947
* @return the address
4048
*/
@@ -43,37 +51,35 @@ public String getAddress() {
4351
}
4452

4553
/**
46-
* @param address the address to set
54+
* @param address
55+
* the address to set
4756
*/
4857
public void setAddress(String address) {
4958
this.address = address;
5059
}
5160

61+
// /**
62+
// * @return the permissions
63+
// */
64+
// public HashMap<String, Permission> getPermissions() {
65+
// return permissions;
66+
// }
67+
//
68+
//
69+
// /**
70+
// * @param permissions the permissions to set
71+
// */
72+
// public void setPermissions(HashMap<String, Permission> permissions) {
73+
// this.permissions = permissions;
74+
// }
5275

53-
// /**
54-
// * @return the permissions
55-
// */
56-
// public HashMap<String, Permission> getPermissions() {
57-
// return permissions;
58-
// }
59-
//
60-
//
61-
// /**
62-
// * @param permissions the permissions to set
63-
// */
64-
// public void setPermissions(HashMap<String, Permission> permissions) {
65-
// this.permissions = permissions;
66-
// }
67-
68-
69-
// /**
70-
// * @param permissions the permissions to set
71-
// */
72-
// public void addPermission(Permission permission) {
73-
// if (permission != null && permission.getType() != null && !"".equals(permission.getType())) {
74-
// this.permissions.put(permission.getType(), permission);
75-
// }
76-
// }
77-
76+
// /**
77+
// * @param permissions the permissions to set
78+
// */
79+
// public void addPermission(Permission permission) {
80+
// if (permission != null && permission.getType() != null && !"".equals(permission.getType())) {
81+
// this.permissions.put(permission.getType(), permission);
82+
// }
83+
// }
7884

7985
}

‎src/multichain/test/command/AddressCommandTest.java‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
/**
1717
* @author Ub - H. MARTEAU
18-
* @version 2.0
18+
* @version 3.2
1919
*/
2020
public class AddressCommandTest {
2121
static MultiChainCommand multiChainCommand;
@@ -89,6 +89,38 @@ private static void testvalidateAddress() {
8989
}
9090
}
9191

92+
private static void testgetNewAddress() {
93+
String resultAddress = "";
94+
Address result = null;
95+
96+
System.out.println("testgetNewAddress");
97+
try {
98+
resultAddress = multiChainCommand.getAddressCommand().getNewAddress();
99+
if (resultAddress != null && !"".equals(resultAddress)) {
100+
System.out.println(" getNewAddress :");
101+
System.out.println(resultAddress);
102+
} else {
103+
System.err.println("getNewAddress - result is empty");
104+
}
105+
System.out.println();
106+
System.out.println();
107+
108+
result = multiChainCommand.getAddressCommand().getNewAddressFilled();
109+
if (result != null && result.getAddress() != null && !"".equals(result.getAddress())) {
110+
System.out.println(" getNewAddressFilled :");
111+
System.out.println(result);
112+
} else {
113+
System.err.println("getNewAddress - result is empty");
114+
}
115+
System.out.println();
116+
System.out.println();
117+
118+
} catch (MultichainException e) {
119+
// TODO Auto-generated catch block
120+
e.printStackTrace();
121+
}
122+
}
123+
92124
/**
93125
* @param args
94126
*/
@@ -102,6 +134,11 @@ public static void main(String[] args) {
102134
testgetAddresses();
103135
testvalidateAddress();
104136

137+
System.out.println();
138+
System.out.println();
139+
140+
testgetNewAddress();
141+
105142
System.out.println("--- End of AddressCommandTest ---");
106143
}
107144

0 commit comments

Comments
 (0)