You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/07/14 13:32:58 UTC
[6/6] nifi git commit: NIFI-1157 searched for and resolved all
remaining references to deprecated items that were clearly addressable.
NIFI-1157 searched for and resolved all remaining references to deprecated items that were clearly addressable.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f987b216
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f987b216
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f987b216
Branch: refs/heads/master
Commit: f987b216090f29719976ed1693be2ea358523aa5
Parents: 961be21
Author: joewitt <jo...@apache.org>
Authored: Thu Jul 14 00:51:04 2016 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jul 14 09:32:35 2016 -0400
----------------------------------------------------------------------
.../provenance/PlaceholderProvenanceEvent.java | 1 -
.../StandardProvenanceEventRecord.java | 1 -
.../nifi/processor/util/StandardValidators.java | 52 ---
.../org/apache/nifi/util/BooleanHolder.java | 37 --
.../org/apache/nifi/util/IntegerHolder.java | 63 ----
.../java/org/apache/nifi/util/LongHolder.java | 65 ----
.../java/org/apache/nifi/util/ObjectHolder.java | 44 ---
.../java/org/apache/nifi/util/MockFlowFile.java | 1 -
.../nifi/util/StandardProcessorTestRunner.java | 17 -
.../java/org/apache/nifi/util/TestRunner.java | 7 -
.../util/TestStandardProcessorTestRunner.java | 20 --
.../apache/nifi/processors/avro/SplitAvro.java | 6 +-
.../processors/cassandra/QueryCassandra.java | 6 +-
.../nifi/controller/FileSystemSwapManager.java | 2 -
.../apache/nifi/controller/FlowController.java | 2 -
.../nifi/controller/StandardFlowFileQueue.java | 1 -
.../nifi/controller/StandardProcessorNode.java | 1 -
.../repository/FileSystemRepository.java | 3 +-
.../repository/StandardProcessSession.java | 50 ++-
.../repository/io/ByteCountingInputStream.java | 11 +-
.../repository/io/ByteCountingOutputStream.java | 11 +-
.../controller/repository/io/LongHolder.java | 46 ---
.../scheduling/EventDrivenSchedulingAgent.java | 1 -
.../scheduling/StandardProcessScheduler.java | 2 -
.../StandardControllerServiceProvider.java | 4 +-
.../tasks/ContinuallyRunConnectableTask.java | 1 -
.../controller/tasks/ReportingTaskWrapper.java | 1 -
.../nifi/groups/StandardProcessGroup.java | 2 -
.../controller/TestFileSystemSwapManager.java | 1 -
.../controller/TestStandardFlowFileQueue.java | 2 -
.../TestWriteAheadFlowFileRepository.java | 2 -
.../java/org/apache/nifi/util/FileUtils.java | 71 ----
.../org/apache/nifi/web/api/dto/DtoFactory.java | 22 +-
.../nifi/web/OptimisticLockingManager.java | 57 ---
.../apache/nifi/processors/hadoop/ListHDFS.java | 87 +----
.../java/org/apache/nifi/hbase/GetHBase.java | 6 +-
.../org/apache/nifi/hbase/PutHBaseJSON.java | 8 +-
.../nifi/processors/hive/SelectHiveQL.java | 6 +-
.../nifi/processors/kite/ConvertAvroSchema.java | 4 +-
.../nifi/processors/kite/ConvertCSVToAvro.java | 4 +-
.../nifi/processors/kite/ConvertJSONToAvro.java | 4 +-
.../processors/image/ExtractImageMetadata.java | 4 +-
.../PersistentProvenanceRepository.java | 1 -
.../VolatileProvenanceRepository.java | 3 +-
.../SiteToSiteProvenanceReportingTask.java | 2 -
.../processors/solr/PutSolrContentStream.java | 6 +-
.../nifi/processors/splunk/PutSplunk.java | 4 +-
.../standard/AbstractJsonPathProcessor.java | 4 +-
.../nifi/processors/standard/BinFiles.java | 354 -------------------
.../processors/standard/CompressContent.java | 4 +-
.../processors/standard/ConvertJSONToSQL.java | 4 +-
.../processors/standard/EvaluateJsonPath.java | 4 +-
.../nifi/processors/standard/EvaluateXPath.java | 7 +-
.../processors/standard/EvaluateXQuery.java | 6 +-
.../nifi/processors/standard/ExecuteSQL.java | 6 +-
.../nifi/processors/standard/HashContent.java | 4 +-
.../processors/standard/IdentifyMimeType.java | 4 +-
.../nifi/processors/standard/JmsConsumer.java | 4 +-
.../nifi/processors/standard/MergeContent.java | 8 +-
.../nifi/processors/standard/PostHTTP.java | 3 +-
.../processors/standard/PutFileTransfer.java | 4 +-
.../nifi/processors/standard/PutSyslog.java | 4 +-
.../processors/standard/QueryDatabaseTable.java | 6 +-
.../processors/standard/RouteOnContent.java | 4 +-
.../nifi/processors/standard/ScanContent.java | 3 +-
.../nifi/processors/standard/SplitText.java | 12 +-
.../nifi/processors/standard/SplitXml.java | 4 +-
.../nifi/processors/standard/TailFile.java | 4 +-
.../nifi/processors/standard/UnpackContent.java | 4 +-
.../nifi/processors/standard/ValidateXml.java | 4 +-
.../standard/servlets/ListenHTTPServlet.java | 3 -
.../nifi/processors/standard/util/Bin.java | 170 ---------
.../processors/standard/util/BinManager.java | 238 -------------
.../standard/util/FlowFileSessionWrapper.java | 49 ---
.../util/crypto/BcryptCipherProvider.java | 21 --
.../util/crypto/NiFiLegacyCipherProvider.java | 17 +-
.../util/crypto/OpenSSLPKCS5CipherProvider.java | 16 -
.../standard/util/crypto/PBECipherProvider.java | 11 -
.../util/crypto/PBKDF2CipherProvider.java | 17 -
.../util/crypto/ScryptCipherProvider.java | 20 --
.../BcryptCipherProviderGroovyTest.groovy | 12 +-
.../ScryptCipherProviderGroovyTest.groovy | 13 +-
.../processors/standard/TestListenSyslog.java | 4 +-
.../nifi/dbcp/DatabaseSystemDescriptor.java | 51 ---
.../org/apache/nifi/dbcp/DatabaseSystems.java | 83 -----
.../apache/nifi/dbcp/TestDatabaseSystems.java | 31 --
.../java/org/apache/nifi/ssl/TestProcessor.java | 4 +-
87 files changed, 129 insertions(+), 1844 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/PlaceholderProvenanceEvent.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/PlaceholderProvenanceEvent.java b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/PlaceholderProvenanceEvent.java
index 083b13e..26696c8 100644
--- a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/PlaceholderProvenanceEvent.java
+++ b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/PlaceholderProvenanceEvent.java
@@ -20,7 +20,6 @@ package org.apache.nifi.provenance;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* A Provenance Event that is used to replace another Provenance Event when authorizations
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
index 7b0c91f..34de366 100644
--- a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
+++ b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
@@ -104,7 +104,6 @@ public final class StandardProvenanceEventRecord implements ProvenanceEventRecor
updatedAttributes = builder.updatedAttributes == null ? Collections.<String, String>emptyMap() : Collections.unmodifiableMap(builder.updatedAttributes);
sourceQueueIdentifier = builder.sourceQueueIdentifier;
-
}
public String getStorageFilename() {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
index 2419c89..47d5d50 100644
--- a/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
+++ b/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
@@ -21,14 +21,12 @@ import java.net.URI;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
-import java.util.Collection;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
-import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.DataUnit;
@@ -710,54 +708,4 @@ public class StandardValidators {
}
}
- /**
- * Creates a validator based on existence of a {@link ControllerService}.
- *
- * @param serviceClass the controller service API your
- * {@link ConfigurableComponent} depends on
- * @return a Validator
- * @deprecated As of release 0.1.0-incubating, replaced by
- * {@link org.apache.nifi.components.PropertyDescriptor.Builder#identifiesControllerService(Class)}
- */
- @Deprecated
- public static Validator createControllerServiceExistsValidator(final Class<? extends ControllerService> serviceClass) {
- return new Validator() {
- @Override
- public ValidationResult validate(final String subject, final String input, final ValidationContext context) {
- if (context.isExpressionLanguageSupported(subject) && context.isExpressionLanguagePresent(input)) {
- return new ValidationResult.Builder().subject(subject).input(input).explanation("Expression Language Present").valid(true).build();
- }
-
- final ControllerService svc = context.getControllerServiceLookup().getControllerService(input);
-
- if (svc == null) {
- return new ValidationResult.Builder().valid(false).input(input).subject(subject).explanation("No Controller Service exists with this ID").build();
- }
-
- if (!serviceClass.isAssignableFrom(svc.getClass())) {
- return new ValidationResult.Builder()
- .valid(false)
- .input(input)
- .subject(subject)
- .explanation("Controller Service with this ID is of type " + svc.getClass().getName() + " but is expected to be of type " + serviceClass.getName())
- .build();
- }
-
- final ValidationContext serviceValidationContext = context.getControllerServiceValidationContext(svc);
- final Collection<ValidationResult> serviceValidationResults = svc.validate(serviceValidationContext);
- for (final ValidationResult result : serviceValidationResults) {
- if (!result.isValid()) {
- return new ValidationResult.Builder()
- .valid(false)
- .input(input)
- .subject(subject)
- .explanation("Controller Service " + input + " is not valid: " + result.getExplanation())
- .build();
- }
- }
-
- return new ValidationResult.Builder().input(input).subject(subject).valid(true).build();
- }
- };
- }
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java
deleted file mode 100644
index 8283389..0000000
--- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/BooleanHolder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * @deprecated As of release 1.0.1. Please use {@link AtomicBoolean}
- *
- * Wraps an Boolean value so that it can be declared <code>final</code> and still be accessed from inner classes;
- * the functionality is similar to that of an AtomicBoolean, but operations on this class
- * are not atomic. This results in greater performance when the atomicity is not needed.
- *
- */
-
-@Deprecated
-public class BooleanHolder extends ObjectHolder<Boolean> {
-
- public BooleanHolder(final boolean initialValue) {
- super(initialValue);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java
deleted file mode 100644
index 8abfdb1..0000000
--- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/IntegerHolder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @deprecated As of release 1.0.1. Please use {@link AtomicInteger}
- *
- * Wraps an Integer value so that it can be declared <code>final</code> and still be accessed from inner classes;
- * the functionality is similar to that of an AtomicInteger, but operations on this class
- * are not atomic. This results in greater performance when the atomicity is not needed.
- *
- */
-
-@Deprecated
-public class IntegerHolder extends ObjectHolder<Integer> {
-
- public IntegerHolder(final int initialValue) {
- super(initialValue);
- }
-
- public int addAndGet(final int delta) {
- final int curValue = get();
- final int newValue = curValue + delta;
- set(newValue);
- return newValue;
- }
-
- public int getAndAdd(final int delta) {
- final int curValue = get();
- final int newValue = curValue + delta;
- set(newValue);
- return curValue;
- }
-
- public int incrementAndGet() {
- return addAndGet(1);
- }
-
- public int getAndIncrement() {
- return getAndAdd(1);
- }
-
- public int decrementAndGet() {
- return addAndGet(-1);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java
deleted file mode 100644
index 723463a..0000000
--- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/LongHolder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * @deprecated As of release 1.0.1. Please use {@link AtomicLong}
- *
- * Wraps a Long value so that it can be declared <code>final</code> and still be accessed from inner classes;
- * the functionality is similar to that of an AtomicLong, but operations on this class
- * are not atomic. This results in greater performance when the atomicity is not needed.
- */
-
-@Deprecated
-public class LongHolder extends ObjectHolder<Long> {
-
- public LongHolder(final long initialValue) {
- super(initialValue);
- }
-
- public long addAndGet(final long delta) {
- final long curValue = get();
- final long newValue = curValue + delta;
- set(newValue);
- return newValue;
- }
-
- public long getAndAdd(final long delta) {
- final long curValue = get();
- final long newValue = curValue + delta;
- set(newValue);
- return curValue;
- }
-
- public long incrementAndGet() {
- return addAndGet(1);
- }
-
- public long getAndIncrement() {
- return getAndAdd(1);
- }
-
- public long decrementAndGet() {
- return addAndGet(-1L);
- }
-
- public long getAndDecrement() {
- return getAndAdd(-1L);
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java
deleted file mode 100644
index c577d6f..0000000
--- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/ObjectHolder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.util;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * @deprecated As of release 0.7.0. Please use {@link AtomicReference}
- *
- * A bean that holds a single value of type T.
- *
- */
-
-@Deprecated
-public class ObjectHolder<T> {
-
- private T value;
-
- public ObjectHolder(final T initialValue) {
- this.value = initialValue;
- }
-
- public T get() {
- return value;
- }
-
- public void set(T value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
index 02806b0..516c8a4 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
@@ -28,7 +28,6 @@ import java.nio.file.StandardOpenOption;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index 7d49f0f..b80c09f 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -65,7 +65,6 @@ import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.provenance.ProvenanceEventRecord;
-import org.apache.nifi.provenance.ProvenanceReporter;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.state.MockStateManager;
import org.junit.Assert;
@@ -459,15 +458,6 @@ public class StandardProcessorTestRunner implements TestRunner {
return flowFiles;
}
- /**
- * @deprecated The ProvenanceReporter should not be accessed through the test runner, as it does not expose the events that were emitted.
- */
- @Override
- @Deprecated
- public ProvenanceReporter getProvenanceReporter() {
- return sharedState.getProvenanceReporter();
- }
-
@Override
public QueueSize getQueueSize() {
return flowFileQueue.size();
@@ -584,13 +574,6 @@ public class StandardProcessorTestRunner implements TestRunner {
@Override
public void addControllerService(final String identifier, final ControllerService service, final Map<String, String> properties) throws InitializationException {
- // hold off on failing due to deprecated annotation for now... will introduce later.
- // for ( final Method method : service.getClass().getMethods() ) {
- // if ( method.isAnnotationPresent(org.apache.nifi.controller.annotation.OnConfigured.class) ) {
- // Assert.fail("Controller Service " + service + " is using deprecated Annotation " + org.apache.nifi.controller.annotation.OnConfigured.class + " for method " + method);
- // }
- // }
-
final MockComponentLog logger = new MockComponentLog(identifier, service);
controllerServiceLoggers.put(identifier, logger);
final MockStateManager serviceStateManager = new MockStateManager(service);
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
index c3bedb1..44d7f9f 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
@@ -33,7 +33,6 @@ import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.provenance.ProvenanceEventRecord;
-import org.apache.nifi.provenance.ProvenanceReporter;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.state.MockStateManager;
@@ -486,12 +485,6 @@ public interface TestRunner {
List<MockFlowFile> getPenalizedFlowFiles();
/**
- * @return the {@link ProvenanceReporter} that will be used by the
- * configured {@link Processor} for reporting Provenance Events
- */
- ProvenanceReporter getProvenanceReporter();
-
- /**
* @return the current size of the Processor's Input Queue
*/
QueueSize getQueueSize();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java b/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
index 0e41e89..f5b28aa 100644
--- a/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
+++ b/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
@@ -110,26 +110,6 @@ public class TestStandardProcessorTestRunner {
runner.assertAllFlowFilesContainAttribute(AddAttributeProcessor.KEY);
}
- @org.apache.nifi.annotation.documentation.Tags({"deprecated"})
- private static class NewAnnotation extends AbstractProcessor {
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
- }
- }
-
- private static class NewMethodAnnotation extends AbstractProcessor {
-
- @org.apache.nifi.annotation.lifecycle.OnScheduled
- public void dummy() {
-
- }
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
- }
- }
-
private static class ProcessorWithOnStop extends AbstractProcessor {
private int callsWithContext = 0;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java
index 38e3a0d..ac6936f 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java
+++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.avro.file.CodecFactory;
import org.apache.avro.file.DataFileConstants;
@@ -57,7 +58,6 @@ import org.apache.nifi.processor.io.InputStreamCallback;
import org.apache.nifi.processor.io.OutputStreamCallback;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.stream.io.BufferedOutputStream;
-import org.apache.nifi.util.ObjectHolder;
@SideEffectFree
@SupportsBatching
@@ -231,7 +231,7 @@ public class SplitAvro extends AbstractProcessor {
@Override
public List<FlowFile> split(final ProcessSession session, final FlowFile originalFlowFile, final SplitWriter splitWriter) {
final List<FlowFile> childFlowFiles = new ArrayList<>();
- final ObjectHolder<GenericRecord> recordHolder = new ObjectHolder<>(null);
+ final AtomicReference<GenericRecord> recordHolder = new AtomicReference<>(null);
session.read(originalFlowFile, new InputStreamCallback() {
@Override
@@ -239,7 +239,7 @@ public class SplitAvro extends AbstractProcessor {
try (final InputStream in = new BufferedInputStream(rawIn);
final DataFileStream<GenericRecord> reader = new DataFileStream<>(in, new GenericDatumReader<GenericRecord>())) {
- final ObjectHolder<String> codec = new ObjectHolder<>(reader.getMetaString(DataFileConstants.CODEC));
+ final AtomicReference<String> codec = new AtomicReference<>(reader.getMetaString(DataFileConstants.CODEC));
if (codec.get() == null) {
codec.set(DataFileConstants.NULL_CODEC);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
index 3182958..ca7f690 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
@@ -52,7 +52,6 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.io.OutputStreamCallback;
import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.util.LongHolder;
import org.apache.nifi.util.StopWatch;
import java.io.IOException;
@@ -71,6 +70,7 @@ import java.util.TimeZone;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicLong;
@Tags({"cassandra", "cql", "select"})
@EventDriven
@@ -228,7 +228,7 @@ public class QueryCassandra extends AbstractCassandraProcessor {
// and states that it is thread-safe. This is why connectionSession is not in a try-with-resources.
final Session connectionSession = cassandraSession.get();
final ResultSetFuture queryFuture = connectionSession.executeAsync(selectQuery);
- final LongHolder nrOfRows = new LongHolder(0L);
+ final AtomicLong nrOfRows = new AtomicLong(0L);
fileToProcess = session.write(fileToProcess, new OutputStreamCallback() {
@Override
@@ -259,7 +259,7 @@ public class QueryCassandra extends AbstractCassandraProcessor {
});
// set attribute how many rows were selected
- fileToProcess = session.putAttribute(fileToProcess, RESULT_ROW_COUNT, nrOfRows.get().toString());
+ fileToProcess = session.putAttribute(fileToProcess, RESULT_ROW_COUNT, String.valueOf(nrOfRows.get()));
logger.info("{} contains {} Avro records; transferring to 'success'",
new Object[]{fileToProcess, nrOfRows.get()});
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
index 5a33eec..a4c267c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
@@ -284,8 +284,6 @@ public class FileSystemSwapManager implements FlowFileSwapManager {
}
}
-
- @SuppressWarnings("deprecation")
public static int serializeFlowFiles(final List<FlowFileRecord> toSwap, final FlowFileQueue queue, final String swapLocation, final OutputStream destination) throws IOException {
if (toSwap == null || toSwap.isEmpty()) {
return 0;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 76b946f..80b89dd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -986,7 +986,6 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
* @throws NullPointerException if either arg is null
* @throws ProcessorInstantiationException if the processor cannot be instantiated for any reason
*/
- @SuppressWarnings("deprecation")
public ProcessorNode createProcessor(final String type, String id, final boolean firstTimeAdded) throws ProcessorInstantiationException {
id = id.intern();
@@ -3605,7 +3604,6 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
return replayFlowFile(record, user);
}
- @SuppressWarnings("deprecation")
public ProvenanceEventRecord replayFlowFile(final ProvenanceEventRecord event, final NiFiUser user) throws IOException {
if (event == null) {
throw new NullPointerException();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
index aa77765..f391da5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
@@ -733,7 +733,6 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
}
@Override
- @SuppressWarnings("deprecation")
public int compare(final FlowFileRecord f1, final FlowFileRecord f2) {
int returnVal = 0;
final boolean f1Penalized = f1.isPenalized();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index b232f26..9d2c45c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -139,7 +139,6 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
processor.getClass().getSimpleName(), processor.getClass().getCanonicalName());
}
- @SuppressWarnings("deprecation")
public StandardProcessorNode(final Processor processor, final String uuid,
final ValidationContextFactory validationContextFactory, final ProcessScheduler scheduler,
final ControllerServiceProvider controllerServiceProvider,
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index 210fcca..673440f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -70,7 +70,6 @@ import org.apache.nifi.stream.io.ByteCountingOutputStream;
import org.apache.nifi.stream.io.StreamUtils;
import org.apache.nifi.stream.io.SynchronizedByteCountingOutputStream;
import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.util.LongHolder;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.file.FileUtils;
@@ -297,7 +296,7 @@ public class FileSystemRepository implements ContentRepository {
final Callable<Long> scanContainer = new Callable<Long>() {
@Override
public Long call() throws IOException {
- final LongHolder oldestDateHolder = new LongHolder(0L);
+ final AtomicLong oldestDateHolder = new AtomicLong(0L);
// the path already exists, so scan the path to find any files and update maxIndex to the max of
// all filenames seen.
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 1e2d634..0a2f8c9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -54,7 +54,6 @@ import org.apache.nifi.controller.repository.io.DisableOnCloseOutputStream;
import org.apache.nifi.controller.repository.io.FlowFileAccessInputStream;
import org.apache.nifi.controller.repository.io.FlowFileAccessOutputStream;
import org.apache.nifi.controller.repository.io.LimitedInputStream;
-import org.apache.nifi.controller.repository.io.LongHolder;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.FlowFileFilter;
@@ -120,8 +119,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
private int removedCount = 0; // number of flowfiles removed in this session
private long removedBytes = 0L; // size of all flowfiles removed in this session
- private final LongHolder bytesRead = new LongHolder(0L);
- private final LongHolder bytesWritten = new LongHolder(0L);
+ private final AtomicLong bytesRead = new AtomicLong(0L);
+ private final AtomicLong bytesWritten = new AtomicLong(0L);
private int flowFilesIn = 0, flowFilesOut = 0;
private long contentSizeIn = 0L, contentSizeOut = 0L;
@@ -966,8 +965,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
final Connectable connectable = context.getConnectable();
final StandardFlowFileEvent flowFileEvent = new StandardFlowFileEvent(connectable.getIdentifier());
- flowFileEvent.setBytesRead(bytesRead.getValue());
- flowFileEvent.setBytesWritten(bytesWritten.getValue());
+ flowFileEvent.setBytesRead(bytesRead.get());
+ flowFileEvent.setBytesWritten(bytesWritten.get());
// update event repository
try {
@@ -1055,8 +1054,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
flowFilesOut = 0;
removedCount = 0;
removedBytes = 0L;
- bytesRead.setValue(0L);
- bytesWritten.setValue(0L);
+ bytesRead.set(0L);
+ bytesWritten.set(0L);
connectionCounts.clear();
createdFlowFiles.clear();
removedFlowFiles.clear();
@@ -1822,7 +1821,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
}
currentReadClaim = claim;
- currentReadClaimStream = new ByteCountingInputStream(rawInStream, new LongHolder(0L));
+ currentReadClaimStream = new ByteCountingInputStream(rawInStream, new AtomicLong(0L));
StreamUtils.skip(currentReadClaimStream, offset);
// Use a non-closeable stream because we want to keep it open after the callback has finished so that we can
@@ -2069,8 +2068,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
writtenCount += footer.length;
}
} finally {
- bytesWritten.increment(writtenCount);
- bytesRead.increment(readCount);
+ bytesWritten.getAndAdd(writtenCount);
+ bytesRead.getAndAdd(readCount);
}
} catch (final ContentNotFoundException nfe) {
destroyContent(newClaim);
@@ -2111,7 +2110,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
final StandardRepositoryRecord record = records.get(source);
ContentClaim newClaim = null;
- final LongHolder writtenHolder = new LongHolder(0L);
+ final AtomicLong writtenHolder = new AtomicLong(0L);
try {
newClaim = context.getContentRepository().create(context.getConnectable().isLossTolerant());
claimLog.debug("Creating ContentClaim {} for 'write' for {}", newClaim, source);
@@ -2142,7 +2141,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
destroyContent(newClaim);
throw t;
} finally {
- bytesWritten.increment(writtenHolder.getValue());
+ bytesWritten.getAndAdd(writtenHolder.get());
}
removeTemporaryClaim(record);
@@ -2150,7 +2149,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
.fromFlowFile(record.getCurrent())
.contentClaim(newClaim)
.contentClaimOffset(0)
- .size(writtenHolder.getValue())
+ .size(writtenHolder.get())
.build();
record.setWorking(newFile);
@@ -2178,7 +2177,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
final OutputStream rawOutStream = context.getContentRepository().write(newClaim);
final OutputStream bufferedOutStream = new BufferedOutputStream(rawOutStream);
- outStream = new ByteCountingOutputStream(bufferedOutStream, new LongHolder(0L));
+ outStream = new ByteCountingOutputStream(bufferedOutStream, new AtomicLong(0L));
originalByteWrittenCount = 0;
appendableStreams.put(newClaim, outStream);
@@ -2224,7 +2223,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
} finally {
if (outStream != null) {
final long bytesWrittenThisIteration = outStream.getBytesWritten() - originalByteWrittenCount;
- bytesWritten.increment(bytesWrittenThisIteration);
+ bytesWritten.getAndAdd(bytesWrittenThisIteration);
}
}
@@ -2313,7 +2312,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
final ContentClaim currClaim = record.getCurrentClaim();
ContentClaim newClaim = null;
- final LongHolder writtenHolder = new LongHolder(0L);
+ final AtomicLong writtenHolder = new AtomicLong(0L);
try {
newClaim = context.getContentRepository().create(context.getConnectable().isLossTolerant());
claimLog.debug("Creating ContentClaim {} for 'write' for {}", newClaim, source);
@@ -2365,7 +2364,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
destroyContent(newClaim);
throw t;
} finally {
- bytesWritten.increment(writtenHolder.getValue());
+ bytesWritten.getAndAdd(writtenHolder.get());
}
removeTemporaryClaim(record);
@@ -2373,7 +2372,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
.fromFlowFile(record.getCurrent())
.contentClaim(newClaim)
.contentClaimOffset(0L)
- .size(writtenHolder.getValue())
+ .size(writtenHolder.get())
.build();
record.setWorking(newFile);
@@ -2405,8 +2404,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
long newSize = 0L;
try {
newSize = context.getContentRepository().importFrom(source, newClaim);
- bytesWritten.increment(newSize);
- bytesRead.increment(newSize);
+ bytesWritten.getAndAdd(newSize);
+ bytesRead.getAndAdd(newSize);
} catch (final Throwable t) {
destroyContent(newClaim);
throw new FlowFileAccessException("Failed to import data from " + source + " for " + destination + " due to " + t.toString(), t);
@@ -2439,7 +2438,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
claimLog.debug("Creating ContentClaim {} for 'importFrom' for {}", newClaim, destination);
newSize = context.getContentRepository().importFrom(source, newClaim);
- bytesWritten.increment(newSize);
+ bytesWritten.getAndAdd(newSize);
} catch (final IOException e) {
throw new FlowFileAccessException("Unable to create ContentClaim due to " + e.toString(), e);
}
@@ -2465,8 +2464,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
ensureNotAppending(record.getCurrentClaim());
final long copyCount = context.getContentRepository().exportTo(record.getCurrentClaim(), destination, append, record.getCurrentClaimOffset(), source.getSize());
- bytesRead.increment(copyCount);
- bytesWritten.increment(copyCount);
+ bytesRead.getAndAdd(copyCount);
+ bytesWritten.getAndAdd(copyCount);
} catch (final ContentNotFoundException nfe) {
handleContentNotFound(nfe, record);
} catch (final Throwable t) {
@@ -2640,7 +2639,6 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
// When creating a new FlowFile from multiple parents, we need to add all of the Lineage Identifiers
// and use the earliest lineage start date
long lineageStartDate = 0L;
- final Set<String> lineageIdentifiers = new HashSet<>();
for (final FlowFile parent : parents) {
final long parentLineageStartDate = parent.getLineageStartDate();
@@ -2785,8 +2783,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
this.removedCount += session.removedCount;
this.removedBytes += session.removedBytes;
- this.bytesRead += session.bytesRead.getValue();
- this.bytesWritten += session.bytesWritten.getValue();
+ this.bytesRead += session.bytesRead.get();
+ this.bytesWritten += session.bytesWritten.get();
this.flowFilesIn += session.flowFilesIn;
this.flowFilesOut += session.flowFilesOut;
this.contentSizeIn += session.contentSizeIn;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
index 6cd5d4a..7de25ac 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingInputStream.java
@@ -18,14 +18,15 @@ package org.apache.nifi.controller.repository.io;
import java.io.IOException;
import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicLong;
public class ByteCountingInputStream extends InputStream {
- private final LongHolder bytesReadHolder;
+ private final AtomicLong bytesReadHolder;
private final InputStream in;
private long bytesSkipped = 0L;
- public ByteCountingInputStream(final InputStream in, final LongHolder longHolder) {
+ public ByteCountingInputStream(final InputStream in, final AtomicLong longHolder) {
this.in = in;
this.bytesReadHolder = longHolder;
}
@@ -34,7 +35,7 @@ public class ByteCountingInputStream extends InputStream {
public int read() throws IOException {
final int fromSuper = in.read();
if (fromSuper >= 0) {
- bytesReadHolder.increment(1);
+ bytesReadHolder.getAndIncrement();
}
return fromSuper;
}
@@ -43,7 +44,7 @@ public class ByteCountingInputStream extends InputStream {
public int read(byte[] b, int off, int len) throws IOException {
final int fromSuper = in.read(b, off, len);
if (fromSuper >= 0) {
- bytesReadHolder.increment(fromSuper);
+ bytesReadHolder.getAndAdd(fromSuper);
}
return fromSuper;
@@ -87,7 +88,7 @@ public class ByteCountingInputStream extends InputStream {
}
public long getBytesRead() {
- return bytesReadHolder.getValue();
+ return bytesReadHolder.get();
}
public long getBytesSkipped() {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
index 4e727e9..7c778a2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/ByteCountingOutputStream.java
@@ -18,13 +18,14 @@ package org.apache.nifi.controller.repository.io;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.concurrent.atomic.AtomicLong;
public class ByteCountingOutputStream extends OutputStream {
- private final LongHolder bytesWrittenHolder;
+ private final AtomicLong bytesWrittenHolder;
private final OutputStream out;
- public ByteCountingOutputStream(final OutputStream out, final LongHolder longHolder) {
+ public ByteCountingOutputStream(final OutputStream out, final AtomicLong longHolder) {
this.out = out;
this.bytesWrittenHolder = longHolder;
}
@@ -32,7 +33,7 @@ public class ByteCountingOutputStream extends OutputStream {
@Override
public void write(int b) throws IOException {
out.write(b);
- bytesWrittenHolder.increment(1);
+ bytesWrittenHolder.getAndIncrement();
}
@Override
@@ -43,11 +44,11 @@ public class ByteCountingOutputStream extends OutputStream {
@Override
public void write(byte[] b, int off, int len) throws IOException {
out.write(b, off, len);
- bytesWrittenHolder.increment(len);
+ bytesWrittenHolder.getAndAdd(len);
}
public long getBytesWritten() {
- return bytesWrittenHolder.getValue();
+ return bytesWrittenHolder.get();
}
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java
deleted file mode 100644
index bd5fec1..0000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/io/LongHolder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.controller.repository.io;
-
-/**
- * Class to hold a long value that can be incremented and decremented. This allows the abstraction of passing a long value by reference, rather than by value, without the overhead of synchronization
- * required by the use of an AtomicLong.
- */
-public class LongHolder {
-
- private long value;
-
- public LongHolder() {
- value = 0L;
- }
-
- public LongHolder(final long initialValue) {
- value = initialValue;
- }
-
- public void increment(long value) {
- this.value += value;
- }
-
- public long getValue() {
- return value;
- }
-
- public void setValue(final long value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
index d3410cc..262ac77 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
@@ -270,7 +270,6 @@ public class EventDrivenSchedulingAgent extends AbstractSchedulingAgent {
}
}
- @SuppressWarnings("deprecation")
private void trigger(final Connectable worker, final ScheduleState scheduleState, final ConnectableProcessContext processContext, final ProcessSessionFactory sessionFactory) {
final int newThreadCount = scheduleState.incrementActiveThreadCount();
if (newThreadCount > worker.getMaxConcurrentTasks() && worker.getMaxConcurrentTasks() > 0) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index 1729d4a..53fc726 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -181,7 +181,6 @@ public final class StandardProcessScheduler implements ProcessScheduler {
scheduleState.setScheduled(true);
final Runnable startReportingTaskRunnable = new Runnable() {
- @SuppressWarnings("deprecation")
@Override
public void run() {
final long lastStopTime = scheduleState.getLastStopTime();
@@ -243,7 +242,6 @@ public final class StandardProcessScheduler implements ProcessScheduler {
taskNode.setScheduledState(ScheduledState.STOPPED);
final Runnable unscheduleReportingTaskRunnable = new Runnable() {
- @SuppressWarnings("deprecation")
@Override
public void run() {
final ConfigurationContext configurationContext = taskNode.getConfigurationContext();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index 22ee5cf..2c8d258 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -30,6 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.lifecycle.OnAdded;
@@ -56,7 +57,6 @@ import org.apache.nifi.processor.SimpleProcessLogger;
import org.apache.nifi.processor.StandardValidationContextFactory;
import org.apache.nifi.reporting.BulletinRepository;
import org.apache.nifi.reporting.Severity;
-import org.apache.nifi.util.ObjectHolder;
import org.apache.nifi.util.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -144,7 +144,7 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
final Class<? extends ControllerService> controllerServiceClass = rawClass.asSubclass(ControllerService.class);
final ControllerService originalService = controllerServiceClass.newInstance();
- final ObjectHolder<ControllerServiceNode> serviceNodeHolder = new ObjectHolder<>(null);
+ final AtomicReference<ControllerServiceNode> serviceNodeHolder = new AtomicReference<>(null);
final InvocationHandler invocationHandler = new InvocationHandler() {
@Override
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
index 8bc7d99..8f1623e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
@@ -54,7 +54,6 @@ public class ContinuallyRunConnectableTask implements Callable<Boolean> {
}
@Override
- @SuppressWarnings("deprecation")
public Boolean call() {
if (!scheduleState.isScheduled()) {
return false;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
index 1dc08c2..eb087a4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
@@ -34,7 +34,6 @@ public class ReportingTaskWrapper implements Runnable {
this.scheduleState = scheduleState;
}
- @SuppressWarnings("deprecation")
@Override
public synchronized void run() {
scheduleState.incrementActiveThreadCount();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index c8d9d25..8017abd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -333,7 +333,6 @@ public final class StandardProcessGroup implements ProcessGroup {
return flowController.getStateManagerProvider().getStateManager(componentId);
}
- @SuppressWarnings("deprecation")
private void shutdown(final ProcessGroup procGroup) {
for (final ProcessorNode node : procGroup.getProcessors()) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
@@ -688,7 +687,6 @@ public final class StandardProcessGroup implements ProcessGroup {
}
@Override
- @SuppressWarnings("deprecation")
public void removeProcessor(final ProcessorNode processor) {
final String id = requireNonNull(processor).getIdentifier();
writeLock.lock();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
index 50bc874..4a590f2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFileSystemSwapManager.java
@@ -69,7 +69,6 @@ public class TestFileSystemSwapManager {
}
@Test
- @SuppressWarnings("deprecation")
public void testRoundTripSerializeDeserialize() throws IOException {
final List<FlowFileRecord> toSwap = new ArrayList<>(10000);
final Map<String, String> attrs = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
index 6e368de..32c1dc6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
@@ -564,7 +564,6 @@ public class TestStandardFlowFileQueue {
}
@Override
- @SuppressWarnings("deprecation")
public SwapSummary getSwapSummary(String swapLocation) throws IOException {
final List<FlowFileRecord> flowFiles = swappedOut.get(swapLocation);
if (flowFiles == null) {
@@ -668,7 +667,6 @@ public class TestStandardFlowFileQueue {
}
@Override
- @SuppressWarnings("deprecation")
public int compareTo(final FlowFile o) {
return Long.compare(id, o.getId());
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
index 4094ca4..55b7426 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestWriteAheadFlowFileRepository.java
@@ -157,7 +157,6 @@ public class TestWriteAheadFlowFileRepository {
}
@Test
- @SuppressWarnings("deprecation")
public void testRestartWithOneRecord() throws IOException {
final Path path = Paths.get("target/test-repo");
if (Files.exists(path)) {
@@ -305,7 +304,6 @@ public class TestWriteAheadFlowFileRepository {
}
@Override
- @SuppressWarnings("deprecation")
public SwapSummary getSwapSummary(String swapLocation) throws IOException {
List<FlowFileRecord> records = null;
for (final Map<String, List<FlowFileRecord>> swapMap : swappedRecords.values()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
index c02b83f..a9943b8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
@@ -103,77 +103,6 @@ public class FileUtils {
* @param directory to delete contents of
* @param filter if null then no filter is used
* @param logger to notify
- * @deprecated As of release 0.6.0, replaced by
- * {@link #deleteFilesInDirectory(File, FilenameFilter, Logger)}
- */
- @Deprecated
- public static void deleteFilesInDir(final File directory, final FilenameFilter filter, final Logger logger) {
- FileUtils.deleteFilesInDir(directory, filter, logger, false);
- }
-
- /**
- * Deletes all files (not directories) in the given directory (recursive)
- * that match the given filename filter. If any file cannot be deleted then
- * this is printed at warn to the given logger.
- *
- * @param directory to delete contents of
- * @param filter if null then no filter is used
- * @param logger to notify
- * @param recurse true if should recurse
- * @deprecated As of release 0.6.0, replaced by
- * {@link #deleteFilesInDirectory(File, FilenameFilter, Logger, boolean)}
- */
- @Deprecated
- public static void deleteFilesInDir(final File directory, final FilenameFilter filter, final Logger logger, final boolean recurse) {
- FileUtils.deleteFilesInDir(directory, filter, logger, recurse, false);
- }
-
- /**
- * Deletes all files (not directories) in the given directory (recursive)
- * that match the given filename filter. If any file cannot be deleted then
- * this is printed at warn to the given logger.
- *
- * @param directory to delete contents of
- * @param filter if null then no filter is used
- * @param logger to notify
- * @param recurse will look for contents of sub directories.
- * @param deleteEmptyDirectories default is false; if true will delete
- * directories found that are empty
- * @deprecated As of release 0.6.0, replaced by
- * {@link #deleteFilesInDirectory(File, FilenameFilter, Logger, boolean, boolean)}
- */
- @Deprecated
- public static void deleteFilesInDir(final File directory, final FilenameFilter filter, final Logger logger, final boolean recurse, final boolean deleteEmptyDirectories) {
- // ensure the specified directory is actually a directory and that it exists
- if (null != directory && directory.isDirectory()) {
- final File ingestFiles[] = directory.listFiles();
- if (ingestFiles == null) {
- // null if abstract pathname does not denote a directory, or if an I/O error occurs
- logger.error("Unable to list directory content in: " + directory.getAbsolutePath());
- }
- for (File ingestFile : ingestFiles) {
- boolean process = (filter == null) ? true : filter.accept(directory, ingestFile.getName());
- if (ingestFile.isFile() && process) {
- FileUtils.deleteFile(ingestFile, logger, 3);
- }
- if (ingestFile.isDirectory() && recurse) {
- FileUtils.deleteFilesInDir(ingestFile, filter, logger, recurse, deleteEmptyDirectories);
- if (deleteEmptyDirectories && ingestFile.list().length == 0) {
- FileUtils.deleteFile(ingestFile, logger, 3);
- }
- }
- }
- }
- }
-
- /**
- * Deletes all files (not directories..) in the given directory (non
- * recursive) that match the given filename filter. If any file cannot be
- * deleted then this is printed at warn to the given logger.
- *
- * @param directory to delete contents of
- * @param filter if null then no filter is used
- * @param logger to notify
* @throws IOException if abstract pathname does not denote a directory,
* or if an I/O error occurs
*/
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
index 7396a34..e22ba4b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
@@ -1927,23 +1927,14 @@ public final class DtoFactory {
/**
* Gets the capability description from the specified class.
*/
- @SuppressWarnings("deprecation")
private String getCapabilityDescription(final Class<?> cls) {
final CapabilityDescription capabilityDesc = cls.getAnnotation(CapabilityDescription.class);
- if (capabilityDesc != null) {
- return capabilityDesc.value();
- }
-
- final org.apache.nifi.processor.annotation.CapabilityDescription deprecatedCapabilityDesc
- = cls.getAnnotation(org.apache.nifi.processor.annotation.CapabilityDescription.class);
-
- return (deprecatedCapabilityDesc == null) ? null : deprecatedCapabilityDesc.value();
+ return capabilityDesc == null ? null : capabilityDesc.value();
}
/**
* Gets the tags from the specified class.
*/
- @SuppressWarnings("deprecation")
private Set<String> getTags(final Class<?> cls) {
final Set<String> tags = new HashSet<>();
final Tags tagsAnnotation = cls.getAnnotation(Tags.class);
@@ -1951,13 +1942,6 @@ public final class DtoFactory {
for (final String tag : tagsAnnotation.value()) {
tags.add(tag);
}
- } else {
- final org.apache.nifi.processor.annotation.Tags deprecatedTagsAnnotation = cls.getAnnotation(org.apache.nifi.processor.annotation.Tags.class);
- if (deprecatedTagsAnnotation != null) {
- for (final String tag : deprecatedTagsAnnotation.value()) {
- tags.add(tag);
- }
- }
}
return tags;
@@ -2129,7 +2113,6 @@ public final class DtoFactory {
* @param node node
* @return dto
*/
- @SuppressWarnings("deprecation")
public ProvenanceNodeDTO createProvenanceEventNodeDTO(final ProvenanceEventLineageNode node) {
final ProvenanceNodeDTO dto = new ProvenanceNodeDTO();
dto.setId(node.getIdentifier());
@@ -2140,7 +2123,6 @@ public final class DtoFactory {
dto.setFlowFileUuid(node.getFlowFileUuid());
dto.setParentUuids(node.getParentUuids());
dto.setChildUuids(node.getChildUuids());
- dto.setClusterNodeIdentifier(node.getClusterNodeIdentifier());
return dto;
}
@@ -2150,7 +2132,6 @@ public final class DtoFactory {
* @param node node
* @return dto
*/
- @SuppressWarnings("deprecation")
public ProvenanceNodeDTO createFlowFileNodeDTO(final LineageNode node) {
final ProvenanceNodeDTO dto = new ProvenanceNodeDTO();
dto.setId(node.getIdentifier());
@@ -2158,7 +2139,6 @@ public final class DtoFactory {
dto.setTimestamp(new Date(node.getTimestamp()));
dto.setMillis(node.getTimestamp());
dto.setFlowFileUuid(node.getFlowFileUuid());
- dto.setClusterNodeIdentifier(node.getClusterNodeIdentifier());
return dto;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f987b216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
deleted file mode 100644
index b205590..0000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.web;
-
-import org.apache.nifi.web.revision.RevisionManager;
-
-/**
- * A manager for optimistic locking based on revisions. A revision is composed
- * of a client ID and a version number. Two revisions are considered equal if
- * either their version numbers match or their client IDs match.
- *
- * @deprecated This class has been deprecated in favor of {@link RevisionManager}
- */
-@Deprecated
-public interface OptimisticLockingManager {
-
- /**
- * Attempts to execute the specified configuration request using the
- * specified revision within a lock.
- *
- * @param <T> type of snapshot
- * @param revision revision
- * @param configurationRequest request
- * @return snapshot
- */
- <T> ConfigurationSnapshot<T> configureFlow(Revision revision, ConfigurationRequest<T> configurationRequest);
-
- /**
- * Updates the revision using the specified revision within a lock.
- *
- * @param updateRevision new revision
- */
- void setRevision(UpdateRevision updateRevision);
-
- /**
- * Returns the last flow modification. This is a combination of the revision
- * and the user who performed the modification.
- *
- * @return the last modification
- */
- FlowModification getLastModification();
-
-}