Merge branch 'master' into feature_configurable_mgmt_sim_scenario

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java


Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-06-21 12:18:32 +02:00
38 changed files with 743 additions and 331 deletions

View File

@@ -75,19 +75,10 @@ public class TargetBuilder {
*
* @return a single entry list of {@link MgmtTargetRequestBody}
*/
public List<MgmtTargetRequestBody> buildAsList() {
public List<MgmtTargetRequestBody> build() {
return Lists.newArrayList(doBuild(""));
}
/**
* Builds a single {@link MgmtTargetRequestBody}.
*
* @return build {@link MgmtTargetRequestBody}
*/
public MgmtTargetRequestBody build() {
return doBuild("");
}
/**
* Builds a list of multiple {@link MgmtTargetRequestBody} to create
* multiple targets at once. An increasing number will be added to the