abstract DTO manipulation to utility class

Author: Vladimir Kotal

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

@@ -22,12 +22,10 @@
  */
 package org.opengrok.web.api.v1.controller;
 
-import net.sf.cglib.beans.BeanGenerator;
-import org.modelmapper.ModelMapper;
 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 org.opengrok.web.util.DTO;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -38,31 +36,16 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
-import java.lang.reflect.Field;
 
 @Path("/repositories")
 public class RepositoriesController {
 
     private RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
-    private Object createRepositoryInfoTO(RepositoryInfo ri) {
-        // ModelMapper assumes getters/setters so use BeanGenerator to provide them.
-        BeanGenerator beanGenerator = new BeanGenerator();
-        for (Field field : RepositoryInfo.class.getDeclaredFields()) {
-            if (field.isAnnotationPresent(DTOElement.class)) {
-                beanGenerator.addProperty(field.getName(), field.getType());
-            }
-        }
-        Object bean = beanGenerator.create();
-
-        ModelMapper modelMapper = new ModelMapper();
-        return modelMapper.map(ri, bean.getClass());
-    }
-
     private Object getRepositoryInfoData(String repositoryPath) {
         for (RepositoryInfo ri : env.getRepositories()) {
             if (ri.getDirectoryNameRelative().equals(repositoryPath)) {
-                return createRepositoryInfoTO(ri);
+                return DTO.createDTO(ri);
             }
         }
 

opengrok-web/src/main/java/org/opengrok/web/util/DTO.java

@@ -0,0 +1,49 @@
+/*
+ * 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.web.util;
+
+import net.sf.cglib.beans.BeanGenerator;
+import org.modelmapper.ModelMapper;
+import org.opengrok.indexer.util.DTOElement;
+
+import java.lang.reflect.Field;
+
+public class DTO {
+    private DTO() {
+        // private to ensure static
+    }
+
+    public static Object createDTO(Object object) {
+        // ModelMapper assumes getters/setters so use BeanGenerator to provide them.
+        BeanGenerator beanGenerator = new BeanGenerator();
+        for (Field field : object.getClass().getDeclaredFields()) {
+            if (field.isAnnotationPresent(DTOElement.class)) {
+                beanGenerator.addProperty(field.getName(), field.getType());
+            }
+        }
+        Object bean = beanGenerator.create();
+
+        ModelMapper modelMapper = new ModelMapper();
+        return modelMapper.map(object, bean.getClass());
+    }
+}