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

Fixing contrib check

This commit is contained in:
jpercivall 2016-05-06 18:01:15 -04:00
parent e2bbea1c53
commit e5925ff4b3
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerServiceReferenceEndpointMerger.java
View File

@ -26,7 +26,6 @@ import java.util.regex.Pattern;
import org.apache.nifi.cluster.coordination.http.EndpointResponseMerger; import org.apache.nifi.cluster.coordination.http.EndpointResponseMerger;
import org.apache.nifi.cluster.manager.NodeResponse; import org.apache.nifi.cluster.manager.NodeResponse;
import org.apache.nifi.cluster.protocol.NodeIdentifier; 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.ControllerServiceReferencingComponentEntity;
import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentsEntity; import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentsEntity;

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
View File

@ -477,7 +477,6 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
* @param <C> the Component Type of the updated component * @param <C> the Component Type of the updated component
* *
* @return A ConfigurationSnapshot that represents the new configuration * @return A ConfigurationSnapshot that represents the new configuration
* @throws ExpiredRevisionClaimException
*/ */
private <D, C> RevisionUpdate<D> updateComponent(final Revision revision, final Authorizable authorizable, final Supplier<C> daoUpdate, final Function<C, D> dtoCreation) { private <D, C> RevisionUpdate<D> updateComponent(final Revision revision, final Authorizable authorizable, final Supplier<C> daoUpdate, final Function<C, D> dtoCreation) {
final String modifier = NiFiUserUtils.getNiFiUserName(); final String modifier = NiFiUserUtils.getNiFiUserName();
@ -1547,7 +1546,8 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
final RevisionClaim claim = new StandardRevisionClaim(requiredRevisions); final RevisionClaim claim = new StandardRevisionClaim(requiredRevisions);
final String modifier = NiFiUserUtils.getNiFiUserName(); final String modifier = NiFiUserUtils.getNiFiUserName();
final RevisionUpdate<ControllerServiceReferencingComponentsEntity> update = revisionManager.updateRevision(claim, modifier, new UpdateRevisionTask<ControllerServiceReferencingComponentsEntity>() { final RevisionUpdate<ControllerServiceReferencingComponentsEntity> update = revisionManager.updateRevision(claim, modifier,
new UpdateRevisionTask<ControllerServiceReferencingComponentsEntity>() {
@Override @Override
public RevisionUpdate<ControllerServiceReferencingComponentsEntity> update() { public RevisionUpdate<ControllerServiceReferencingComponentsEntity> update() {
final Set<ConfiguredComponent> updated = controllerServiceDAO.updateControllerServiceReferencingComponents(controllerServiceId, scheduledState, controllerServiceState); final Set<ConfiguredComponent> updated = controllerServiceDAO.updateControllerServiceReferencingComponents(controllerServiceId, scheduledState, controllerServiceState);

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java
View File

@ -43,7 +43,6 @@ import org.apache.nifi.web.NiFiServiceFacade;
import org.apache.nifi.web.Revision; import org.apache.nifi.web.Revision;
import org.apache.nifi.web.UpdateResult; import org.apache.nifi.web.UpdateResult;
import org.apache.nifi.web.api.dto.FunnelDTO; 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.entity.FunnelEntity;
import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.ClientIdParameter;
import org.apache.nifi.web.api.request.LongParameter; import org.apache.nifi.web.api.request.LongParameter;

3
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/NaiveRevisionManager.java
View File

@ -65,7 +65,8 @@ public class NaiveRevisionManager implements RevisionManager {
* Constructs a new NaiveRevisionManager that uses the given number of Nanoseconds as the expiration time * Constructs a new NaiveRevisionManager that uses the given number of Nanoseconds as the expiration time
* for a Revision Claims * 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) { public NaiveRevisionManager(final long claimExpiration, final TimeUnit timeUnit) {
this.claimExpirationNanos = timeUnit.toNanos(claimExpiration); this.claimExpirationNanos = timeUnit.toNanos(claimExpiration);

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/revision/RevisionManager.java
View File

@ -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 * 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. * 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 * @return the current Revision for the component with the given ID
*/ */
Revision getRevision(String componentId); Revision getRevision(String componentId);