Updated review comments

ragavareddychalapala · ragavareddychalapala · commit 70e0aa03fb5a · 2025-01-02T13:39:45.000+05:30
diff --git a/src/ArtifactoryUploader/PackageUploadHelper.cs b/src/ArtifactoryUploader/PackageUploadHelper.cs
@@ -1172,8 +1172,8 @@ public static async Task<List<AqlResult>> GetPypiListOfComponentsFromRepo(string
             {
                 foreach (var repo in repoList)
                 {
-                    var test = await jFrogService.GetPypiInternalComponentDataByRepo(repo) ?? new List<AqlResult>();
-                    aqlResultList.AddRange(test);
+                    var componentRepoData = await jFrogService.GetPypiComponentDataByRepo(repo) ?? new List<AqlResult>();
+                    aqlResultList.AddRange(componentRepoData);
                 }
             }
 
diff --git a/src/LCT.APICommunications/Interfaces/IJfrogAqlApiCommunication.cs b/src/LCT.APICommunications/Interfaces/IJfrogAqlApiCommunication.cs
@@ -27,13 +27,13 @@ public interface IJfrogAqlApiCommunication
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName);
         /// <summary>
         /// Gets the internal component data based on repo name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName);
        
 
         /// <summary>
diff --git a/src/LCT.APICommunications/JfrogAqlApiCommunication.cs b/src/LCT.APICommunications/JfrogAqlApiCommunication.cs
@@ -66,7 +66,7 @@ public async Task<HttpResponseMessage> GetInternalComponentDataByRepo(string rep
             HttpContent httpContent = new StringContent(aqlQueryToBody);
             return await httpClient.PostAsync(uri, httpContent);
         }
-        public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName)
         {
             HttpClient httpClient = GetHttpClient(ArtifactoryCredentials);
             TimeSpan timeOutInSec = TimeSpan.FromSeconds(TimeoutInSec);
@@ -82,7 +82,7 @@ public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string
             HttpContent httpContent = new StringContent(aqlQueryToBody);
             return await httpClient.PostAsync(uri, httpContent);
         }
-        public async Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName)
         {
             HttpClient httpClient = GetHttpClient(ArtifactoryCredentials);
             TimeSpan timeOutInSec = TimeSpan.FromSeconds(TimeoutInSec);
diff --git a/src/LCT.Facade/Interfaces/IJfrogAqlApiCommunicationFacade.cs b/src/LCT.Facade/Interfaces/IJfrogAqlApiCommunicationFacade.cs
@@ -26,13 +26,13 @@ public interface IJfrogAqlApiCommunicationFacade
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName);
         /// <summary>
         /// Gets the Internal Component Data By Repo Name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName);
+        Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName);
         
 
         /// <summary>
diff --git a/src/LCT.Facade/JfrogAqlApiCommunicationFacade.cs b/src/LCT.Facade/JfrogAqlApiCommunicationFacade.cs
@@ -51,18 +51,18 @@ public async Task<HttpResponseMessage> GetInternalComponentDataByRepo(string rep
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName)
         {
-            return await m_jfrogAqlApiCommunication.GetNpmInternalComponentDataByRepo(repoName);
+            return await m_jfrogAqlApiCommunication.GetNpmComponentDataByRepo(repoName);
         }
         /// <summary>
         /// Gets the Internal Component Data By Repo Name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>HttpResponseMessage</returns>
-        public async Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName)
+        public async Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName)
         {
-            return await m_jfrogAqlApiCommunication.GetPypiInternalComponentDataByRepo(repoName);
+            return await m_jfrogAqlApiCommunication.GetPypiComponentDataByRepo(repoName);
         }
        
         /// <summary>
