From 9af53236b7492a573fcf82f46382a3a86ae57223 Mon Sep 17 00:00:00 2001
From: Pierre Villard <pierre.villard.fr@gmail.com>
Date: Mon, 25 Nov 2024 21:14:16 +0100
Subject: [PATCH] review

---
 .../bitbucket/BitBucketFlowRegistryClient.java     | 10 ++++++----
 .../bitbucket/BitBucketRepositoryClient.java       | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketFlowRegistryClient.java b/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketFlowRegistryClient.java
index 68b696f29a492..4f6ab4af38ca5 100644
--- a/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketFlowRegistryClient.java
+++ b/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketFlowRegistryClient.java
@@ -126,6 +126,9 @@ public class BitBucketFlowRegistryClient extends AbstractGitFlowRegistryClient {
             APP_PASSWORD,
             OAUTH_TOKEN_PROVIDER);
 
+    static final String STORAGE_LOCATION_PREFIX = "git@bitbucket.org:";
+    static final String STORAGE_LOCATION_FORMAT = STORAGE_LOCATION_PREFIX + "%s/%s.git";
+
     @Override
     protected List<PropertyDescriptor> createPropertyDescriptors() {
         return PROPERTY_DESCRIPTORS;
@@ -151,13 +154,12 @@ protected GitRepositoryClient createRepositoryClient(final FlowRegistryClientCon
 
     @Override
     public boolean isStorageLocationApplicable(FlowRegistryClientConfigurationContext context, String location) {
-        // TODO Auto-generated method stub
-        return false;
+        return location != null && location.startsWith(STORAGE_LOCATION_PREFIX);
     }
 
     @Override
     protected String getStorageLocation(GitRepositoryClient repositoryClient) {
-        // TODO Auto-generated method stub
-        return null;
+        final BitBucketRepositoryClient gitLabRepositoryClient = (BitBucketRepositoryClient) repositoryClient;
+        return STORAGE_LOCATION_FORMAT.formatted(gitLabRepositoryClient.getWorkspace(), gitLabRepositoryClient.getRepoName());
     }
 }
diff --git a/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketRepositoryClient.java b/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketRepositoryClient.java
index 3561c5b0b7e4d..d0d619ff85adb 100644
--- a/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketRepositoryClient.java
+++ b/nifi-extension-bundles/nifi-atlassian-bundle/nifi-atlassian-extensions/src/main/java/org/apache/nifi/atlassian/bitbucket/BitBucketRepositoryClient.java
@@ -140,6 +140,20 @@ public boolean hasWritePermission() {
         return canWrite;
     }
 
+    /**
+     * @return the name of the workspace
+     */
+    public String getWorkspace() {
+        return workspace;
+    }
+
+    /**
+     * @return the name of the repository
+     */
+    public String getRepoName() {
+        return repoName;
+    }
+
     @Override
     public Set<String> getBranches() throws FlowRegistryException {
         LOGGER.debug("Getting branches for repository [{}]", repoName);