From e5925ff4b33c7768666099ab683e68b8bc2efec4 Mon Sep 17 00:00:00 2001 From: jpercivall Date: Fri, 6 May 2016 18:01:15 -0400 Subject: [PATCH] Fixing contrib check --- .../endpoints/ControllerServiceReferenceEndpointMerger.java | 1 - .../src/main/java/org/apache/nifi/services/FlowService.java | 2 +- .../java/org/apache/nifi/web/StandardNiFiServiceFacade.java | 4 ++-- .../src/main/java/org/apache/nifi/web/api/FunnelResource.java | 1 - .../org/apache/nifi/web/revision/NaiveRevisionManager.java | 3 ++- .../java/org/apache/nifi/web/revision/RevisionManager.java | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerServiceReferenceEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerServiceReferenceEndpointMerger.java index 1fad6287f3..c299054e96 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerServiceReferenceEndpointMerger.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerServiceReferenceEndpointMerger.java @@ -26,7 +26,6 @@ import java.util.regex.Pattern; import org.apache.nifi.cluster.coordination.http.EndpointResponseMerger; import org.apache.nifi.cluster.manager.NodeResponse; import org.apache.nifi.cluster.protocol.NodeIdentifier; -import org.apache.nifi.web.api.dto.ControllerServiceReferencingComponentDTO; import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentEntity; import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentsEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java index b6e1e1d1b7..50cb789faa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java @@ -117,7 +117,7 @@ public interface FlowService extends LifeCycle { /** * Creates a copy of the current flow and saves it in the configured 'archive' directory - * + * * @throws IOException if unable to write to the archive directory */ void archiveFlow() throws IOException; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java index e5b6327e75..16696e7627 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java @@ -477,7 +477,6 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { * @param the Component Type of the updated component * * @return A ConfigurationSnapshot that represents the new configuration - * @throws ExpiredRevisionClaimException */ private RevisionUpdate updateComponent(final Revision revision, final Authorizable authorizable, final Supplier daoUpdate, final Function dtoCreation) { final String modifier = NiFiUserUtils.getNiFiUserName(); @@ -1547,7 +1546,8 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { final RevisionClaim claim = new StandardRevisionClaim(requiredRevisions); final String modifier = NiFiUserUtils.getNiFiUserName(); - final RevisionUpdate update = revisionManager.updateRevision(claim, modifier, new UpdateRevisionTask() { + final RevisionUpdate update = revisionManager.updateRevision(claim, modifier, + new UpdateRevisionTask() { @Override public RevisionUpdate update() { final Set updated = controllerServiceDAO.updateControllerServiceReferencingComponents(controllerServiceId, scheduledState, controllerServiceState); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java index 987f544974..92b84ee2cf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java @@ -43,7 +43,6 @@ import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.Revision; import org.apache.nifi.web.UpdateResult; import org.apache.nifi.web.api.dto.FunnelDTO; -import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.entity.FunnelEntity; import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.LongParameter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/NaiveRevisionManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/NaiveRevisionManager.java index c2232a6717..768b5f2c1e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/NaiveRevisionManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/NaiveRevisionManager.java @@ -65,7 +65,8 @@ public class NaiveRevisionManager implements RevisionManager { * Constructs a new NaiveRevisionManager that uses the given number of Nanoseconds as the expiration time * for a Revision Claims * - * @param claimNanos the number of nanoseconds that a Revision Claim should last + * @param claimExpiration how long a Revision Claim should last + * @param timeUnit the TimeUnit of 'claimExpiration' */ public NaiveRevisionManager(final long claimExpiration, final TimeUnit timeUnit) { this.claimExpirationNanos = timeUnit.toNanos(claimExpiration); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/RevisionManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/RevisionManager.java index 0db6828002..a8e2f398f1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/RevisionManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/RevisionManager.java @@ -107,7 +107,7 @@ public interface RevisionManager { * Returns the current Revision for the component with the given ID. If no Revision yet exists for the * component with the given ID, one will be created with a Version of 0 and no Client ID. * - * @param componentId + * @param componentId the ID of the component * @return the current Revision for the component with the given ID */ Revision getRevision(String componentId);