move DTO logic near the controller

Author: Vladimir Kotal

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

@@ -34,7 +34,6 @@
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.logger.LoggerFactory;
-import org.opengrok.indexer.util.BeanBuilder;
 import org.opengrok.indexer.util.ClassUtil;
 import org.opengrok.indexer.util.PathUtils;
 
@@ -88,30 +87,6 @@ public RepositoryInfo(RepositoryInfo orig) {
         this.currentVersion = orig.currentVersion;
     }
 
-    /**
-     * @return Data Transfer Object for RepositoryInfo.
-     * It will have the same members as in RepositoryInfo except datePatterns.
-     */
-    public Object getRepositoryInfoData() {
-        return createRepositoryInfoTO();
-    }
-
-    private Object createRepositoryInfoTO() {
-        BeanBuilder builder = new BeanBuilder();
-
-        builder.add("type", String.class, this.type)
-            .add("directoryNameRelative", String.class, this.directoryNameRelative)
-            .add("remote", boolean.class, this.remote)
-            .add("parent", String.class, this.parent)
-            .add("branch", String.class, this.branch)
-            .add("currentVersion", String.class, this.currentVersion)
-            .add("working", Boolean.class, this.working == null ? false : this.working)
-            .add("handleRenamedFiles", boolean.class, this.handleRenamedFiles)
-            .add("historyEnabled", boolean.class, this.historyEnabled);
-
-        return builder.build();
-    }
-
     /**
      * @return true if the repository handles renamed files, false otherwise.
      */

opengrok-web/pom.xml

@@ -148,11 +148,6 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
             <artifactId>org.suigeneris.jrcs.diff</artifactId>
             <version>0.4.2</version>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>3.2.4</version>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -24,6 +24,7 @@
 
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.history.RepositoryInfo;
+import org.opengrok.indexer.util.BeanBuilder;
 import org.opengrok.indexer.util.ClassUtil;
 
 import javax.ws.rs.GET;
@@ -41,10 +42,37 @@ public class RepositoriesController {
 
     private RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
+    static class RepositoryInfoDTO {
+        // Contains all members of RepositoryInfo except datePatterns
+        String directoryNameRelative;
+        Boolean working;
+        String type;
+        boolean remote;
+        String parent;
+        String branch;
+        String currentVersion;
+    }
+
+    private Object createRepositoryInfoTO(RepositoryInfo ri) {
+        BeanBuilder builder = new BeanBuilder();
+        builder.add("type", String.class, ri.getType())
+            .add("directoryNameRelative", String.class, ri.getDirectoryNameRelative())
+            .add("remote", boolean.class, ri.isRemote())
+            .add("parent", String.class, ri.getParent())
+            .add("branch", String.class, ri.getBranch())
+            .add("currentVersion", String.class, ri.getCurrentVersion())
+            .add("working", Boolean.class, ri.isWorking())
+            .add("handleRenamedFiles", boolean.class, ri.isHandleRenamedFiles())
+            .add("historyEnabled", boolean.class, ri.isHistoryEnabled());
+
+        return builder.build();
+    }
+
+
     private Object getRepositoryInfoData(String repositoryPath) {
         for (RepositoryInfo ri : env.getRepositories()) {
             if (ri.getDirectoryNameRelative().equals(repositoryPath)) {
-                return ri.getRepositoryInfoData();
+                return createRepositoryInfoTO(ri);
             }
         }