From af52d0914ffb0ae4a5cd4fef574fc3d659f03473 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 14 Dec 2018 06:06:22 +0000
Subject: [PATCH] RepositoryMatcher not needed anymore (was used before JCS was used).

---
 borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoInfo.java    |   17 +++++++++--------
 borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoList.java    |   16 +++++++++-------
 borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/ArchiveInfo.java |   11 +++--------
 borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/Repository.java  |    3 +++
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/ArchiveInfo.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/ArchiveInfo.java
index 671c908..d158aa4 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/ArchiveInfo.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/ArchiveInfo.java
@@ -10,7 +10,7 @@
 /**
  * Result of <tt>borg info repo::archive</tt>.
  */
-public class ArchiveInfo extends RepositoryMatcher implements Serializable {
+public class ArchiveInfo implements Serializable {
     private static final long serialVersionUID = -4200553322856662346L;
     @Getter
     private List<Archive2> archives;
@@ -19,14 +19,9 @@
     @Getter
     private Encryption encryption;
     @Getter
+    private Repository repository;
+    @Getter
     @Setter
     @JsonIgnore
     private String originalJson;
-
-    public void updateFrom(ArchiveInfo archiveList) {
-        super.updateFrom(archiveList);
-        this.archives = archiveList.archives;
-        this.cache = archiveList.cache;
-        this.encryption = archiveList.encryption;
-    }
 }
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoInfo.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoInfo.java
index 9578834..a424182 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoInfo.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoInfo.java
@@ -1,14 +1,16 @@
 package de.micromata.borgbutler.json.borg;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
 /**
  * Result of borg info repo
  */
-public class RepoInfo extends RepositoryMatcher implements Serializable {
+public class RepoInfo implements Serializable {
     private static final long serialVersionUID = -1588038325129799400L;
     @Getter
     @JsonProperty("security_dir")
@@ -17,11 +19,10 @@
     private Cache cache;
     @Getter
     private Encryption encryption;
-
-    public void updateFrom(RepoInfo repoInfo) {
-        super.updateFrom(repoInfo);
-        this.securityDir = repoInfo.securityDir;
-        this.cache = repoInfo.cache;
-        this.encryption = repoInfo.encryption;
-    }
+    @Getter
+    private Repository repository;
+    @Getter
+    @Setter
+    @JsonIgnore
+    protected String originalJson;
 }
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoList.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoList.java
index a8151c1..c9842ae 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoList.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/RepoList.java
@@ -1,6 +1,8 @@
 package de.micromata.borgbutler.json.borg;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.List;
@@ -8,16 +10,16 @@
 /**
  * Result of borg list repo
  */
-public class RepoList extends RepositoryMatcher implements Serializable {
+public class RepoList implements Serializable {
     private static final long serialVersionUID = 1006757749929526034L;
     @Getter
     private List<Archive> archives;
     @Getter
     private Encryption encryption;
-
-    public void updateFrom(RepoList repoList) {
-        super.updateFrom(repoList);
-        this.archives = repoList.archives;
-        this.encryption = repoList.encryption;
-    }
+    @Getter
+    private Repository repository;
+    @Getter
+    @Setter
+    @JsonIgnore
+    protected String originalJson;
 }
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/Repository.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/Repository.java
index bc6895c..26da4c3 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/Repository.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/Repository.java
@@ -8,6 +8,9 @@
 
 import java.io.Serializable;
 
+/**
+ * Part of Borg json objects to refer objects to repositories.
+ */
 public class Repository implements Serializable {
     private static final long serialVersionUID = 1278802519434516280L;
     /**

--
Gitblit v1.10.0