use annotation to generate DTO

Author: Vladimir Kotal

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

@@ -35,6 +35,7 @@
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.logger.LoggerFactory;
 import org.opengrok.indexer.util.ClassUtil;
+import org.opengrok.indexer.util.DTOElement;
 import org.opengrok.indexer.util.PathUtils;
 
 /**
@@ -55,18 +56,26 @@ public class RepositoryInfo implements Serializable {
 
     private static final long serialVersionUID = 3L;
 
+    @DTOElement
     private String directoryNameRelative;
     private transient String directoryNameCanonical;
 
+    @DTOElement
     protected Boolean working;
+    @DTOElement
     protected String type;  // type of the repository, should be unique
+    @DTOElement
     protected boolean remote;
     protected String[] datePatterns = new String[0];
+    @DTOElement
     protected String parent;
+    @DTOElement
     protected String branch;
+    @DTOElement
     protected String currentVersion;
-
+    @DTOElement
     private boolean handleRenamedFiles;
+    @DTOElement
     private boolean historyEnabled;
 
     /**

opengrok-indexer/src/main/java/org/opengrok/indexer/util/DTOElement.java

@@ -0,0 +1,35 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ */
+
+package org.opengrok.indexer.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface DTOElement {
+    String key() default "";
+}

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

@@ -27,6 +27,7 @@
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.history.RepositoryInfo;
 import org.opengrok.indexer.util.ClassUtil;
+import org.opengrok.indexer.util.DTOElement;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -44,22 +45,13 @@ 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) {
         // ModelMapper assumes getters/setters so use BeanGenerator to provide them.
         BeanGenerator beanGenerator = new BeanGenerator();
-        for (Field field : RepositoryInfoDTO.class.getDeclaredFields()) {
-            beanGenerator.addProperty(field.getName(), field.getType());
+        for (Field field : RepositoryInfo.class.getDeclaredFields()) {
+            if (field.isAnnotationPresent(DTOElement.class)) {
+                beanGenerator.addProperty(field.getName(), field.getType());
+            }
         }
         Object bean = beanGenerator.create();