[highsource#616] fix PropertyListenerInjectorPlugin setters not updated

Author: laurentschoelens

basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/propertylistenerinjector/PropertyListenerInjectorPlugin.java

@@ -6,10 +6,13 @@
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JMod;
+import com.sun.codemodel.JType;
+import com.sun.codemodel.JVar;
 import com.sun.tools.xjc.Options;
 import com.sun.tools.xjc.Plugin;
 import com.sun.tools.xjc.model.CPluginCustomization;
 import com.sun.tools.xjc.outline.ClassOutline;
+import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.outline.Outline;
 import com.sun.tools.xjc.util.DOMUtils;
 import javax.xml.bind.annotation.XmlTransient;
@@ -73,29 +76,30 @@ public boolean run(Outline model, Options opt, ErrorHandler errorHandler) {
                 interfaceName = globalInterfaceSetting;
             }
             if (VetoableChangeListener.class.getName().equals(interfaceName)) {
-                addSupport(VetoableChangeListener.class, VetoableChangeSupport.class, co.implClass);
+                addSupport(VetoableChangeListener.class, VetoableChangeSupport.class, co);
             }
             if (PropertyChangeListener.class.getName().equals(interfaceName)) {
-                addSupport(PropertyChangeListener.class, PropertyChangeSupport.class, co.implClass);
+                addSupport(PropertyChangeListener.class, PropertyChangeSupport.class, co);
             }
 
         }
 
         return true;
     }
 
-    private void addSupport(Class listener, Class support, JDefinedClass target) {
+    private void addSupport(Class listener, Class support, ClassOutline classOutline) {
 
+        JDefinedClass target = classOutline.implClass;
         // add the support field.
         // JFieldVar field = target.field(JMod.PRIVATE|JMod.TRANSIENT, support, "support");
-        JFieldVar field = target.field(JMod.PRIVATE, support, "support");
+        JFieldVar fieldSupport = target.field(JMod.PRIVATE, support, "support");
 
-        field.annotate(XmlTransient.class);
+        fieldSupport.annotate(XmlTransient.class);
 
         // and initialize it....
-        field.init(JExpr.direct("new " + support.getSimpleName() + "(this)"));
+        fieldSupport.init(JExpr.direct("new " + support.getSimpleName() + "(this)"));
 
-        // we need to hadd
+        // we need to add
         for (Method method : support.getMethods()) {
             if (Modifier.isPublic(method.getModifiers())) {
                 if (method.getName().startsWith("add")) {
@@ -118,6 +122,38 @@ private void addSupport(Class listener, Class support, JDefinedClass target) {
                 }
             }
         }
+
+        final FieldOutline[] declaredFields = classOutline.getDeclaredFields();
+        for (final FieldOutline fieldOutline : declaredFields) {
+
+            final String publicName = fieldOutline.getPropertyInfo().getName(true);
+
+            final String setterName = "set" + publicName;
+
+            final JType rawType = fieldOutline.getRawType();
+            final JMethod boxifiedSetter = target.getMethod(setterName, new JType[] { rawType.boxify() });
+            final JMethod unboxifiedSetter = target.getMethod(setterName, new JType[] { rawType.unboxify() });
+            final JMethod setter = boxifiedSetter != null ? boxifiedSetter : unboxifiedSetter;
+
+            if (setter != null) {
+                final String privateName = fieldOutline.getPropertyInfo().getName(false);
+                final JFieldVar field = target.fields().get(privateName);
+                if (field != null) {
+                    /*
+                     *         String oldValue = this.value;
+                     *         this.value = newValue;
+                     *         this.pcs.firePropertyChange("value", oldValue, newValue);
+                     */
+                    setter.body().pos(0);
+
+                    final JVar oldPropertyValue = setter.body().decl(JMod.FINAL,
+                        rawType, "old" + publicName,
+                        field);
+                    setter.body().pos(setter.body().getContents().size());
+                    setter.body().add(fieldSupport.invoke("firePropertyChange").arg(privateName).arg(oldPropertyValue).arg(field));
+                }
+            }
+        }
     }
 
     private void addMethod(Method method, JDefinedClass target) {

basics/tests/propertylistenerinjector/src/test/java/org/jvnet/jaxb/tests/propertylistenerinjector/AddressTest.java

@@ -1,16 +1,31 @@
 package org.jvnet.jaxb.tests.propertylistenerinjector;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import generated.Address;
 
+import java.beans.PropertyChangeEvent;
+import java.util.ArrayList;
+import java.util.List;
+
 public class AddressTest {
 
     @Test
     public void testAddress() {
+        List<PropertyChangeEvent> events = new ArrayList<>();
+
         Address a = new Address();
-        // just checking new methods have been added
-        a.addPropertyChangeListener(null);
-        a.removePropertyChangeListener(null);
+        a.setStreet("Dollar Lane");
+        a.setCity("Los Angeles");
+
+        a.addPropertyChangeListener("street", events::add);
+        a.setStreet("Penny Lane");
+        a.setCity("New York");
+        Assert.assertEquals(1, events.size());
+        PropertyChangeEvent e = events.get(0);
+        Assert.assertEquals("Dollar Lane", e.getOldValue());
+        Assert.assertEquals("Penny Lane", e.getNewValue());
+        Assert.assertEquals("street", e.getPropertyName());
     }
 }