Simplifying API

seart-group · Aug 3, 2023 · 6a4e7a4 · 6a4e7a4
1 parent 5adceed
commit 6a4e7a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/src/main/java/usi/si/seart/analysis/StaticCodeAnalyzer.java b/src/main/java/usi/si/seart/analysis/StaticCodeAnalyzer.java
@@ -93,7 +93,7 @@ private void gatherCodeMetricsFor(@NotNull GitRepo gitRepo) {
                 log.warn("No metrics were computed for: {}", name);
             gitRepo.setMetrics(metrics);
             gitRepo.setLastAnalyzed();
-            gitRepoService.updateRepo(gitRepo);
+            gitRepoService.createOrUpdate(gitRepo);
         } catch (StaticCodeAnalysisException ex) {
             log.error("Static code analysis failed for: {}", name);
             log.debug("", ex);

diff --git a/src/main/java/usi/si/seart/job/CleanUpProjectsJob.java b/src/main/java/usi/si/seart/job/CleanUpProjectsJob.java
@@ -47,7 +47,7 @@ public void run() {
                 gitRepoService.deleteRepoById(id);
             } else {
                 gitRepo.setLastPinged();
-                gitRepoService.updateRepo(gitRepo);
+                gitRepoService.createOrUpdate(gitRepo);
             }
         });
     }

diff --git a/src/main/java/usi/si/seart/job/CrawlProjectsJob.java b/src/main/java/usi/si/seart/job/CrawlProjectsJob.java
@@ -282,7 +282,7 @@ private void saveRetrievedRepo(JsonObject result, String language, int lowerInde
             Language mainLanguage = languageService.getOrCreate(language);
             gitRepo.setMainLanguage(mainLanguage);
 
-            gitRepo = gitRepoService.updateRepo(gitRepo);
+            gitRepo = gitRepoService.createOrUpdate(gitRepo);
 
             Set<Label> labels = retrieveRepoLabels(gitRepo);
             if (!labels.isEmpty())
@@ -299,7 +299,7 @@ private void saveRetrievedRepo(JsonObject result, String language, int lowerInde
                 log.debug("\tAdding: {} topics.", topics.size());
             gitRepo.setTopics(topics);
 
-            gitRepoService.updateRepo(gitRepo);
+            gitRepoService.createOrUpdate(gitRepo);
         } catch (NonTransientDataAccessException ex) {
             throw ex;
         } catch (Exception ex) {

diff --git a/src/main/java/usi/si/seart/service/GitRepoService.java b/src/main/java/usi/si/seart/service/GitRepoService.java
@@ -42,13 +42,7 @@ public interface GitRepoService {
             backoff = @Backoff(delay = 250, multiplier = 2),
             maxAttempts = 5
     )
-    GitRepo createOrUpdateRepo(GitRepo repo);
-    @Retryable(
-            value = TransientDataAccessException.class,
-            backoff = @Backoff(delay = 250, multiplier = 2),
-            maxAttempts = 5
-    )
-    GitRepo updateRepo(GitRepo repo);
+    GitRepo createOrUpdate(GitRepo repo);
     Optional<GitRepo> getNextDeletionCandidate();
     Page<GitRepo> findDynamically(GitRepoSearch parameters, Pageable pageable);
     Stream<GitRepo> streamDynamically(GitRepoSearch parameters);
@@ -93,17 +87,7 @@ public GitRepo getByName(String name) {
         }
 
         @Override
-        public GitRepo createOrUpdateRepo(GitRepo repo) {
-            String name = repo.getName();
-            Long id = gitRepoRepository.findGitRepoByNameIgnoreCase(name)
-                    .map(GitRepo::getId)
-                    .orElse(null);
-            repo.setId(id);
-            return gitRepoRepository.save(repo);
-        }
-
-        @Override
-        public GitRepo updateRepo(GitRepo repo) {
+        public GitRepo createOrUpdate(GitRepo repo) {
             return gitRepoRepository.save(repo);
         }