Skip to content

Commit 5b32a0f

Browse files
committed
fix: NPE
1 parent 51a600a commit 5b32a0f

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/scene/term/TermColumn.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ public TermColumn copyColumn(Predicate<String> childrenPredicate) {
108108

109109
if (CollectionUtils.isNotEmpty(children)) {
110110
copy.setChildren(
111-
children.stream()
112-
.filter(child -> childrenPredicate.test(child.getColumn()))
113-
.map(child -> child.copyColumn(childrenPredicate))
114-
.collect(Collectors.toList())
111+
children.stream()
112+
.filter(child -> childrenPredicate.test(child.getColumn()))
113+
.map(child -> child.copyColumn(childrenPredicate))
114+
.collect(Collectors.toList())
115115
);
116116
}
117117

@@ -146,7 +146,7 @@ public String getVariable(CharSequence delimiter) {
146146
if (column == null) {
147147
return null;
148148
}
149-
String[] arr = column.split("[.]",2);
149+
String[] arr = column.split("[.]", 2);
150150
if (arr.length == 1) {
151151
return arr[0];
152152
}
@@ -189,8 +189,8 @@ public TermColumn with(PropertyMetadata metadata) {
189189
setFullNameCode(I18nSpec.of(null, localeName));
190190
setFullName(fullNameCode.resolveI18nMessage());
191191
}
192-
others.put(PropertyMetadataConstants.Group.id.getKey(), PropertyMetadataConstants.Group.getId(metadata));
193-
others.put(PropertyMetadataConstants.Group.name.getKey(), PropertyMetadataConstants.Group.getName(metadata));
192+
withOther(PropertyMetadataConstants.Group.id.getKey(), PropertyMetadataConstants.Group.getId(metadata));
193+
withOther(PropertyMetadataConstants.Group.name.getKey(), PropertyMetadataConstants.Group.getName(metadata));
194194
return this;
195195
}
196196

@@ -259,8 +259,8 @@ public static TermColumn of(PropertyMetadata metadata) {
259259

260260
public static List<TermColumn> refactorTermsInfo(String perText, List<TermColumn> terms) {
261261
Map<String, TermColumn> allColumn = terms
262-
.stream()
263-
.collect(Collectors.toMap(TermColumn::getColumn, Function.identity(), (a, b) -> a));
262+
.stream()
263+
.collect(Collectors.toMap(TermColumn::getColumn, Function.identity(), (a, b) -> a));
264264
for (TermColumn term : terms) {
265265

266266
term.refactorDescription(perText, allColumn::get);
@@ -292,16 +292,16 @@ public void doRefactorDescription(String perText, Function<String, TermColumn> c
292292
//类型,report,recent,latest
293293
String type = arr[arr.length - 1];
294294
setDescription(
295-
DeviceOperation.PropertyValueType
296-
.valueOf(type)
297-
.getNestDescription(column.name)
295+
DeviceOperation.PropertyValueType
296+
.valueOf(type)
297+
.getNestDescription(column.name)
298298
);
299299
} else {
300300
String type = arr[arr.length - 1];
301301
setDescription(
302-
DeviceOperation.PropertyValueType
303-
.valueOf(type)
304-
.getDescription()
302+
DeviceOperation.PropertyValueType
303+
.valueOf(type)
304+
.getDescription()
305305
);
306306
}
307307
}
@@ -312,8 +312,8 @@ public void refactorFullName(String parentName) {
312312
//code不为空,表示当前termColumn需要国际化
313313
if (StringUtils.hasText(code)) {
314314
this.fullNameCode = I18nSpec
315-
.of("message.scene_term_column_full_name", null, parentName)
316-
.withArgs(code, name);
315+
.of("message.scene_term_column_full_name", null, parentName)
316+
.withArgs(code, name);
317317
} else {
318318
this.fullNameCode = I18nSpec
319319
.of("message.scene_term_column_full_name", null, parentName, name);

0 commit comments

Comments
 (0)