lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #235 from bsinno/feature_mgmt_api_target_token_address

Browse Source 
Target securityToken and address fully manageable through MGMT API.
This commit is contained in:
Kai Zimmermann
2016-07-05 09:13:28 +02:00
committed by GitHub
parent 599c51ac0f a4252283db
commit eff798393d
10 changed files with 124 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/JsonBuilder.java
View File

@@ -367,11 +367,7 @@ public abstract class JsonBuilder {
}
/**
* @param targets
* @return
*/
public static String targets(final List<Target> targets) {
public static String targets(final List<Target> targets, final boolean withToken) {
final StringBuilder builder = new StringBuilder();
builder.append("[");
@@ -381,10 +377,12 @@ public abstract class JsonBuilder {
final String address = target.getTargetInfo().getAddress() != null
? target.getTargetInfo().getAddress().toString() : null;
final String token = withToken ? target.getSecurityToken() : null;
builder.append(new JSONObject().put("controllerId", target.getControllerId())
.put("description", target.getDescription()).put("name", target.getName()).put("createdAt", "0")
.put("updatedAt", "0").put("createdBy", "fghdfkjghdfkjh").put("updatedBy", "fghdfkjghdfkjh")
.put("address", address).toString());
.put("address", address).put("securityToken", token).toString());
} catch (final Exception e) {
e.printStackTrace();
}