From 8e2de30e69ca74d7689b60144c87035b41c63223 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 12:19:14 +0000
Subject: [PATCH] AbstractCache...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/RepoInfoCache.java | 76 +++++--------------------------------
1 files changed, 11 insertions(+), 65 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/RepoInfoCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/RepoInfoCache.java
index 445d229..d91bc08 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/RepoInfoCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/RepoInfoCache.java
@@ -1,85 +1,31 @@
package de.micromata.borgbutler.cache;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.RepoInfo;
import de.micromata.borgbutler.json.borg.Repository;
-import lombok.Getter;
-import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-public class RepoInfoCache {
+public class RepoInfoCache extends AbstractCache<RepoInfo> {
private static Logger log = LoggerFactory.getLogger(RepoInfoCache.class);
public static final String CACHE_REPOS_FILENAME = "cache-repos.json";
- @JsonIgnore
- private File cacheReposFile;
- @Getter
- @JsonProperty
- private List<RepoInfo> repositories = new ArrayList<>();
-
- public RepoInfo getRepoInfo(String idOrName) {
- if (idOrName == null) {
- return null;
- }
- for (RepoInfo repoInfo : repositories) {
- Repository repository = repoInfo.getRepository();
- if (repository == null) {
- continue;
- }
- if (idOrName.equals(repository.getId()) || idOrName.equals(repository.getName()) || idOrName.equals(repository.getLocation())) {
- return repoInfo;
- }
- }
- return null;
- }
-
- public void upsert(RepoInfo repoInfo) {
- Repository repository = repoInfo.getRepository();
+ public boolean matches(RepoInfo element, String identifier) {
+ Repository repository = element.getRepository();
if (repository == null) {
- log.error("Oups, no repository given in RepoInfo (ignoring it): " + repoInfo);
- return;
+ return false;
}
- RepoInfo existingRepo = getRepoInfo(repository.getId());
- if (existingRepo == null) {
- repositories.add(repoInfo);
- } else {
- existingRepo.updateFrom(repoInfo);
- }
+ return identifier.equals(repository.getId()) || identifier.equals(repository.getName())
+ || identifier.equals(repository.getLocation());
}
- public void read() {
- try {
- String json = FileUtils.readFileToString(cacheReposFile, Charset.forName("UTF-8"));
- RepoInfoCache readCache = JsonUtils.fromJson(this.getClass(), json);
- if (readCache != null) {
- this.repositories = readCache.repositories;
- } else {
- log.error("Error while parsing repos cache: " + cacheReposFile.getAbsolutePath());
- }
- } catch (IOException ex) {
- log.error("Error while trying to read repos cache file '" + cacheReposFile.getAbsolutePath() + "': "
- + ex.getMessage(), ex);
- }
+ public String getIdentifier(RepoInfo element) {
+ return element.getRepository().getId();
}
- public void save() {
- log.info("Saving repo infos to cache file: " + cacheReposFile);
- String json = JsonUtils.toJson(this);
- try {
- FileUtils.write(cacheReposFile, json, Charset.forName("UTF-8"));
- } catch (IOException ex) {
- log.error("Error while trying to write repos cache file '" + cacheReposFile.getAbsolutePath() + "': "
- + ex.getMessage(), ex);
- }
+ public void updateFrom(RepoInfo dest, RepoInfo source) {
+ dest.updateFrom(source);
}
/**
@@ -89,6 +35,6 @@
}
RepoInfoCache(File cacheDir) {
- cacheReposFile = new File(cacheDir, CACHE_REPOS_FILENAME);
+ super(cacheDir, CACHE_REPOS_FILENAME);
}
}
--
Gitblit v1.10.0