Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3509 Fixed ID duplication 

Fixed the possibility of duplicated MSB part of the component during template creation. This closes #1651
This commit is contained in:
Oleg Zhurakousky 2017-04-06 09:27:25 -04:00 committed by Matt Gilman
parent 614fa6a6c4
commit c7ecaba234
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
View File

@ -16,6 +16,10 @@
*/
package org.apache.nifi.web.api.dto;
import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import java.nio.charset.StandardCharsets;
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.Map;
@ -24,10 +28,6 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
import javax.xml.bind.annotation.XmlType;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
* The contents of a flow snippet.
*/
@ -199,15 +199,19 @@ public class FlowSnippetDTO {
return components;
}
private long generateMsb(String id) {
UUID temp = UUID.nameUUIDFromBytes(id.getBytes(StandardCharsets.UTF_8));
long msb = temp.getMostSignificantBits();
return msb;
}
private void removeInstanceIdentifierIfNecessary(Set<? extends ComponentDTO> componentDtos) {
if (this.newTemplate) {
for (ComponentDTO componentDto : componentDtos) {
UUID id = UUID.fromString(componentDto.getId());
id = new UUID(id.getMostSignificantBits(), 0);
UUID id = new UUID(this.generateMsb(componentDto.getId()), 0);
componentDto.setId(id.toString());
id = UUID.fromString(componentDto.getParentGroupId());
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(componentDto.getParentGroupId()), 0);
componentDto.setParentGroupId(id.toString());
if (componentDto instanceof ControllerServiceDTO) {
ControllerServiceDTO csDTO = (ControllerServiceDTO) componentDto;
@ -217,8 +221,7 @@ public class FlowSnippetDTO {
if (entry.getValue().getIdentifiesControllerService() != null && props.get(entry.getKey()) != null) {
String key = entry.getKey();
String value = props.get(key);
id = UUID.fromString(value);
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(value), 0);
props.put(key, id.toString());
}
}
@ -230,8 +233,7 @@ public class FlowSnippetDTO {
if (entry.getValue().getIdentifiesControllerService() != null && props.get(entry.getKey()) != null) {
String key = entry.getKey();
String value = props.get(key);
id = UUID.fromString(value);
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(value), 0);
props.put(key, id.toString());
}
}
@ -240,24 +242,20 @@ public class FlowSnippetDTO {
ConnectableDTO cdto = connectionDTO.getSource();
if (!cdto.getType().equals("REMOTE_INPUT_PORT") && !cdto.getType().equals("REMOTE_OUTPUT_PORT")) {
id = UUID.fromString(cdto.getId());
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(cdto.getId()), 0);
cdto.setId(id.toString());
}
id = UUID.fromString(cdto.getGroupId());
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(cdto.getGroupId()), 0);
cdto.setGroupId(id.toString());
cdto = connectionDTO.getDestination();
if (!cdto.getType().equals("REMOTE_INPUT_PORT") && !cdto.getType().equals("REMOTE_OUTPUT_PORT")) {
id = UUID.fromString(cdto.getId());
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(cdto.getId()), 0);
cdto.setId(id.toString());
}
id = UUID.fromString(cdto.getGroupId());
id = new UUID(id.getMostSignificantBits(), 0);
id = new UUID(this.generateMsb(cdto.getGroupId()), 0);
cdto.setGroupId(id.toString());
} else if (componentDto instanceof ProcessGroupDTO) {
FlowSnippetDTO fsDTO = ((ProcessGroupDTO) componentDto).getContents();