works with field annotation

verhas · Jun 24, 2019 · 6605a22 · 6605a22
1 parent ad3cf4a
commit 6605a22
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/javageci-core/src/main/java/javax0/geci/accessor/AbstractAccessor.java b/javageci-core/src/main/java/javax0/geci/accessor/AbstractAccessor.java
@@ -17,6 +17,7 @@
 public class AbstractAccessor extends AbstractFilteredFieldsGenerator {
 
     protected static class Config {
+        protected String mnemonic = "";
         protected String access = "public";
         protected String filter = "true";
         protected String getter = null;
@@ -110,6 +111,7 @@ public static AbstractAccessor.Builder builder() {
         "access",
         "filter",
         "getter",
+        "mnemonic",
         "only",
         "setter",
         "id"
@@ -145,6 +147,11 @@ public Builder getterReturnValueDecorator(java.util.function.Function<String,Str
             return this;
         }
 
+        public Builder mnemonic(String mnemonic) {
+            config.mnemonic = mnemonic;
+            return this;
+        }
+
         public Builder only(String only) {
             config.only = only;
             return this;
@@ -176,6 +183,7 @@ private Config localConfig(CompoundParams params){
         local.getter = params.get("getter",config.getter);
         local.getterNameGenerator = config.getterNameGenerator;
         local.getterReturnValueDecorator = config.getterReturnValueDecorator;
+        local.mnemonic = params.get("mnemonic",config.mnemonic);
         local.only = params.get("only",config.only);
         local.processAllClasses = config.processAllClasses;
         local.setter = params.get("setter",config.setter);

diff --git a/javageci-core/src/main/java/javax0/geci/accessor/Accessor.java b/javageci-core/src/main/java/javax0/geci/accessor/Accessor.java
@@ -6,6 +6,10 @@
 
 public class Accessor extends AbstractAccessor {
 
+    public Accessor(){
+        config.mnemonic = "accessor";
+    }
+
 
     @Override
     protected void writeSetter(Field field, String name, String setterName,
@@ -20,7 +24,7 @@ protected void writeSetter(Field field, String name, String setterName,
 
     @Override
     public String mnemonic() {
-        return "accessor";
+        return config.mnemonic;
     }
 
 

diff --git a/javageci-core/src/main/java/javax0/geci/accessor/ChainedAccessor.java b/javageci-core/src/main/java/javax0/geci/accessor/ChainedAccessor.java
@@ -15,6 +15,7 @@ public class ChainedAccessor extends AbstractAccessor {
 
     public ChainedAccessor(){
         config.setterNameGenerator = name -> "with" + ucase(name);
+        config.mnemonic = "caccessor";
     }
 
     @Override
@@ -35,6 +36,6 @@ public static AbstractAccessor.Builder builder() {
     }
     @Override
     public String mnemonic() {
-        return "caccessor";
+        return config.mnemonic;
     }
 }
diff --git a/javageci-examples/src/main/java/javax0/geci/tests/accessors/Getter.java b/javageci-examples/src/main/java/javax0/geci/tests/accessors/Getter.java
@@ -0,0 +1,8 @@
+package javax0.geci.tests.accessors;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Getter {
+}
diff --git a/...ci-examples/src/main/java/javax0/geci/tests/accessors/NeedAccessorFieldAnnotatedOnly.java b/...ci-examples/src/main/java/javax0/geci/tests/accessors/NeedAccessorFieldAnnotatedOnly.java
@@ -1,12 +1,6 @@
 package javax0.geci.tests.accessors;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
 public class NeedAccessorFieldAnnotatedOnly {
-    @Retention(RetentionPolicy.RUNTIME)
-    public @interface Getter {
-    }
 
     @Getter
     private final String apple = "";
@@ -16,9 +10,7 @@ public class NeedAccessorFieldAnnotatedOnly {
 
     protected boolean truth;
     protected int not_this;
-
-
-    //<editor-fold id="accessor">
+    //<editor-fold id="SettersGetters">
     public String getApple(){
         return apple;
     }

diff --git a/javageci-examples/src/test/java/javax0/geci/tests/accessor/TestAccessor.java b/javageci-examples/src/test/java/javax0/geci/tests/accessor/TestAccessor.java
@@ -27,7 +27,7 @@ public void testAllSourcesAccessor() throws Exception {
         Assertions.assertFalse(
                 (geci = new Geci()).source(
                         maven().module("javageci-examples").mainSource()
-                ).register(Accessor.builder().filter("annotation ~ /Getter|Setter/").processAllClasses(true).build()).generate(),
+                ).register(Accessor.builder().mnemonic("SettersGetters").filter("annotation ~ /Getter|Setter/").processAllClasses(true).build()).generate(),
                 geci.failed());
     }