- B PackageSettings now allows for private constructor (fixes #370)

Co-authored-by: Jay Bazuzi <[email protected]>
Co-authored-by: Llewellyn Falco <[email protected]>

Author: 3 people

approvaltests-tests/src/test/java/org/packagesettings/subpackage/PackageSettings.java

@@ -5,4 +5,7 @@ public class PackageSettings
   public String   name        = "Test Name";
   private boolean rating      = true;
   public String   ratingScale = "logarithmic";
+  private PackageSettings()
+  {
+  }
 }

approvaltests-util/src/main/java/org/packagesettings/PackageLevelSettings.java

@@ -1,16 +1,18 @@
 package org.packagesettings;
 
-import com.spun.util.ObjectUtils;
-import com.spun.util.ThreadUtils;
-import org.lambda.functions.Function0;
-
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
+import org.lambda.functions.Function0;
+
+import com.spun.util.ObjectUtils;
+import com.spun.util.ThreadUtils;
+
 public class PackageLevelSettings
 {
   public static String PACKAGE_SETTINGS = "PackageSettings";
@@ -48,7 +50,7 @@ private static Map<String, Settings> getSettingsFor(String packageName, HashSet<
     {
       Class<?> clazz = loadClass(packageName + "." + PACKAGE_SETTINGS);
       Field[] declaredFields = clazz.getDeclaredFields();
-      Object o = clazz.newInstance();
+      Object o = createInstance(clazz);
       for (Field field : declaredFields)
       {
         if (Modifier.isStatic(field.getModifiers()))
@@ -83,6 +85,13 @@ private static Settings getFieldValue(Field field, Object from)
     return null;
   }
 
+  private static Object createInstance(Class<?> clazz) throws Exception
+  {
+    Constructor<?> constructor = clazz.getDeclaredConstructor();
+    constructor.setAccessible(true);
+    return constructor.newInstance();
+  }
+
   public static String getNextLevel(String className)
   {
     int last = className.lastIndexOf(".");