Skip to content

Commit 87b010f

Browse files
NIFI-14570 Retain Git Registry Client Metadata Timestamp in JSON
- Updated Git Flow Registry Client to remove setting the timestamp field to 0
1 parent 810e33a commit 87b010f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

nifi-extension-bundles/nifi-extension-utils/nifi-git-flow-registry/src/main/java/org/apache/nifi/registry/flow/git/AbstractGitFlowRegistryClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ public RegisteredFlowSnapshot registerFlowSnapshot(final FlowRegistryClientConfi
355355
flowSnapshot.getSnapshotMetadata().setBranch(null);
356356
flowSnapshot.getSnapshotMetadata().setVersion(null);
357357
flowSnapshot.getSnapshotMetadata().setComments(null);
358-
flowSnapshot.getSnapshotMetadata().setTimestamp(0);
359358

360359
// remove all parameter values if configured to do so
361360
final ParameterContextValuesStrategy parameterContextValuesStrategy = context.getProperty(PARAMETER_CONTEXT_VALUES).asAllowableValue(ParameterContextValuesStrategy.class);

nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/test/java/org/apache/nifi/github/GitHubFlowRegistryClientTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,13 @@ public void testRegisterFlowSnapshot() throws IOException, FlowRegistryException
116116

117117
final RegisteredFlow incomingFlow = createIncomingRegisteredFlow();
118118

119+
final long timestamp = System.currentTimeMillis();
119120
final RegisteredFlowSnapshotMetadata incomingMetadata = new RegisteredFlowSnapshotMetadata();
120121
incomingMetadata.setBranch(incomingFlow.getBranch());
121122
incomingMetadata.setBucketIdentifier(incomingFlow.getBucketIdentifier());
122123
incomingMetadata.setFlowIdentifier(incomingFlow.getIdentifier());
123124
incomingMetadata.setComments("Unit test");
125+
incomingMetadata.setTimestamp(timestamp);
124126

125127
final RegisteredFlowSnapshot incomingSnapshot = new RegisteredFlowSnapshot();
126128
incomingSnapshot.setFlow(incomingFlow);
@@ -154,6 +156,7 @@ public void testRegisterFlowSnapshot() throws IOException, FlowRegistryException
154156
assertEquals(incomingMetadata.getBucketIdentifier(), resultMetadata.getBucketIdentifier());
155157
assertEquals(incomingMetadata.getFlowIdentifier(), resultMetadata.getFlowIdentifier());
156158
assertEquals(incomingMetadata.getComments(), resultMetadata.getComments());
159+
assertEquals(timestamp, resultMetadata.getTimestamp());
157160

158161
final FlowRegistryBucket resultBucket = resultSnapshot.getBucket();
159162
assertNotNull(resultBucket);

0 commit comments

Comments
 (0)