Reduce proliferation of java.beans.PropertyDescriptor (preparation to…

… make it easier to use optaplanner on android)
kiegroup · Feb 19, 2015 · 94077fc · 94077fc
1 parent 90fd390
commit 94077fc
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 32 deletions.
diff --git a/...core/src/main/java/org/optaplanner/core/impl/domain/common/DefaultReadMethodAccessor.java b/...core/src/main/java/org/optaplanner/core/impl/domain/common/DefaultReadMethodAccessor.java
@@ -16,12 +16,11 @@
 
 package org.optaplanner.core.impl.domain.common;
 
-import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 /**
- * Wraps {@link PropertyDescriptor} for faster and easier access.
+ * Wraps {@link Method} for faster and easier access.
  */
 public final class DefaultReadMethodAccessor implements ReadMethodAccessor {
 

diff --git a/...re/src/main/java/org/optaplanner/core/impl/domain/entity/descriptor/EntityDescriptor.java b/...re/src/main/java/org/optaplanner/core/impl/domain/entity/descriptor/EntityDescriptor.java
@@ -39,6 +39,8 @@
 import org.optaplanner.core.api.domain.variable.PlanningVariable;
 import org.optaplanner.core.config.heuristic.selector.common.decorator.SelectionSorterOrder;
 import org.optaplanner.core.config.util.ConfigUtils;
+import org.optaplanner.core.impl.domain.common.PropertyAccessor;
+import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.policy.DescriptorPolicy;
 import org.optaplanner.core.impl.domain.solution.descriptor.SolutionDescriptor;
 import org.optaplanner.core.impl.domain.variable.anchor.AnchorShadowVariableDescriptor;
@@ -183,24 +185,25 @@ private void processPropertyAnnotations(DescriptorPolicy descriptorPolicy) {
                                 + " annotated property (" + propertyDescriptor.getName()
                                 + ") that should have a setter.");
                     }
