removed DslBinCustom annotation, its attributes moved to @bin, renamed @bin extra attribute

Author: raydac

README.md

@@ -16,10 +16,11 @@ For instance I have been very actively using the framework in [the ZX-Poly emula
 
 # Change log
 - **2.0.0-SNAPSHOT**
+ - __removed DslBinCustom annotation, use @Bin annotation instead__
+ - __renamed attributes of @Bin annotation to their correct form__
  - __reworked object mapping system, removed hacks to instantiate classes, now only mapping to objects allowed, support of private fields mapping is removed__
  - __minimal JDK version now 1.8+__
  - __minimal Android API now 3.0+__
- - __renamed attributes of @Bin annotation, removed `out` prefix__
  - added support of getters and setters into mapping
  - added `Object newInstance(Class)` method support of mapped classes to generate instances for local classes 
  - added generating of `makeFIELD()` method for structure types in Java class converter

changelog.txt

@@ -1,8 +1,9 @@
 2.0.0-SNAPSHOT
+ - __removed DslBinCustom annotation, use @Bin annotation instead__
+ - __renamed attributes of @Bin annotation to their correct form__
  - __reworked object mapping system, removed hacks to instantiate classes, now only mapping to objects allowed, support of private fields mapping is removed__
  - __minimal JDK version now 1.8+__
  - __minimal Android API now 3.0+__
- - __renamed attributes of @Bin annotation, removed `out` prefix__
  - added support of getters and setters into mapping
  - added `Object newInstance(Class)` method support of mapped classes to generate instances for local classes
  - added generating of `makeFIELD()` method for structure types in Java class converter

jbbp/src/main/java/com/igormaznitsa/jbbp/io/AbstractMappedClassFieldObserver.java

@@ -26,7 +26,6 @@
 import com.igormaznitsa.jbbp.model.JBBPFieldLong;
 import com.igormaznitsa.jbbp.model.JBBPFieldShort;
 import com.igormaznitsa.jbbp.model.JBBPFieldString;
-import com.igormaznitsa.jbbp.utils.DslBinCustom;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -41,7 +40,7 @@ public abstract class AbstractMappedClassFieldObserver {
   /**
    * Inside auxiliary method to read object field value.
    *
-   * @param obj   an object which field is read
+   * @param obj    an object which field is read
    * @param record field record, must not be null
    * @return a value from the field of the object
    * @throws JBBPException if the field can't be read
@@ -72,30 +71,28 @@ private static void assertFieldArray(final Field field) {
   }
 
   /**
-   * Process an object.
+   * Process an object. It works only with classes and fields marked by Bin annotations. <b>It doesn't process classes and fields marked by DslBinCustom annotations.</b>
    *
    * @param obj                  an object which is an instance of a mapped class, must not be null
    * @param field                a field where the object has been found, it can be null for first call
    * @param customFieldProcessor a processor for custom fields, it can be null
+   * @see Bin
    */
   protected void processObject(final Object obj, Field field, final Object customFieldProcessor) {
     JBBPUtils.assertNotNull(obj, "Object must not be null");
 
     final List<MappedFieldRecord> orderedFields = JBBPMapper.findAffectedFields(obj);
 
-    //TODO check DslBinCustom
     final Bin clazzAnno = obj.getClass().getAnnotation(Bin.class);
-    final DslBinCustom clazzCustomAnno = obj.getClass().getAnnotation(DslBinCustom.class);
     final Bin fieldAnno = field == null ? null : field.getAnnotation(Bin.class);
-    final DslBinCustom fieldCustomAnno = field == null ? null : field.getAnnotation(DslBinCustom.class);
 
     this.onStructStart(obj, field, clazzAnno == null ? fieldAnno : clazzAnno);
 
     for (final MappedFieldRecord rec : orderedFields) {
       Bin binAnno = rec.binAnnotation;
 
       if (binAnno.custom() && customFieldProcessor == null) {
-        throw new JBBPIllegalArgumentException("The Class '" + obj.getClass().getName() + "' contains the field '" + rec.mappingField.getName() + "\' which is a custom one, you must provide a JBBPCustomFieldWriter instance to save the field.");
+        throw new JBBPIllegalArgumentException("Class '" + obj.getClass().getName() + "' contains field '" + rec.mappingField.getName() + "\' which is custom one, you must provide JBBPCustomFieldWriter instance to save it.");
       }
 
       processObjectField(obj, rec, binAnno, customFieldProcessor);

jbbp/src/main/java/com/igormaznitsa/jbbp/mapper/Bin.java

@@ -57,6 +57,22 @@
    */
   String path() default "";
 
+  /**
+   * Name of the custom type.
+   *
+   * @return type of the field, if empty then undefined
+   * @since 2.0.0
+   */
+  String customType() default "";
+
+  /**
+   * Expression to represent array size of the field.
+   *
+   * @return array size of the field, if empty then not defined
+   * @since 2.0.0
+   */
+  String arraySizeExpression() default "";
+
   /**
    * Type of mapped parsed structure element.
    *
@@ -86,12 +102,11 @@
   boolean custom() default false;
 
   /**
-   * The Field is used by custom field processor and as expression to calculate array length.
-   *
-   * @return the extra field as String
-   * @see JBBPMapperCustomFieldProcessor
+   * Expression as extra part of type. It means take part in <b>type[:extra]</b>
+   * @return extra value, if empty then undefined
+   * @since 2.0.0
    */
-  String extra() default "";
+  String typeExtraPartExpression() default "";
 
   /**
    * The Value defines how many bytes are actual ones in the field, works for numeric field and arrays and allows make mapping to bit fields.