Skip to content

Commit 7585acc

Browse files
author
rachinkapoor
committed
v1_1.Manifest can not be derived from com.ost.services.v1.Manifest
1 parent acaa89b commit 7585acc

18 files changed

Lines changed: 112 additions & 147 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To use this node module, developers will need to:
2424
<dependency>
2525
<groupId>com.ost</groupId>
2626
<artifactId>ost-sdk-java</artifactId>
27-
<version>1.1.0.beta.2</version>
27+
<version>1.1.0.beta.3</version>
2828
</dependency>
2929
```
3030

‎README_V1.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To use this node module, developers will need to:
2424
<dependency>
2525
<groupId>com.ost</groupId>
2626
<artifactId>ost-sdk-java</artifactId>
27-
<version>1.1.0.beta.2</version>
27+
<version>1.1.0.beta.3</version>
2828
</dependency>
2929
```
3030

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.ost</groupId>
55
<artifactId>ost-sdk-java</artifactId>
6-
<version>1.1.0.beta.2-SNAPSHOT</version>
6+
<version>1.1.0.beta.3-SNAPSHOT</version>
77
<name>OST SDK for Java</name>
88
<description>The official OST SDK for Java(https://dev.ost.com).</description>
99
<packaging>jar</packaging>

‎src/main/java/com/ost/services/v1_1/Manifest.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
package com.ost.services.v1_1;
22

3+
import com.ost.services.OSTServiceManifest;
4+
35
import java.util.Map;
46

5-
public class Manifest extends com.ost.services.v1.Manifest {
7+
public class Manifest extends OSTServiceManifest {
8+
9+
public Actions actions;
10+
public AirDrops airdrops;
11+
public Token token;
12+
public Transactions transactions;
13+
public Transfers transfers;
14+
public Users users;
615

716
public Balances balances;
817
public Ledger ledger;
918

19+
1020
public Manifest( Map<String, Object> params) {
1121
super(params);
22+
init();
1223
}
1324

1425
protected void init() {

‎src/test/java/com/ost/services/v1/ActionsTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public com.ost.services.v1.Actions getService() {
2020
return (com.ost.services.v1.Actions) super.getService();
2121
}
2222

23-
@Override
24-
public com.ost.services.v1.Manifest getServiceManifest() {
25-
return (com.ost.services.v1.Manifest) super.getServiceManifest();
26-
}
27-
2823
@Override
2924
protected void setUpApiEndPoint() throws Exception {
3025
String apiEndPoint = ApiEndPointProvider.getV1EndPoint();
@@ -34,7 +29,13 @@ protected void setUpApiEndPoint() throws Exception {
3429
@Before @Override
3530
public void setUp() throws Exception {
3631
super.setUp();
37-
setService( getServiceManifest().actions );
32+
setService();
33+
}
34+
35+
protected void setService() {
36+
com.ost.services.v1.Manifest services = (com.ost.services.v1.Manifest) getServiceManifest();
37+
setService( services.actions );
38+
super.setService( services.actions );
3839
}
3940

4041
@Test

‎src/test/java/com/ost/services/v1/AirDropsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ public com.ost.services.v1.AirDrops getService() {
2121
return (com.ost.services.v1.AirDrops) super.getService();
2222
}
2323

24-
@Override
25-
public com.ost.services.v1.Manifest getServiceManifest() {
26-
return (com.ost.services.v1.Manifest) super.getServiceManifest();
27-
}
2824

2925
@Override
3026
protected void setUpApiEndPoint() throws Exception {
@@ -36,9 +32,13 @@ protected void setUpApiEndPoint() throws Exception {
3632
@Before
3733
public void setUp() throws Exception {
3834
super.setUp();
39-
setService( getServiceManifest().airdrops);
35+
setService();
4036
}
4137

38+
protected void setService() {
39+
com.ost.services.v1.Manifest services = (com.ost.services.v1.Manifest) getServiceManifest();
40+
setService( services.airdrops);
41+
}
4242

4343
@Test
4444
public void execute() throws IOException {

‎src/test/java/com/ost/services/v1/TokenTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ public com.ost.services.v1.Token getService() {
1919
return (com.ost.services.v1.Token) super.getService();
2020
}
2121

22-
@Override
23-
public com.ost.services.v1.Manifest getServiceManifest() {
24-
return (com.ost.services.v1.Manifest) super.getServiceManifest();
25-
}
26-
2722
@Override
2823
protected void setUpApiEndPoint() throws Exception {
2924
String apiEndPoint = ApiEndPointProvider.getV1EndPoint();
@@ -33,9 +28,15 @@ protected void setUpApiEndPoint() throws Exception {
3328
@Before
3429
public void setUp() throws Exception {
3530
super.setUp();
36-
setService( getServiceManifest().token );
31+
setService();
3732
}
3833

34+
protected void setService() {
35+
com.ost.services.v1.Manifest services = (com.ost.services.v1.Manifest) getServiceManifest();
36+
setService( services.token);
37+
}
38+
39+
3940
@Test
4041
public void get() throws IOException {
4142
JsonObject response;

‎src/test/java/com/ost/services/v1/TransactionsTest.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,30 @@ public com.ost.services.v1.Transactions getService() {
2121
return (com.ost.services.v1.Transactions) super.getService();
2222
}
2323

24-
@Override
25-
public com.ost.services.v1.Manifest getServiceManifest() {
26-
return (com.ost.services.v1.Manifest) super.getServiceManifest();
27-
}
28-
2924
@Override
3025
protected void setUpApiEndPoint() throws Exception {
3126
String apiEndPoint = ApiEndPointProvider.getV1EndPoint();
3227
setApiEndPoint( apiEndPoint );
3328
}
3429

3530

36-
HashMap<String,Object> commonParams;
31+
protected HashMap<String,Object> commonParams;
32+
protected com.ost.services.v1.Actions actionsService;
3733
@Before
3834
public void setUp() throws Exception {
3935
super.setUp();
40-
setService( getServiceManifest().transactions );
36+
setService();
37+
postSetup();
38+
}
39+
40+
protected void setService() {
41+
com.ost.services.v1.Manifest services = (com.ost.services.v1.Manifest) getServiceManifest();
42+
setService( services.transactions);
43+
actionsService = services.actions;
44+
}
45+
4146

47+
protected void postSetup() throws Exception {
4248

4349
//First Create an action
4450
HashMap <String,Object> params = new HashMap<String, Object>();
@@ -53,7 +59,7 @@ public void setUp() throws Exception {
5359
JsonObject response;
5460
String resultType = "action";
5561
Boolean isArrayResultType = false;
56-
response = getServiceManifest().actions.create( params );
62+
response = actionsService.create( params );
5763
validateResponseWithSuccess( response, resultType, isArrayResultType );
5864
JsonObject actionResult = response.getAsJsonObject("data").getAsJsonObject( resultType );
5965

@@ -69,9 +75,8 @@ public void setUp() throws Exception {
6975
commonParams.put("from_user_id", fromUserId);
7076
commonParams.put("to_user_id", toUserId);
7177
commonParams.put("action_id", actionResult.get("id").getAsString() );
72-
73-
7478
}
79+
7580
@Test
7681
public void execute() throws IOException {
7782
HashMap <String,Object> params = new HashMap<String, Object>();

‎src/test/java/com/ost/services/v1/TransfersTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ public com.ost.services.v1.Transfers getService() {
2121
return (com.ost.services.v1.Transfers) super.getService();
2222
}
2323

24-
@Override
25-
public com.ost.services.v1.Manifest getServiceManifest() {
26-
return (com.ost.services.v1.Manifest) super.getServiceManifest();
27-
}
28-
2924
HashMap<String,Object> commonParams;
3025

3126
@Override
@@ -37,12 +32,17 @@ protected void setUpApiEndPoint() throws Exception {
3732
@Before
3833
public void setUp() throws Exception {
3934
super.setUp();
40-
setService(getServiceManifest().transfers);
35+
setService();
4136
commonParams = new HashMap<String, Object>();
4237
commonParams.put("to_address", "0x062ded9304cd96af6fa4780d6d6fd873e2b52410");
4338
commonParams.put("amount", 1);
4439
}
4540

41+
protected void setService() {
42+
com.ost.services.v1.Manifest services = (com.ost.services.v1.Manifest) getServiceManifest();
43+
setService(services.transfers);
44+
}
45+
4646
@Test
4747
public void execute() throws IOException {
4848
HashMap <String,Object> params = new HashMap<String, Object>();

‎src/test/java/com/ost/services/v1/UsersTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ public com.ost.services.v1.Users getService() {
2121
return (com.ost.services.v1.Users) super.getService();
2222
}
2323

24-
@Override
25-
public com.ost.services.v1.Manifest getServiceManifest() {
26-
return (com.ost.services.v1.Manifest) super.getServiceManifest();
27-
}
28-
2924
@Override
3025
protected void setUpApiEndPoint() throws Exception {
3126
String apiEndPoint = ApiEndPointProvider.getV1EndPoint();
@@ -36,7 +31,13 @@ protected void setUpApiEndPoint() throws Exception {
3631
@Before
3732
public void setUp() throws Exception {
3833
super.setUp();
39-
setService( getServiceManifest().users );
34+
setService();
35+
}
36+
37+
38+
protected void setService() {
39+
com.ost.services.v1.Manifest services = (com.ost.services.v1.Manifest) getServiceManifest();
40+
setService( services.users );
4041
}
4142

4243

0 commit comments

Comments
 (0)