Issue #285 - Clear code

powerunit · May 19, 2020 · 40e0d9e · 40e0d9e
1 parent f836acf
commit 40e0d9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/...ensions/matchers/provideprocessor/ProvidesMatchersAnnotatedElementFieldMatcherMirror.java b/...ensions/matchers/provideprocessor/ProvidesMatchersAnnotatedElementFieldMatcherMirror.java
@@ -103,16 +103,14 @@ public String generateMetadata() {
 		        + "   * Metadata regarding this matcher.\n"
 				+ "   */\n"
 				+ "  public static final Metadata METADATA = new Metadata();\n\n"
+				+"   public static final class FieldMetadata {\n    public final String NAME, TYPE, ACCESSOR;\n    public final boolean IGNORED;\n    private FieldMetadata(String name, String type, String accessor, boolean ignored) {\n      NAME=name; TYPE=type; ACCESSOR=accessor; IGNORED=ignored;\n    }\n  }\n\n"
 				+ "  public static final class Metadata {\n\n"
 				+ "    private Metadata() {}\n\n"
-				+ "    public static final String ANNOTATION_PROCESSOR_VERSION = \"" + getAnnotationProcessorVersion() + "\";\n\n"
-				+ "    public static final String SOURCE_CLASS_NAME = \"" + getFullyQualifiedNameOfClassAnnotatedWithProvideMatcherWithGeneric() + "\";\n\n"
-				+ "    public static final Class<"+getFullyQualifiedNameOfClassAnnotated()+"> SOURCE_CLASS = " + getFullyQualifiedNameOfClassAnnotated() + ".class;\n\n"
-				+ "    public static final String SOURCE_PARENT_CLASS_NAME = " + fullyQualifiedNameOfSuperClassOfClassAnnotated.map(CommonUtils::toJavaSyntax).orElse("null") + ";\n\n"
-				+ "    public static final String[] FIELD_NAMES = new String[]{ " +ListJoining.<AbstractFieldDescription>joinWithMapperAndDelimiter(f->CommonUtils.toJavaSyntax(f.getFieldName()), ", ").asString(fields) + " };\n\n"
-				+ "    public static final String[] FIELD_TYPES = new String[]{ " +ListJoining.<AbstractFieldDescription>joinWithMapperAndDelimiter(f->CommonUtils.toJavaSyntax(f.getFieldType()), ", ").asString(fields) + " };\n\n"
-				+ "    public static final String[] FIELD_ACCESSORS = new String[]{ " +ListJoining.<AbstractFieldDescription>joinWithMapperAndDelimiter(f->CommonUtils.toJavaSyntax(f.getFieldAccessor()), ", ").asString(fields) + " };\n\n"
-				+ "    public static final boolean[] FIELD_IGNORED = new boolean[]{ " +ListJoining.<AbstractFieldDescription>joinWithMapperAndDelimiter(f->Boolean.toString(f instanceof IgoreFieldDescription), ", ").asString(fields) + " };\n\n"
+				+ "    public final String ANNOTATION_PROCESSOR_VERSION = \"" + getAnnotationProcessorVersion() + "\";\n\n"
+				+ "    public final String SOURCE_CLASS_NAME = \"" + getFullyQualifiedNameOfClassAnnotatedWithProvideMatcherWithGeneric() + "\";\n\n"
+				+ "    public final Class<"+getFullyQualifiedNameOfClassAnnotated()+"> SOURCE_CLASS = " + getFullyQualifiedNameOfClassAnnotated() + ".class;\n\n"
+				+ "    public final String SOURCE_PARENT_CLASS_NAME = " + fullyQualifiedNameOfSuperClassOfClassAnnotated.map(CommonUtils::toJavaSyntax).orElse("null") + ";\n\n"
+				+ "    public final FieldMetadata[] FIELDS = new FieldMetadata[]{ " +ListJoining.<AbstractFieldDescription>joinWithMapperAndDelimiter(f->f.generateMetadata("FieldMetadata"), ", ").asString(fields) + " };\n\n"
 				+ "  }\n";
 		// @formatter:on
 	}

diff --git a/...va/ch/powerunit/extensions/matchers/provideprocessor/fields/FieldDescriptionMetaData.java b/...va/ch/powerunit/extensions/matchers/provideprocessor/fields/FieldDescriptionMetaData.java
@@ -26,6 +26,7 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
+import ch.powerunit.extensions.matchers.common.CommonUtils;
 import ch.powerunit.extensions.matchers.provideprocessor.ProvidesMatchersAnnotatedElementData;
 import ch.powerunit.extensions.matchers.provideprocessor.RoundMirror;
 import ch.powerunit.extensions.matchers.provideprocessor.xml.GeneratedMatcherField;
@@ -35,7 +36,7 @@ public abstract class FieldDescriptionMetaData extends AbstractFieldDescriptionC
 	public static final String SEE_TEXT_FOR_IS_MATCHER = "org.hamcrest.Matchers#is(java.lang.Object)";
 	public static final String SEE_TEXT_FOR_HAMCREST_MATCHER = "org.hamcrest.Matchers The main class from hamcrest that provides default matchers.";
 	public static final String MATCHERS = "org.hamcrest.Matchers";
-	
+
 	protected final String generic;
 	protected final String defaultReturnMethod;
 	protected final String fullyQualifiedNameMatcherInSameRound;
@@ -151,4 +152,10 @@ public GeneratedMatcherField asGeneratedMatcherField() {
 		return gmf;
 	}
 
+	public String generateMetadata(String className) {
+		return "new " + className + "(" + CommonUtils.toJavaSyntax(getFieldName()) + ","
+				+ CommonUtils.toJavaSyntax(getFieldType()) + "," + CommonUtils.toJavaSyntax(getFieldAccessor()) + ","
+				+ Boolean.toString(this instanceof IgoreFieldDescription) + ")";
+	}
+
 }