use DTO to access RepositoryInfo data

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RepositoryInfo.java

@@ -68,6 +68,92 @@ public class RepositoryInfo implements Serializable {
     private boolean handleRenamedFiles;
     private boolean historyEnabled;
 
+    public static class RepositoryInfoTO implements Serializable {
+        private static final long serialVersionUID = -1;
+
+        // same members as in RepositoryInfo except datePatterns
+        private String directoryNameRelative;
+        private boolean working;
+        private String type;
+        private boolean remote;
+        private String parent;
+        private String branch;
+        private String currentVersion;
+        private boolean handleRenamedFiles;
+        private boolean historyEnabled;
+
+        public String getDirectoryNameRelative() {
+            return directoryNameRelative;
+        }
+
+        public void setDirectoryNameRelative(String directoryNameRelative) {
+            this.directoryNameRelative = directoryNameRelative;
+        }
+
+        public boolean isWorking() {
+            return working;
+        }
+
+        public void setWorking(boolean working) {
+            this.working = working;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public boolean isRemote() {
+            return remote;
+        }
+
+        public void setRemote(boolean remote) {
+            this.remote = remote;
+        }
+
+        public String getParent() {
+            return parent;
+        }
+
+        public void setParent(String parent) {
+            this.parent = parent;
+        }
+
+        public String getBranch() {
+            return branch;
+        }
+
+        public void setBranch(String branch) {
+            this.branch = branch;
+        }
+
+        public String getCurrentVersion() {
+            return currentVersion;
+        }
+
+        public void setCurrentVersion(String currentVersion) {
+            this.currentVersion = currentVersion;
+        }
+
+        public boolean isHandleRenamedFiles() {
+            return handleRenamedFiles;
+        }
+
+        public void setHandleRenamedFiles(boolean handleRenamedFiles) {
+            this.handleRenamedFiles = handleRenamedFiles;
+        }
+
+        public boolean isHistoryEnabled() {
+            return historyEnabled;
+        }
+
+        public void setHistoryEnabled(boolean historyEnabled) {
+            this.historyEnabled = historyEnabled;
+        }
+    }
 
     /**
      * Empty constructor to support serialization.
@@ -87,6 +173,34 @@ public RepositoryInfo(RepositoryInfo orig) {
         this.currentVersion = orig.currentVersion;
     }
 
+    /**
+     * @return Data Transfer Object for RepositoryInfo
+     */
+    public RepositoryInfoTO getRepositoryInfoData() {
+        return createRepositoryInfoTO();
+    }
+
+    private RepositoryInfoTO createRepositoryInfoTO() {
+        RepositoryInfoTO ri = new RepositoryInfoTO();
+
+        if (this.working == null) {
+            ri.working = false;
+        } else {
+            ri.working = this.working;
+        }
+
+        ri.directoryNameRelative = this.directoryNameRelative;
+        ri.type = this.type;
+        ri.remote = this.remote;
+        ri.parent = this.parent;
+        ri.branch = this.branch;
+        ri.currentVersion = this.currentVersion;
+        ri.handleRenamedFiles = this.handleRenamedFiles;
+        ri.historyEnabled = this.historyEnabled;
+
+        return ri;
+    }
+
     /**
      * @return true if the repository handles renamed files, false otherwise.
      */
@@ -193,7 +307,7 @@ public boolean isWorking() {
      *
      * @param working is repository working
      */
-    public void setWorking(boolean working) {
+    public void setWorking(Boolean working) {
         this.working = working;
     }
 

opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/RepositoriesController.java

@@ -41,10 +41,10 @@ public class RepositoriesController {
 
     private RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
-    private RepositoryInfo getRepositoryInfo(String repositoryPath) {
+    private RepositoryInfo.RepositoryInfoTO getRepositoryInfoData(String repositoryPath) {
         for (RepositoryInfo ri : env.getRepositories()) {
             if (ri.getDirectoryNameRelative().equals(repositoryPath)) {
-                return ri;
+                return ri.getRepositoryInfoData();
             }
         }
 
@@ -57,7 +57,7 @@ private RepositoryInfo getRepositoryInfo(String repositoryPath) {
     public Object get(@QueryParam("repository") final String repositoryPath, @PathParam("field") final String field)
             throws IOException {
 
-        RepositoryInfo ri = getRepositoryInfo(repositoryPath);
+        RepositoryInfo.RepositoryInfoTO ri = getRepositoryInfoData(repositoryPath);
         if (ri == null) {
             throw new WebApplicationException("cannot find repository with path: " + repositoryPath,
                     Response.Status.NOT_FOUND);