introduce BeanBuilder

Author: Vladimir Kotal

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

@@ -31,10 +31,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.sf.cglib.beans.BeanGenerator;
 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;
 
@@ -97,34 +97,19 @@ public Object getRepositoryInfoData() {
     }
 
     private Object createRepositoryInfoTO() {
-        BeanGenerator beanGenerator = new BeanGenerator();
-        beanGenerator.addProperty("type", String.class);
-        beanGenerator.addProperty("directoryNameRelative", String.class);
-        beanGenerator.addProperty("remote", boolean.class);
-        beanGenerator.addProperty("parent", String.class);
-        beanGenerator.addProperty("branch", String.class);
-        beanGenerator.addProperty("currentVersion", String.class);
-        beanGenerator.addProperty("working", Boolean.class);
-        beanGenerator.addProperty("handleRenamedFiles", boolean.class);
-        beanGenerator.addProperty("historyEnabled", boolean.class);
-
-        Object myBean = beanGenerator.create();
-        try {
-            ClassUtil.setFieldValue(myBean, "type", this.type);
-            ClassUtil.setFieldValue(myBean, "working",
-                    this.working == null ? false : this.working);
-            ClassUtil.setFieldValue(myBean, "directoryNameRelative", this.directoryNameRelative);
-            ClassUtil.setFieldValue(myBean, "remote", this.remote);
-            ClassUtil.setFieldValue(myBean, "parent", this.parent);
-            ClassUtil.setFieldValue(myBean, "branch", this.branch);
-            ClassUtil.setFieldValue(myBean, "currentVersion", this.currentVersion);
-            ClassUtil.setFieldValue(myBean, "handleRenamedFiles", this.handleRenamedFiles);
-            ClassUtil.setFieldValue(myBean, "historyEnabled", this.historyEnabled);
-        } catch (IOException e) {
-            LOGGER.log(Level.WARNING, "cannot generate RepositoryInfo bean", e);
-            return null;
-        }
-        return myBean;
+        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();
     }
 
     /**

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

@@ -0,0 +1,68 @@
+/*
+ * 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 net.sf.cglib.beans.BeanGenerator;
+import org.opengrok.indexer.logger.LoggerFactory;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class BeanBuilder {
+    private BeanGenerator beanGenerator;
+    private Map<String, Object> valueMap;
+
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(BeanBuilder.class);
+
+    public BeanBuilder() {
+        beanGenerator = new BeanGenerator();
+        valueMap = new HashMap<>();
+    }
+
+    public BeanBuilder add(String name, Class<?> type, Object value) {
+        beanGenerator.addProperty(name, type);
+        valueMap.put(name, value);
+
+        return this;
+    }
+
+    public Object build() {
+        Object myBean = beanGenerator.create();
+
+        for (String name : valueMap.keySet()) {
+            try {
+                ClassUtil.setFieldValue(myBean, name, valueMap.get(name));
+            } catch (IOException e) {
+                LOGGER.log(Level.WARNING, "cannot generate RepositoryInfo bean", e);
+                return null;
+            }
+        }
+
+        return myBean;
+    }
+}