Merge pull request #50 from alecigne/feature/no-empty-commit

Do not create empty commits

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>net.lecigne</groupId>
   <artifactId>deezer-datasync</artifactId>
-  <version>0.4.3</version>
+  <version>0.5.0-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.source>17</maven.compiler.source>

src/main/java/net/lecigne/deezerdatasync/model/PlaylistInfo.java

@@ -1,6 +1,5 @@
 package net.lecigne.deezerdatasync.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.Duration;
 import java.time.Instant;
 import lombok.Getter;

src/main/java/net/lecigne/deezerdatasync/repository/destinations/github/GitHubBackup.java

@@ -1,10 +1,8 @@
 package net.lecigne.deezerdatasync.repository.destinations.github;
 
 import java.util.List;
-import java.util.stream.Stream;
 import lombok.Builder;
 import lombok.Getter;
-import net.lecigne.deezerdatasync.model.DeezerData;
 
 @Getter
 @Builder

src/main/java/net/lecigne/deezerdatasync/repository/destinations/github/GitHubSyncDestination.java

@@ -31,12 +31,17 @@ public void save(DeezerData deezerData) {
       String latestCommitSha = getLatestCommitSha(repo);
       log.debug("Latest commit SHA: {}", latestCommitSha);
       GHTree newTree = createNewTree(repo, deezerData, latestCommitSha);
+      if (isSameTree(newTree, repo.getCommit(latestCommitSha).getTree())) {
+        log.debug("No changes detected, skipping commit.");
+        return;
+      }
       GHCommit commit = createCommit(repo, newTree, latestCommitSha);
       log.debug("New Commit SHA: {}", commit.getSHA1());
       updateBranch(repo, commit);
     } catch (IOException e) {
-      log.error("Error while saving to GitHub", e);
-      throw new RuntimeException(e);
+      var err = "Error while saving to GitHub";
+      log.error(err, e);
+      throw new GitHubSyncException(err, e);
     }
   }
 
@@ -61,6 +66,10 @@ private GHTree createNewTree(GHRepository repo, DeezerData deezerData, String la
     return treeBuilder.create();
   }
 
+  private boolean isSameTree(GHTree newTree, GHTree oldTree) {
+    return newTree.getSha().equals(oldTree.getSha());
+  }
+
   private GHCommit createCommit(GHRepository repo, GHTree newTree, String latestCommitSha) throws IOException {
     String commitMessage = String.format("Backup %s", LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE));
     return repo.createCommit()

src/main/java/net/lecigne/deezerdatasync/repository/destinations/github/GitHubSyncException.java

@@ -0,0 +1,7 @@
+package net.lecigne.deezerdatasync.repository.destinations.github;
+
+public class GitHubSyncException extends RuntimeException {
+  public GitHubSyncException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}

src/main/java/net/lecigne/deezerdatasync/utils/Extensions.java

@@ -2,7 +2,10 @@
 
 import java.util.List;
 
-public class Extensions {
+public final class Extensions {
+
+  private Extensions() {
+  }
 
   public static <T> List<T> ifEmpty(List<T> sourceList, List<T> otherList) {
     return sourceList == null || sourceList.isEmpty() ? otherList : sourceList;

src/test/java/net/lecigne/deezerdatasync/repository/destinations/github/GitHubMapperPropertyTest.java

@@ -10,7 +10,6 @@
 import net.jqwik.api.constraints.StringLength;
 import net.lecigne.deezerdatasync.model.DeezerData;
 import net.lecigne.deezerdatasync.model.Playlist;
-import org.junit.jupiter.api.DisplayName;
 
 @Label("The GitHub mapper")
 public class GitHubMapperPropertyTest {