Adjusments on #654 PR

Author: laurentschoelens

jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/nobean/NoGettersPlugin.java

@@ -4,7 +4,9 @@
 import com.sun.tools.xjc.Options;
 import com.sun.tools.xjc.Plugin;
 import com.sun.tools.xjc.outline.ClassOutline;
+import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.outline.Outline;
+import org.jvnet.jaxb.plugin.util.FieldOutlineUtils;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 
@@ -35,9 +37,12 @@ public String getUsage() {
     @Override
     public boolean run(Outline model, Options opts, ErrorHandler errors) throws SAXException {
         for (ClassOutline co : model.getClasses()) {
-            Collection<JMethod> methods = co.implClass.methods();
-            methods.removeIf(next -> next.name().startsWith("get"));
-            methods.removeIf(next -> next.name().startsWith("is"));
+            for (FieldOutline fo : co.getDeclaredFields()) {
+                String getterSuffix = fo.getPropertyInfo().getName(true);
+                String getterName = "get" + getterSuffix;
+                String isGetterName = "is" + getterSuffix;
+                co.implClass.methods().removeIf(n -> getterName.equals(n.name()) || isGetterName.equals(n.name()));
+            }
         }
         return true;
     }

jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/nobean/NoSettersPlugin.java

@@ -4,6 +4,7 @@
 import com.sun.tools.xjc.Options;
 import com.sun.tools.xjc.Plugin;
 import com.sun.tools.xjc.outline.ClassOutline;
+import com.sun.tools.xjc.outline.FieldOutline;
 import com.sun.tools.xjc.outline.Outline;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -35,8 +36,10 @@ public String getUsage() {
     @Override
     public boolean run(Outline model, Options opts, ErrorHandler errors) throws SAXException {
         for (ClassOutline co : model.getClasses()) {
-            Collection<JMethod> methods = co.implClass.methods();
-            methods.removeIf(next -> next.name().startsWith("set"));
+            for (FieldOutline fo : co.getDeclaredFields()) {
+                String setterName = "set" + fo.getPropertyInfo().getName(true);
+                co.implClass.methods().removeIf(n -> setterName.equals(n.name()));
+            }
         }
         return true;
     }

jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/nobean/tests/NoGettersPluginTest.java

@@ -46,7 +46,8 @@ public void testExecute() throws Exception {
             List<String> lines = Files.readAllLines(javaFile);
             for (int i = 0; i < lines.size(); i++) {
                 String line = lines.get(i);
-                if (line.matches("^ *public [a-zA-Z]+ (isSet|get)[A-Z]\\w+\\(\\) \\{")) {
+                if (line.matches("^ *public [a-zA-Z]+ (is|get)[A-Z]\\w+\\(\\) \\{")
+                    && !line.matches("^ *public boolean isSet[A-Z]\\w*\\(\\) \\{")) {
                     String fileLinePath = getGeneratedDirectory()
                                               .toPath()
                                               .relativize(javaFile)