diff --git a/src/LCT.PackageIdentifier/BomHelper.cs b/src/LCT.PackageIdentifier/BomHelper.cs
@@ -183,8 +183,8 @@ public async Task<List<AqlResult>> GetNpmListOfComponentsFromRepo(string[] repoL
             {
                 foreach (var repo in repoList)
                 {
-                    var test = await jFrogService.GetNpmInternalComponentDataByRepo(repo) ?? new List<AqlResult>();
-                    aqlResultList.AddRange(test);
+                    var componentRepoData = await jFrogService.GetNpmComponentDataByRepo(repo) ?? new List<AqlResult>();
+                    aqlResultList.AddRange(componentRepoData);
                 }
             }
 
@@ -197,8 +197,8 @@ public async Task<List<AqlResult>> GetPypiListOfComponentsFromRepo(string[] repo
             {
                 foreach (var repo in repoList)
                 {
-                    var test = await jFrogService.GetPypiInternalComponentDataByRepo(repo) ?? new List<AqlResult>();
-                    aqlResultList.AddRange(test);
+                    var componentRepoData = await jFrogService.GetPypiComponentDataByRepo(repo) ?? new List<AqlResult>();
+                    aqlResultList.AddRange(componentRepoData);
                 }
             }
 
diff --git a/src/LCT.Services/Interface/IJFrogService.cs b/src/LCT.Services/Interface/IJFrogService.cs
@@ -28,13 +28,13 @@ public interface IJFrogService
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>IList<AqlResult></returns>
-        public Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string repoName);
+        public Task<IList<AqlResult>> GetNpmComponentDataByRepo(string repoName);
         /// <summary>
         /// Gets the internal component data by Repo name
         /// </summary>
         /// <param name="repoName">repoName</param>
         /// <returns>IList<AqlResult></returns>
-        public Task<IList<AqlResult>> GetPypiInternalComponentDataByRepo(string repoName);
+        public Task<IList<AqlResult>> GetPypiComponentDataByRepo(string repoName);
        
         /// <summary>
         /// Gets the package information in the repo, via the name or path
diff --git a/src/LCT.Services/JFrogService.cs b/src/LCT.Services/JFrogService.cs
@@ -64,14 +64,14 @@ public async Task<IList<AqlResult>> GetInternalComponentDataByRepo(string repoNa
 
             return aqlResult;
         }
-        public async Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string repoName)
+        public async Task<IList<AqlResult>> GetNpmComponentDataByRepo(string repoName)
         {
             HttpResponseMessage httpResponseMessage = null;
             IList<AqlResult> aqlResult = new List<AqlResult>();
 
             try
             {
-                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetNpmInternalComponentDataByRepo(repoName);
+                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetNpmComponentDataByRepo(repoName);
                 if (httpResponseMessage == null || !httpResponseMessage.IsSuccessStatusCode)
                 {
                     return new List<AqlResult>();
@@ -96,14 +96,14 @@ public async Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string rep
 
             return aqlResult;
         }
-        public async Task<IList<AqlResult>> GetPypiInternalComponentDataByRepo(string repoName)
+        public async Task<IList<AqlResult>> GetPypiComponentDataByRepo(string repoName)
         {
             HttpResponseMessage httpResponseMessage = null;
             IList<AqlResult> aqlResult = new List<AqlResult>();
 
             try
             {
-                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetPypiInternalComponentDataByRepo(repoName);
+                httpResponseMessage = await m_JFrogApiCommunicationFacade.GetPypiComponentDataByRepo(repoName);
                 if (httpResponseMessage == null || !httpResponseMessage.IsSuccessStatusCode)
                 {
                     return new List<AqlResult>();

Original file line number	Diff line number	Diff line change
`@@ -1172,8 +1172,8 @@ public static async Task<List<AqlResult>> GetPypiListOfComponentsFromRepo(string`
`1172`	`1172`	`{`
`1173`	`1173`	`foreach (var repo in repoList)`
`1174`	`1174`	`{`
`1175`		`- var test = await jFrogService.GetPypiInternalComponentDataByRepo(repo) ?? new List<AqlResult>();`
`1176`		`- aqlResultList.AddRange(test);`
	`1175`	`+ var componentRepoData = await jFrogService.GetPypiComponentDataByRepo(repo) ?? new List<AqlResult>();`
	`1176`	`+ aqlResultList.AddRange(componentRepoData);`
`1177`	`1177`	`}`
`1178`	`1178`	`}`
`1179`	`1179`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public async Task<HttpResponseMessage> GetInternalComponentDataByRepo(string rep`
`66`	`66`	`HttpContent httpContent = new StringContent(aqlQueryToBody);`
`67`	`67`	`return await httpClient.PostAsync(uri, httpContent);`
`68`	`68`	`}`
`69`		`- public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName)`
	`69`	`+ public async Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName)`
`70`	`70`	`{`
`71`	`71`	`HttpClient httpClient = GetHttpClient(ArtifactoryCredentials);`
`72`	`72`	`TimeSpan timeOutInSec = TimeSpan.FromSeconds(TimeoutInSec);`
`@@ -82,7 +82,7 @@ public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string`
`82`	`82`	`HttpContent httpContent = new StringContent(aqlQueryToBody);`
`83`	`83`	`return await httpClient.PostAsync(uri, httpContent);`
`84`	`84`	`}`
`85`		`- public async Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName)`
	`85`	`+ public async Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName)`
`86`	`86`	`{`
`87`	`87`	`HttpClient httpClient = GetHttpClient(ArtifactoryCredentials);`
`88`	`88`	`TimeSpan timeOutInSec = TimeSpan.FromSeconds(TimeoutInSec);`
Original file line number	Diff line number	Diff line change
`@@ -51,18 +51,18 @@ public async Task<HttpResponseMessage> GetInternalComponentDataByRepo(string rep`
`51`	`51`	`/// </summary>`
`52`	`52`	`/// <param name="repoName">repoName</param>`
`53`	`53`	`/// <returns>HttpResponseMessage</returns>`
`54`		`- public async Task<HttpResponseMessage> GetNpmInternalComponentDataByRepo(string repoName)`
	`54`	`+ public async Task<HttpResponseMessage> GetNpmComponentDataByRepo(string repoName)`
`55`	`55`	`{`
`56`		`- return await m_jfrogAqlApiCommunication.GetNpmInternalComponentDataByRepo(repoName);`
	`56`	`+ return await m_jfrogAqlApiCommunication.GetNpmComponentDataByRepo(repoName);`
`57`	`57`	`}`
`58`	`58`	`/// <summary>`
`59`	`59`	`/// Gets the Internal Component Data By Repo Name`
`60`	`60`	`/// </summary>`
`61`	`61`	`/// <param name="repoName">repoName</param>`
`62`	`62`	`/// <returns>HttpResponseMessage</returns>`
`63`		`- public async Task<HttpResponseMessage> GetPypiInternalComponentDataByRepo(string repoName)`
	`63`	`+ public async Task<HttpResponseMessage> GetPypiComponentDataByRepo(string repoName)`
`64`	`64`	`{`
`65`		`- return await m_jfrogAqlApiCommunication.GetPypiInternalComponentDataByRepo(repoName);`
	`65`	`+ return await m_jfrogAqlApiCommunication.GetPypiComponentDataByRepo(repoName);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,8 @@ public async Task<List<AqlResult>> GetNpmListOfComponentsFromRepo(string[] repoL`
`183`	`183`	`{`
`184`	`184`	`foreach (var repo in repoList)`
`185`	`185`	`{`
`186`		`- var test = await jFrogService.GetNpmInternalComponentDataByRepo(repo) ?? new List<AqlResult>();`
`187`		`- aqlResultList.AddRange(test);`
	`186`	`+ var componentRepoData = await jFrogService.GetNpmComponentDataByRepo(repo) ?? new List<AqlResult>();`
	`187`	`+ aqlResultList.AddRange(componentRepoData);`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
`@@ -197,8 +197,8 @@ public async Task<List<AqlResult>> GetPypiListOfComponentsFromRepo(string[] repo`
`197`	`197`	`{`
`198`	`198`	`foreach (var repo in repoList)`
`199`	`199`	`{`
`200`		`- var test = await jFrogService.GetPypiInternalComponentDataByRepo(repo) ?? new List<AqlResult>();`
`201`		`- aqlResultList.AddRange(test);`
	`200`	`+ var componentRepoData = await jFrogService.GetPypiComponentDataByRepo(repo) ?? new List<AqlResult>();`
	`201`	`+ aqlResultList.AddRange(componentRepoData);`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,14 @@ public async Task<IList<AqlResult>> GetInternalComponentDataByRepo(string repoNa`
`64`	`64`
`65`	`65`	`return aqlResult;`
`66`	`66`	`}`
`67`		`- public async Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string repoName)`
	`67`	`+ public async Task<IList<AqlResult>> GetNpmComponentDataByRepo(string repoName)`
`68`	`68`	`{`
`69`	`69`	`HttpResponseMessage httpResponseMessage = null;`
`70`	`70`	`IList<AqlResult> aqlResult = new List<AqlResult>();`
`71`	`71`
`72`	`72`	`try`
`73`	`73`	`{`
`74`		`- httpResponseMessage = await m_JFrogApiCommunicationFacade.GetNpmInternalComponentDataByRepo(repoName);`
	`74`	`+ httpResponseMessage = await m_JFrogApiCommunicationFacade.GetNpmComponentDataByRepo(repoName);`
`75`	`75`	`if (httpResponseMessage == null \|\| !httpResponseMessage.IsSuccessStatusCode)`
`76`	`76`	`{`
`77`	`77`	`return new List<AqlResult>();`
`@@ -96,14 +96,14 @@ public async Task<IList<AqlResult>> GetNpmInternalComponentDataByRepo(string rep`
`96`	`96`
`97`	`97`	`return aqlResult;`
`98`	`98`	`}`
`99`		`- public async Task<IList<AqlResult>> GetPypiInternalComponentDataByRepo(string repoName)`
	`99`	`+ public async Task<IList<AqlResult>> GetPypiComponentDataByRepo(string repoName)`
`100`	`100`	`{`
`101`	`101`	`HttpResponseMessage httpResponseMessage = null;`
`102`	`102`	`IList<AqlResult> aqlResult = new List<AqlResult>();`
`103`	`103`
`104`	`104`	`try`
`105`	`105`	`{`
`106`		`- httpResponseMessage = await m_JFrogApiCommunicationFacade.GetPypiInternalComponentDataByRepo(repoName);`
	`106`	`+ httpResponseMessage = await m_JFrogApiCommunicationFacade.GetPypiComponentDataByRepo(repoName);`
`107`	`107`	`if (httpResponseMessage == null \|\| !httpResponseMessage.IsSuccessStatusCode)`
`108`	`108`	`{`
`109`	`109`	`return new List<AqlResult>();`