Skip to content

fix index out of bounds in InfluxDbconnectorApp that might causes not… #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pLeminoq merged 3 commits into from
Oct 27, 2022
Merged

fix index out of bounds in InfluxDbconnectorApp that might causes not… #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ee2b6
fix index out of bounds in InfluxDbconnectorApp that might causes not…
DivineThreepwood Oct 27, 2022
e6fc8cf
Merge branch 'feature/tests' into bugfix/#72_fix_index_out_of_bounds_…
DivineThreepwood Oct 27, 2022
8ca3288
Merge remote-tracking branch 'origin/feature/tests' into bugfix/#72_f…
DivineThreepwood Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/jul
Open in desktop
Submodule jul updated 3 files
+200 −166 module/extension/type/processing/src/main/java/org/openbase/jul/extension/type/processing/LabelProcessor.kt
+22 −2 ...le/extension/type/processing/src/test/java/org/openbase/jul/extension/type/processing/LabelProcessorTest.kt
+0 −2 module/transformation/src/main/java/org/openbase/rct/impl/mqtt/TransformCommunicatorImpl.kt
5 changes: 5 additions & 0 deletions ...bconnector/src/main/java/org/openbase/bco/app/influxdbconnector/InfluxDbconnectorApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,13 @@ private void storeServiceState(final Unit<?> unit, final ServiceTemplateType.Ser
point.addTag(entry.getKey(), entry.getValue());
}
}

List<LabelType.Label.MapFieldEntry> entryList = unit.getConfig().getLabel().getEntryList();
for (LabelType.Label.MapFieldEntry entry : entryList) {
// skip entries that offer a language key but do not provide any label.
if(entry.getValueList().isEmpty()) {
continue;
}
point.addTag("label_" + entry.getKey(), entry.getValue(0));
}

Expand Down
15 changes: 5 additions & 10 deletions module/registry/util/src/main/java/org/openbase/bco/registry/print/BCOQueryLabelPrinter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ object BCOQueryLabelPrinter {
fun printUnit(unitConfig: UnitConfig) {

// calculate max unit label length
val maxUnitLabelLength = LabelProcessor.getBestMatch(unitConfig.label).length
val maxUnitLabelLength = LabelProcessor.getBestMatch(unitConfig.label)?.length?:0
val maxLocationUnitLabelLength = getLocationLabel(unitConfig).length

// print
Expand Down Expand Up @@ -157,13 +157,8 @@ object BCOQueryLabelPrinter {
)
}

private fun getLocationLabel(unitConfig: UnitConfig): String {
return try {
LabelProcessor.getBestMatch(
Registries.getUnitRegistry().getUnitConfigById(unitConfig.placementConfig.locationId).label
)
} catch (ex: CouldNotPerformException) {
"?"
}
}
private fun getLocationLabel(unitConfig: UnitConfig): String =
Registries.getUnitRegistry().getUnitConfigById(unitConfig.placementConfig.locationId).label
?.let { LabelProcessor.getBestMatch(it) }
?: "?"
}