Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-08 02:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-6626: Fixed the order of arguments passed to the ComponentDetails constructor when creating the Component Details for a connection. Also noticed that null fields are being added to the map when calling ComponentDetails.toMap() and this causes the UI to display these fields even though they have no value, so avoided populating the map with fields whose values are null

Browse Source 
This closes #3696
This commit is contained in:
Mark Payne 2019-09-05 15:05:42 -04:00 committed by Matt Gilman
parent a672294f3f
commit 731df87f22
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/ComponentDetails.java
View File

@ -58,7 +58,7 @@ public class ComponentDetails {
} }
public static ComponentDetails forConnection(final String id, final String groupId, final String connectionName, final String sourceName, final String destinationName) { public static ComponentDetails forConnection(final String id, final String groupId, final String connectionName, final String sourceName, final String destinationName) {
return new ComponentDetails(id, groupId, connectionName, sourceName, destinationName, null, null); return new ComponentDetails(id, groupId, connectionName, null, sourceName, destinationName, null);
} }
public static ComponentDetails forProcessGroup(final ProcessGroupStatus status) { public static ComponentDetails forProcessGroup(final ProcessGroupStatus status) {
@ -111,13 +111,19 @@ public class ComponentDetails {
*/ */
public Map<String, String> toMap() { public Map<String, String> toMap() {
final Map<String, String> map = new HashMap<>(); final Map<String, String> map = new HashMap<>();
map.put(ComponentStatusRepository.COMPONENT_DETAIL_ID, componentId); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_ID, componentId);
map.put(ComponentStatusRepository.COMPONENT_DETAIL_GROUP_ID, groupId); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_GROUP_ID, groupId);
map.put(ComponentStatusRepository.COMPONENT_DETAIL_NAME, componentName); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_NAME, componentName);
map.put(ComponentStatusRepository.COMPONENT_DETAIL_TYPE, componentType); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_TYPE, componentType);
map.put(ComponentStatusRepository.COMPONENT_DETAIL_SOURCE_NAME, sourceName); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_SOURCE_NAME, sourceName);
map.put(ComponentStatusRepository.COMPONENT_DETAIL_DESTINATION_NAME, destinationName); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_DESTINATION_NAME, destinationName);
map.put(ComponentStatusRepository.COMPONENT_DETAIL_URI, targetUri); addToMap(map, ComponentStatusRepository.COMPONENT_DETAIL_URI, targetUri);
return map; return map;
} }
private void addToMap(final Map<String, String> map, final String key, final String value) {
if (value != null) {
map.put(key, value);
}
}
} }