mirror of
https://github.com/apache/nifi.git
synced 2025-02-06 18:18:27 +00:00
NIFI-11690 - include extension info for SupportsSensitiveDynamicPrope… (#7379)
* NIFI-11690 - include extension info for SupportsSensitiveDynamicProperties in C2 manifest * NIFI-11690 - include extension info for SupportsSensitiveDynamicProperties in C2 manifest * NIFI-11690 - include extension info for SupportsSensitiveDynamicProperties in C2 manifest
This commit is contained in:
parent
c21c0e27eb
commit
b6d4099a14
@ -34,6 +34,10 @@ public interface ConfigurableComponentDefinition {
|
|||||||
|
|
||||||
void setSupportsDynamicProperties(boolean supportsDynamicProperties);
|
void setSupportsDynamicProperties(boolean supportsDynamicProperties);
|
||||||
|
|
||||||
|
boolean getSupportsSensitiveDynamicProperties();
|
||||||
|
|
||||||
|
void setSupportsSensitiveDynamicProperties(boolean supportsSensitiveDynamicProperties);
|
||||||
|
|
||||||
List<DynamicProperty> getDynamicProperties();
|
List<DynamicProperty> getDynamicProperties();
|
||||||
|
|
||||||
void setDynamicProperties(List<DynamicProperty> dynamicProperties);
|
void setDynamicProperties(List<DynamicProperty> dynamicProperties);
|
||||||
|
@ -28,6 +28,8 @@ public abstract class ConfigurableExtensionDefinition extends ExtensionComponent
|
|||||||
private Map<String, PropertyDescriptor> propertyDescriptors;
|
private Map<String, PropertyDescriptor> propertyDescriptors;
|
||||||
|
|
||||||
private boolean supportsDynamicProperties;
|
private boolean supportsDynamicProperties;
|
||||||
|
private boolean supportsSensitiveDynamicProperties;
|
||||||
|
|
||||||
private List<DynamicProperty> dynamicProperties;
|
private List<DynamicProperty> dynamicProperties;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -52,6 +54,17 @@ public abstract class ConfigurableExtensionDefinition extends ExtensionComponent
|
|||||||
this.supportsDynamicProperties = supportsDynamicProperties;
|
this.supportsDynamicProperties = supportsDynamicProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@ApiModelProperty("Whether or not this component makes use of sensitive dynamic (user-set) properties.")
|
||||||
|
public boolean getSupportsSensitiveDynamicProperties() {
|
||||||
|
return supportsSensitiveDynamicProperties;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setSupportsSensitiveDynamicProperties(boolean supportsSensitiveDynamicProperties) {
|
||||||
|
this.supportsSensitiveDynamicProperties = supportsSensitiveDynamicProperties;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ApiModelProperty("Describes the dynamic properties supported by this component")
|
@ApiModelProperty("Describes the dynamic properties supported by this component")
|
||||||
public List<DynamicProperty> getDynamicProperties() {
|
public List<DynamicProperty> getDynamicProperties() {
|
||||||
|
@ -51,6 +51,8 @@ public class Extension {
|
|||||||
@XmlElement(name = "property")
|
@XmlElement(name = "property")
|
||||||
private List<Property> properties;
|
private List<Property> properties;
|
||||||
|
|
||||||
|
private boolean supportsSensitiveDynamicProperties;
|
||||||
|
|
||||||
@XmlElementWrapper
|
@XmlElementWrapper
|
||||||
@XmlElement(name = "dynamicProperty")
|
@XmlElement(name = "dynamicProperty")
|
||||||
private List<DynamicProperty> dynamicProperties;
|
private List<DynamicProperty> dynamicProperties;
|
||||||
@ -154,6 +156,14 @@ public class Extension {
|
|||||||
this.properties = properties;
|
this.properties = properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getSupportsSensitiveDynamicProperties() {
|
||||||
|
return supportsSensitiveDynamicProperties;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSupportsSensitiveDynamicProperties(boolean supportsSensitiveDynamicProperties) {
|
||||||
|
this.supportsSensitiveDynamicProperties = supportsSensitiveDynamicProperties;
|
||||||
|
}
|
||||||
|
|
||||||
@ApiModelProperty(value = "The dynamic properties of the extension")
|
@ApiModelProperty(value = "The dynamic properties of the extension")
|
||||||
public List<DynamicProperty> getDynamicProperties() {
|
public List<DynamicProperty> getDynamicProperties() {
|
||||||
return dynamicProperties;
|
return dynamicProperties;
|
||||||
|
@ -504,6 +504,7 @@ public class StandardRuntimeManifestBuilder implements RuntimeManifestBuilder {
|
|||||||
final List<DynamicProperty> dynamicProperties = extension.getDynamicProperties();
|
final List<DynamicProperty> dynamicProperties = extension.getDynamicProperties();
|
||||||
if (isNotEmpty(dynamicProperties)) {
|
if (isNotEmpty(dynamicProperties)) {
|
||||||
configurableComponentDefinition.setSupportsDynamicProperties(true);
|
configurableComponentDefinition.setSupportsDynamicProperties(true);
|
||||||
|
configurableComponentDefinition.setSupportsSensitiveDynamicProperties(extension.getSupportsSensitiveDynamicProperties());
|
||||||
configurableComponentDefinition.setDynamicProperties(
|
configurableComponentDefinition.setDynamicProperties(
|
||||||
dynamicProperties.stream()
|
dynamicProperties.stream()
|
||||||
.map(this::getDynamicProperty)
|
.map(this::getDynamicProperty)
|
||||||
|
@ -105,6 +105,7 @@ class TestRuntimeManifest {
|
|||||||
assertFalse(listHdfsDefinition.getSideEffectFree());
|
assertFalse(listHdfsDefinition.getSideEffectFree());
|
||||||
assertFalse(listHdfsDefinition.getTriggerWhenAnyDestinationAvailable());
|
assertFalse(listHdfsDefinition.getTriggerWhenAnyDestinationAvailable());
|
||||||
assertFalse(listHdfsDefinition.getSupportsDynamicProperties());
|
assertFalse(listHdfsDefinition.getSupportsDynamicProperties());
|
||||||
|
assertFalse(listHdfsDefinition.getSupportsSensitiveDynamicProperties());
|
||||||
assertNull(listHdfsDefinition.getDynamicProperties());
|
assertNull(listHdfsDefinition.getDynamicProperties());
|
||||||
assertFalse(listHdfsDefinition.getSupportsDynamicRelationships());
|
assertFalse(listHdfsDefinition.getSupportsDynamicRelationships());
|
||||||
assertNull(listHdfsDefinition.getDynamicRelationship());
|
assertNull(listHdfsDefinition.getDynamicRelationship());
|
||||||
@ -251,6 +252,7 @@ class TestRuntimeManifest {
|
|||||||
assertFalse(executeSqlDef.getReadsAttributes().isEmpty());
|
assertFalse(executeSqlDef.getReadsAttributes().isEmpty());
|
||||||
assertNotNull(executeSqlDef.getReadsAttributes().get(0).getName());
|
assertNotNull(executeSqlDef.getReadsAttributes().get(0).getName());
|
||||||
assertNotNull(executeSqlDef.getReadsAttributes().get(0).getDescription());
|
assertNotNull(executeSqlDef.getReadsAttributes().get(0).getDescription());
|
||||||
|
assertTrue(executeSqlDef.getSupportsSensitiveDynamicProperties());
|
||||||
|
|
||||||
// Verify RouteOnAttribute dynamic relationships and dynamic properties
|
// Verify RouteOnAttribute dynamic relationships and dynamic properties
|
||||||
final ProcessorDefinition routeOnAttributeDef = getProcessorDefinition(bundles, "nifi-standard-nar",
|
final ProcessorDefinition routeOnAttributeDef = getProcessorDefinition(bundles, "nifi-standard-nar",
|
||||||
@ -262,6 +264,7 @@ class TestRuntimeManifest {
|
|||||||
assertNotNull(routeOnAttributeDef.getDynamicRelationship().getDescription());
|
assertNotNull(routeOnAttributeDef.getDynamicRelationship().getDescription());
|
||||||
|
|
||||||
assertTrue(routeOnAttributeDef.getSupportsDynamicProperties());
|
assertTrue(routeOnAttributeDef.getSupportsDynamicProperties());
|
||||||
|
assertFalse(routeOnAttributeDef.getSupportsSensitiveDynamicProperties());
|
||||||
assertNotNull(routeOnAttributeDef.getDynamicProperties());
|
assertNotNull(routeOnAttributeDef.getDynamicProperties());
|
||||||
assertFalse(routeOnAttributeDef.getDynamicProperties().isEmpty());
|
assertFalse(routeOnAttributeDef.getDynamicProperties().isEmpty());
|
||||||
assertNotNull(routeOnAttributeDef.getDynamicProperties().get(0).getName());
|
assertNotNull(routeOnAttributeDef.getDynamicProperties().get(0).getName());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user