nifi git commit: NIFI-5696 Update references to default value for nifi.cluster.node.load.load.balance.port
Repository: nifi
Updated Branches:
refs/heads/master 0229a5c10 -> 7cb39d636
NIFI-5696 Update references to default value for
nifi.cluster.node.load.load.balance.port
This closes #3071.
Signed-off-by: Koji Kawamura
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7cb39d63
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7cb39d63
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7cb39d63
Branch: refs/heads/master
Commit: 7cb39d636c33289a1f93417c1750ef6173df348e
Parents: 0229a5c
Author: Jeff Storck
Authored: Fri Oct 12 16:57:15 2018 -0400
Committer: Koji Kawamura
Committed: Mon Oct 15 10:43:31 2018 +0900
--
.../java/org/apache/nifi/cluster/protocol/NodeIdentifier.java| 4 +++-
.../nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/7cb39d63/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
index 56f9a24..74c5538 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
@@ -17,6 +17,7 @@
package org.apache.nifi.cluster.protocol;
import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.util.NiFiProperties;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -107,7 +108,8 @@ public class NodeIdentifier {
public NodeIdentifier(final String id, final String apiAddress, final int
apiPort, final String socketAddress, final int socketPort,
final String siteToSiteAddress, final Integer
siteToSitePort, final Integer siteToSiteHttpApiPort, final boolean
siteToSiteSecure) {
-this(id, apiAddress, apiPort, socketAddress, socketPort,
socketAddress, 6342, siteToSiteAddress, siteToSitePort, siteToSiteHttpApiPort,
siteToSiteSecure, null);
+this(id, apiAddress, apiPort, socketAddress, socketPort,
socketAddress, NiFiProperties.DEFAULT_LOAD_BALANCE_PORT, siteToSiteAddress,
siteToSitePort, siteToSiteHttpApiPort, siteToSiteSecure,
+null);
}
public NodeIdentifier(final String id, final String apiAddress, final int
apiPort, final String socketAddress, final int socketPort, final String
loadBalanceAddress, final int loadBalancePort,
http://git-wip-us.apache.org/repos/asf/nifi/blob/7cb39d63/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
--
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index c186e54..fc18be8 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -185,7 +185,7 @@
-7430
+6342
4
8
30
sec
nifi git commit: NIFI-5698: Fixed DeleteAzureBlobStorage bug
Repository: nifi
Updated Branches:
refs/heads/master e30a21cfc -> 0229a5c10
NIFI-5698: Fixed DeleteAzureBlobStorage bug
This closes #3073.
Signed-off-by: Koji Kawamura
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0229a5c1
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0229a5c1
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0229a5c1
Branch: refs/heads/master
Commit: 0229a5c10953b0b003e3613e4a172a1641c6452d
Parents: e30a21c
Author: zenfenan
Authored: Sun Oct 14 13:18:25 2018 +0530
Committer: Koji Kawamura
Committed: Mon Oct 15 10:27:15 2018 +0900
--
.../azure/storage/DeleteAzureBlobStorage.java | 39 +---
1 file changed, 34 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/nifi/blob/0229a5c1/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java
--
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java
index a3f66d8..603bc69 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java
@@ -21,28 +21,56 @@ import com.microsoft.azure.storage.StorageException;
import com.microsoft.azure.storage.blob.CloudBlob;
import com.microsoft.azure.storage.blob.CloudBlobClient;
import com.microsoft.azure.storage.blob.CloudBlobContainer;
+import com.microsoft.azure.storage.blob.DeleteSnapshotsOption;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processors.azure.AbstractAzureBlobProcessor;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.TimeUnit;
-
@Tags({ "azure", "microsoft", "cloud", "storage", "blob" })
@SeeAlso({ ListAzureBlobStorage.class, FetchAzureBlobStorage.class,
PutAzureBlobStorage.class})
@CapabilityDescription("Deletes the provided blob from Azure Storage")
@InputRequirement(Requirement.INPUT_REQUIRED)
public class DeleteAzureBlobStorage extends AbstractAzureBlobProcessor {
+private static final AllowableValue DELETE_SNAPSHOTS_NONE = new
AllowableValue(DeleteSnapshotsOption.NONE.name(), "None", "Delete the blob
only.");
+
+private static final AllowableValue DELETE_SNAPSHOTS_ALSO = new
AllowableValue(DeleteSnapshotsOption.INCLUDE_SNAPSHOTS.name(), "Include
Snapshots", "Delete the blob and its snapshots.");
+
+private static final AllowableValue DELETE_SNAPSHOTS_ONLY = new
AllowableValue(DeleteSnapshotsOption.DELETE_SNAPSHOTS_ONLY.name(), "Delete
Snapshots Only", "Delete only the blob's snapshots.");
+
+private static final PropertyDescriptor DELETE_SNAPSHOTS_OPTION = new
PropertyDescriptor.Builder()
+.name("delete-snapshots-option")
+.displayName("Delete Snapshots Option")
+.description("Specifies the snapshot deletion options to be used
when deleting a blob.")
+.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.allowableValues(DELETE_SNAPSHOTS_NONE, DELETE_SNAPSHOTS_ALSO,
DELETE_SNAPSHOTS_ONLY)
+.defaultValue(DELETE_SNAPSHOTS_NONE.getValue())
+.required(true)
+.build();
+
+@Override
+public List getSupportedPropertyDescriptors() {
+List properties = new
ArrayList<>(super.getSupportedPropertyDescriptors());
+properties.add(DELETE_SNAPSHOTS_OPTION);
+return properties;
+}
+
@Override
public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
FlowFile flowFile = session.get();
@@ -52,8