+                    PropertyAccessor propertyAccessor = new ReflectionPropertyAccessor(propertyDescriptor);
                     if (variableAnnotationClass.equals(PlanningVariable.class)) {
                         GenuineVariableDescriptor variableDescriptor = new GenuineVariableDescriptor(
-                                this, propertyDescriptor);
+                                this, propertyAccessor);
                         declaredGenuineVariableDescriptorMap.put(propertyDescriptor.getName(), variableDescriptor);
                         variableDescriptor.processAnnotations(descriptorPolicy);
                     } else if (variableAnnotationClass.equals(InverseRelationShadowVariable.class)) {
                         ShadowVariableDescriptor variableDescriptor = new InverseRelationShadowVariableDescriptor(
-                                this, propertyDescriptor);
+                                this, propertyAccessor);
                         declaredShadowVariableDescriptorMap.put(propertyDescriptor.getName(), variableDescriptor);
                         variableDescriptor.processAnnotations(descriptorPolicy);
                     } else if (variableAnnotationClass.equals(AnchorShadowVariable.class)) {
                         ShadowVariableDescriptor variableDescriptor = new AnchorShadowVariableDescriptor(
-                                this, propertyDescriptor);
+                                this, propertyAccessor);
                         declaredShadowVariableDescriptorMap.put(propertyDescriptor.getName(), variableDescriptor);
                         variableDescriptor.processAnnotations(descriptorPolicy);
                     } else if (variableAnnotationClass.equals(CustomShadowVariable.class)) {
                         ShadowVariableDescriptor variableDescriptor = new CustomShadowVariableDescriptor(
-                                this, propertyDescriptor);
+                                this, propertyAccessor);
                         declaredShadowVariableDescriptorMap.put(propertyDescriptor.getName(), variableDescriptor);
                         variableDescriptor.processAnnotations(descriptorPolicy);
                     } else {

diff --git a/...java/org/optaplanner/core/impl/domain/variable/anchor/AnchorShadowVariableDescriptor.java b/...java/org/optaplanner/core/impl/domain/variable/anchor/AnchorShadowVariableDescriptor.java
@@ -16,9 +16,9 @@
 
 package org.optaplanner.core.impl.domain.variable.anchor;
 
-import java.beans.PropertyDescriptor;
-
 import org.optaplanner.core.api.domain.variable.AnchorShadowVariable;
+import org.optaplanner.core.impl.domain.common.PropertyAccessor;
+import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
 import org.optaplanner.core.impl.domain.policy.DescriptorPolicy;
 import org.optaplanner.core.impl.domain.variable.descriptor.GenuineVariableDescriptor;
@@ -35,8 +35,8 @@ public class AnchorShadowVariableDescriptor extends ShadowVariableDescriptor {
     protected VariableDescriptor sourceVariableDescriptor;
 
     public AnchorShadowVariableDescriptor(EntityDescriptor entityDescriptor,
-            PropertyDescriptor propertyDescriptor) {
+            PropertyAccessor variablePropertyAccessor) {
-        super(entityDescriptor, propertyDescriptor);
+        super(entityDescriptor, variablePropertyAccessor);
     }
 
     public void processAnnotations(DescriptorPolicy descriptorPolicy) {

diff --git a/...java/org/optaplanner/core/impl/domain/variable/custom/CustomShadowVariableDescriptor.java b/...java/org/optaplanner/core/impl/domain/variable/custom/CustomShadowVariableDescriptor.java
@@ -16,13 +16,14 @@
 
 package org.optaplanner.core.impl.domain.variable.custom;
 
-import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.optaplanner.core.api.domain.variable.CustomShadowVariable;
 import org.optaplanner.core.config.util.ConfigUtils;
+import org.optaplanner.core.impl.domain.common.PropertyAccessor;
+import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
 import org.optaplanner.core.impl.domain.policy.DescriptorPolicy;
 import org.optaplanner.core.impl.domain.solution.descriptor.SolutionDescriptor;
@@ -38,8 +39,8 @@ public class CustomShadowVariableDescriptor extends ShadowVariableDescriptor {
     protected List<VariableDescriptor> sourceVariableDescriptorList;
 
     public CustomShadowVariableDescriptor(EntityDescriptor entityDescriptor,
-            PropertyDescriptor propertyDescriptor) {
+            PropertyAccessor variablePropertyAccessor) {
-        super(entityDescriptor, propertyDescriptor);
+        super(entityDescriptor, variablePropertyAccessor);
     }
 
     public void processAnnotations(DescriptorPolicy descriptorPolicy) {

diff --git a/.../java/org/optaplanner/core/impl/domain/variable/descriptor/GenuineVariableDescriptor.java b/.../java/org/optaplanner/core/impl/domain/variable/descriptor/GenuineVariableDescriptor.java
@@ -16,7 +16,6 @@
 
 package org.optaplanner.core.impl.domain.variable.descriptor;
 
-import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,6 +31,8 @@
 import org.optaplanner.core.api.domain.variable.PlanningVariableGraphType;
 import org.optaplanner.core.config.heuristic.selector.common.decorator.SelectionSorterOrder;
 import org.optaplanner.core.config.util.ConfigUtils;
+import org.optaplanner.core.impl.domain.common.PropertyAccessor;
+import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
 import org.optaplanner.core.impl.domain.policy.DescriptorPolicy;
 import org.optaplanner.core.impl.domain.valuerange.descriptor.CompositeValueRangeDescriptor;
@@ -57,8 +58,8 @@ public class GenuineVariableDescriptor extends VariableDescriptor {
     private SelectionSorter decreasingStrengthSorter;
 
     public GenuineVariableDescriptor(EntityDescriptor entityDescriptor,
-            PropertyDescriptor propertyDescriptor) {
+            PropertyAccessor variablePropertyAccessor) {
-        super(entityDescriptor, propertyDescriptor);
+        super(entityDescriptor, variablePropertyAccessor);
     }
 
     public void processAnnotations(DescriptorPolicy descriptorPolicy) {

diff --git a/...n/java/org/optaplanner/core/impl/domain/variable/descriptor/ShadowVariableDescriptor.java b/...n/java/org/optaplanner/core/impl/domain/variable/descriptor/ShadowVariableDescriptor.java
@@ -16,8 +16,8 @@
 
 package org.optaplanner.core.impl.domain.variable.descriptor;
 
-import java.beans.PropertyDescriptor;
+import org.optaplanner.core.impl.domain.common.PropertyAccessor;
-
+import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
 import org.optaplanner.core.impl.domain.policy.DescriptorPolicy;
 import org.optaplanner.core.impl.domain.variable.listener.VariableListener;
@@ -28,8 +28,8 @@
 public abstract class ShadowVariableDescriptor extends VariableDescriptor {
 
     public ShadowVariableDescriptor(EntityDescriptor entityDescriptor,
-            PropertyDescriptor propertyDescriptor) {
+            PropertyAccessor variablePropertyAccessor) {
-        super(entityDescriptor, propertyDescriptor);
+        super(entityDescriptor, variablePropertyAccessor);
     }
 
     public abstract void processAnnotations(DescriptorPolicy descriptorPolicy);

diff --git a/...rc/main/java/org/optaplanner/core/impl/domain/variable/descriptor/VariableDescriptor.java b/...rc/main/java/org/optaplanner/core/impl/domain/variable/descriptor/VariableDescriptor.java
@@ -16,17 +16,12 @@
 
 package org.optaplanner.core.impl.domain.variable.descriptor;
 
-import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import org.optaplanner.core.impl.domain.common.PropertyAccessor;
 import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
-import org.optaplanner.core.impl.domain.variable.listener.VariableListener;
-import org.optaplanner.core.impl.domain.variable.supply.Demand;
-import org.optaplanner.core.impl.domain.variable.supply.Supply;
 
 public abstract class VariableDescriptor {
 
@@ -37,10 +32,9 @@ public abstract class VariableDescriptor {
 
     private List<ShadowVariableDescriptor> shadowVariableDescriptorList = new ArrayList<ShadowVariableDescriptor>(4);
 
-    public VariableDescriptor(EntityDescriptor entityDescriptor,
+    public VariableDescriptor(EntityDescriptor entityDescriptor, PropertyAccessor variablePropertyAccessor) {
-            PropertyDescriptor propertyDescriptor) {
         this.entityDescriptor = entityDescriptor;
-        variablePropertyAccessor = new ReflectionPropertyAccessor(propertyDescriptor);
+        this.variablePropertyAccessor = variablePropertyAccessor;
         variableName = variablePropertyAccessor.getName();
     }
 

diff --git a/...er/core/impl/domain/variable/inverserelation/InverseRelationShadowVariableDescriptor.java b/...er/core/impl/domain/variable/inverserelation/InverseRelationShadowVariableDescriptor.java
@@ -16,9 +16,9 @@
 
 package org.optaplanner.core.impl.domain.variable.inverserelation;
 
-import java.beans.PropertyDescriptor;
-
 import org.optaplanner.core.api.domain.variable.InverseRelationShadowVariable;
+import org.optaplanner.core.impl.domain.common.PropertyAccessor;
+import org.optaplanner.core.impl.domain.common.ReflectionPropertyAccessor;
 import org.optaplanner.core.impl.domain.entity.descriptor.EntityDescriptor;
 import org.optaplanner.core.impl.domain.policy.DescriptorPolicy;
 import org.optaplanner.core.impl.domain.variable.descriptor.GenuineVariableDescriptor;
@@ -33,8 +33,8 @@ public class InverseRelationShadowVariableDescriptor extends ShadowVariableDescr
     protected VariableDescriptor sourceVariableDescriptor;
 
     public InverseRelationShadowVariableDescriptor(EntityDescriptor entityDescriptor,
-            PropertyDescriptor propertyDescriptor) {
+            PropertyAccessor variablePropertyAccessor) {
-        super(entityDescriptor, propertyDescriptor);
+        super(entityDescriptor, variablePropertyAccessor);
     }
 
     public void processAnnotations(DescriptorPolicy descriptorPolicy) {