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

Implement target tag management using common RepositoryManagement (and abstract JPA impl) (#2580)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-08-01 13:41:20 +03:00
committed by GitHub
parent 5d75c9b0cc
commit fd9c0fc50d
28 changed files with 235 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,11 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.hawkbit.repository.DistributionSetManagement;
import org.eclipse.hawkbit.repository.DistributionSetTagManagement;
import org.eclipse.hawkbit.repository.DistributionSetTypeManagement;
import org.eclipse.hawkbit.repository.SoftwareModuleManagement;
import org.eclipse.hawkbit.repository.SoftwareModuleTypeManagement;
import org.eclipse.hawkbit.repository.TargetTagManagement;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder;
import org.eclipse.hawkbit.repository.model.RolloutGroupConditions;
@@ -72,6 +74,59 @@ public class JsonBuilder {
return builder.toString();
}
public static String targetTag(final TargetTagManagement.Update dsTagUpdate) throws JSONException {
final StringBuilder builder = new StringBuilder();
builder.append(new JSONObject()
.put("name", dsTagUpdate.getName()).put("description", dsTagUpdate.getDescription())
.put("colour", dsTagUpdate.getColour()).toString());
return builder.toString();
}
public static String targetTags(final List<TargetTagManagement.Create> dsTagsCreate) throws JSONException {
final StringBuilder builder = new StringBuilder();
builder.append("[");
int i = 0;
for (final TargetTagManagement.Create tag : dsTagsCreate) {
builder.append(new JSONObject()
.put("name", tag.getName()).put("description", tag.getDescription())
.put("colour", tag.getColour()).toString());
if (++i < dsTagsCreate.size()) {
builder.append(",");
}
}
builder.append("]");
return builder.toString();
}
public static String dsTag(final DistributionSetTagManagement.Update dsTagUpdate) throws JSONException {
final StringBuilder builder = new StringBuilder();
builder.append(new JSONObject()
.put("name", dsTagUpdate.getName()).put("description", dsTagUpdate.getDescription())
.put("colour", dsTagUpdate.getColour()).toString());
return builder.toString();
}
public static String dsTags(final List<DistributionSetTagManagement.Create> dsTagsCreate) throws JSONException {
final StringBuilder builder = new StringBuilder();
builder.append("[");
int i = 0;
for (final DistributionSetTagManagement.Create tag : dsTagsCreate) {
builder.append(new JSONObject()
.put("name", tag.getName()).put("description", tag.getDescription())
.put("colour", tag.getColour()).toString());
if (++i < dsTagsCreate.size()) {
builder.append(",");
}
}
builder.append("]");
return builder.toString();
}
public static String tag(final Tag tag) throws JSONException {
final StringBuilder builder = new StringBuilder();