todo: fix test cases

Author: Bodo1981

annotation/src/main/java/com/tickaroo/tikxml/annotation/GenericAdapter.java

@@ -0,0 +1,19 @@
+package com.tickaroo.tikxml.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation is used to resolve polymorphism by scanning for a certain xml tag
+ *
+ * @author Hannes Dorfmann
+ * @since 1.0
+ */
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface GenericAdapter {
+}

annotationprocessortesting-kt/src/main/java/com/tickaroo/tikxml/annotationprocessing/element/polymorphism/autovalue/Writer.kt

@@ -18,11 +18,13 @@
 
 package com.tickaroo.tikxml.annotationprocessing.element.polymorphism.autovalue
 
+import com.tickaroo.tikxml.annotation.GenericAdapter
 import com.tickaroo.tikxml.annotation.PropertyElement
 
 /**
  * @author Hannes Dorfmann
  */
+@GenericAdapter
 interface Writer {
     @PropertyElement
     fun name(): String

annotationprocessortesting-kt/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/autovalue/Book.kt

@@ -20,6 +20,7 @@ package com.tickaroo.tikxml.annotationprocessing.elementlist.autovalue
 
 import com.google.auto.value.AutoValue
 import com.tickaroo.tikxml.annotation.Attribute
+import com.tickaroo.tikxml.annotation.GenericAdapter
 import com.tickaroo.tikxml.annotation.PropertyElement
 import com.tickaroo.tikxml.annotation.Xml
 import com.tickaroo.tikxml.annotationprocessing.DateConverter
@@ -30,6 +31,7 @@ import java.util.Date
  */
 @Xml
 @AutoValue
+@GenericAdapter
 abstract class Book {
 
     @Attribute

annotationprocessortesting-kt/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/Person.kt

@@ -18,7 +18,10 @@
 
 package com.tickaroo.tikxml.annotationprocessing.elementlist.polymorphism
 
+import com.tickaroo.tikxml.annotation.GenericAdapter
+
 /**
  * @author Hannes Dorfmann
  */
+@GenericAdapter
 interface Person

annotationprocessortesting-kt/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/autovalue/Person.kt

@@ -18,7 +18,10 @@
 
 package com.tickaroo.tikxml.annotationprocessing.elementlist.polymorphism.autovalue
 
+import com.tickaroo.tikxml.annotation.GenericAdapter
+
 /**
  * @author Hannes Dorfmann
  */
+@GenericAdapter
 interface Person

annotationprocessortesting-kt/src/main/java/com/tickaroo/tikxml/annotationprocessing/textcontent/autovalue/Day.kt

@@ -1,6 +1,7 @@
 package com.tickaroo.tikxml.annotationprocessing.textcontent.autovalue
 
 import com.google.auto.value.AutoValue
+import com.tickaroo.tikxml.annotation.GenericAdapter
 import com.tickaroo.tikxml.annotation.TextContent
 import com.tickaroo.tikxml.annotation.Xml
 
@@ -9,6 +10,7 @@ import com.tickaroo.tikxml.annotation.Xml
  */
 @Xml
 @AutoValue
+@GenericAdapter
 abstract class Day {
     @TextContent
     abstract fun name(): String

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/element/polymorphism/Paper.java

@@ -21,6 +21,7 @@
 import com.tickaroo.tikxml.annotation.Element;
 import com.tickaroo.tikxml.annotation.ElementNameMatcher;
 import com.tickaroo.tikxml.annotation.Xml;
+import java.util.Objects;
 
 /**
  * @author Hannes Dorfmann
@@ -41,7 +42,7 @@ public class Paper {
 
     Paper paper = (Paper) o;
 
-    return writer != null ? writer.equals(paper.writer) : paper.writer == null;
+    return Objects.equals(writer, paper.writer);
   }
 
   @Override public int hashCode() {

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/element/polymorphism/Writer.java

@@ -18,13 +18,16 @@
 
 package com.tickaroo.tikxml.annotationprocessing.element.polymorphism;
 
+import com.tickaroo.tikxml.annotation.GenericAdapter;
 import com.tickaroo.tikxml.annotation.PropertyElement;
 import com.tickaroo.tikxml.annotation.Xml;
+import java.util.Objects;
 
 /**
  * @author Hannes Dorfmann
  */
 @Xml
+@GenericAdapter
 public abstract class Writer {
   @PropertyElement String name;
 
@@ -34,7 +37,7 @@ public abstract class Writer {
 
     Writer writer = (Writer) o;
 
-    return name != null ? name.equals(writer.name) : writer.name == null;
+    return Objects.equals(name, writer.name);
   }
 
   @Override public int hashCode() {

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/element/polymorphism/autovalue/Writer.java

@@ -18,11 +18,13 @@
 
 package com.tickaroo.tikxml.annotationprocessing.element.polymorphism.autovalue;
 
+import com.tickaroo.tikxml.annotation.GenericAdapter;
 import com.tickaroo.tikxml.annotation.PropertyElement;
 
 /**
  * @author Hannes Dorfmann
  */
+@GenericAdapter
 public interface Writer {
-  @PropertyElement public abstract String name();
+  @PropertyElement String name();
 }

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/element/polymorphism/constructor/PaperConstructor.java

@@ -22,6 +22,8 @@
 import com.tickaroo.tikxml.annotation.ElementNameMatcher;
 import com.tickaroo.tikxml.annotation.Xml;
 
+import java.util.Objects;
+
 /**
  * @author Hannes Dorfmann
  */
@@ -50,7 +52,7 @@ public WriterConstructor getWriter() {
 
     PaperConstructor that = (PaperConstructor) o;
 
-    return writer != null ? writer.equals(that.writer) : that.writer == null;
+    return Objects.equals(writer, that.writer);
   }
 
   @Override public int hashCode() {

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/element/polymorphism/constructor/WriterConstructor.java

@@ -18,13 +18,15 @@
 
 package com.tickaroo.tikxml.annotationprocessing.element.polymorphism.constructor;
 
+import com.tickaroo.tikxml.annotation.GenericAdapter;
 import com.tickaroo.tikxml.annotation.PropertyElement;
 import com.tickaroo.tikxml.annotation.Xml;
 
 /**
  * @author Hannes Dorfmann
  */
 @Xml
+@GenericAdapter
 public abstract class WriterConstructor {
 
   private String name;

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/autovalue/Book.java

@@ -20,6 +20,7 @@
 
 import com.google.auto.value.AutoValue;
 import com.tickaroo.tikxml.annotation.Attribute;
+import com.tickaroo.tikxml.annotation.GenericAdapter;
 import com.tickaroo.tikxml.annotation.PropertyElement;
 import com.tickaroo.tikxml.annotation.Xml;
 import com.tickaroo.tikxml.annotationprocessing.DateConverter;
@@ -30,6 +31,7 @@
  */
 @Xml
 @AutoValue
+@GenericAdapter
 public abstract class Book {
 
   @Attribute public abstract  int id();

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/generic/Boss.java

@@ -0,0 +1,29 @@
+package com.tickaroo.tikxml.annotationprocessing.elementlist.generic;
+
+import com.tickaroo.tikxml.annotation.Attribute;
+import com.tickaroo.tikxml.annotation.Xml;
+import java.util.Objects;
+
+@Xml
+public class Boss implements Person2 {
+
+  @Attribute String firstName;
+  @Attribute String lastName;
+
+  @Override public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Boss)) return false;
+
+    Boss boss = (Boss) o;
+
+    if (!Objects.equals(firstName, boss.firstName)) return false;
+    return Objects.equals(lastName, boss.lastName);
+  }
+
+  @Override public int hashCode() {
+    int result = firstName != null ? firstName.hashCode() : 0;
+    result = 31 * result + (lastName != null ? lastName.hashCode() : 0);
+    return result;
+  }
+
+}

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/generic/Company.java

@@ -0,0 +1,33 @@
+package com.tickaroo.tikxml.annotationprocessing.elementlist.generic;
+
+import com.tickaroo.tikxml.annotation.Element;
+import com.tickaroo.tikxml.annotation.ElementNameMatcher;
+import com.tickaroo.tikxml.annotation.PropertyElement;
+import com.tickaroo.tikxml.annotation.Xml;
+import java.util.List;
+import java.util.Objects;
+
+@Xml
+public class Company {
+
+  @PropertyElement String name;
+  @Element(typesByElement = {
+    @ElementNameMatcher(name = "bosser", type = Boss.class)
+  }) List<Person> persons;
+
+  @Override public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Company)) return false;
+
+    Company company = (Company) o;
+
+    if (!Objects.equals(name, company.name)) return false;
+    return Objects.equals(persons, company.persons);
+  }
+
+  @Override public int hashCode() {
+    int result = name != null ? name.hashCode() : 0;
+    result = 31 * result + (persons != null ? persons.hashCode() : 0);
+    return result;
+  }
+}

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/generic/Employee.java

@@ -0,0 +1,23 @@
+package com.tickaroo.tikxml.annotationprocessing.elementlist.generic;
+
+import com.tickaroo.tikxml.annotation.PropertyElement;
+import com.tickaroo.tikxml.annotation.Xml;
+import java.util.Objects;
+
+@Xml
+public class Employee implements Person {
+
+  @PropertyElement String name;
+
+  @Override public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Employee)) return false;
+
+    Employee employee = (Employee) o;
+    return Objects.equals(name, employee.name);
+  }
+
+  @Override public int hashCode() {
+    return name != null ? name.hashCode() : 0;
+  }
+}

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/generic/Person.java

@@ -0,0 +1,7 @@
+package com.tickaroo.tikxml.annotationprocessing.elementlist.generic;
+
+import com.tickaroo.tikxml.annotation.GenericAdapter;
+
+@GenericAdapter
+public interface Person {
+}

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/generic/Person2.java

@@ -0,0 +1,7 @@
+package com.tickaroo.tikxml.annotationprocessing.elementlist.generic;
+
+import com.tickaroo.tikxml.annotation.GenericAdapter;
+
+@GenericAdapter
+public interface Person2 extends Person {
+}

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/Boss.java

@@ -20,6 +20,7 @@
 
 import com.tickaroo.tikxml.annotation.Attribute;
 import com.tickaroo.tikxml.annotation.Xml;
+import java.util.Objects;
 
 /**
  * @author Hannes Dorfmann
@@ -35,9 +36,8 @@ public class Boss implements Person {
 
     Boss boss = (Boss) o;
 
-    if (firstName != null ? !firstName.equals(boss.firstName) : boss.firstName != null)
-      return false;
-    return lastName != null ? lastName.equals(boss.lastName) : boss.lastName == null;
+    if (!Objects.equals(firstName, boss.firstName)) return false;
+    return Objects.equals(lastName, boss.lastName);
   }
 
   @Override public int hashCode() {

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/Company.java

@@ -19,10 +19,10 @@
 package com.tickaroo.tikxml.annotationprocessing.elementlist.polymorphism;
 
 import com.tickaroo.tikxml.annotation.Element;
-import com.tickaroo.tikxml.annotation.ElementNameMatcher;
 import com.tickaroo.tikxml.annotation.PropertyElement;
 import com.tickaroo.tikxml.annotation.Xml;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author Hannes Dorfmann
@@ -32,20 +32,16 @@ public class Company {
 
   @PropertyElement String name;
 
-  @Element(typesByElement = {
-      @ElementNameMatcher(type = Boss.class),
-      @ElementNameMatcher(type = Employee.class),
-  })
-  List<Person> persons;
+  @Element List<Person> persons;
 
   @Override public boolean equals(Object o) {
     if (this == o) return true;
     if (!(o instanceof Company)) return false;
 
     Company company = (Company) o;
 
-    if (name != null ? !name.equals(company.name) : company.name != null) return false;
-    return persons != null ? persons.equals(company.persons) : company.persons == null;
+    if (!Objects.equals(name, company.name)) return false;
+    return Objects.equals(persons, company.persons);
   }
 
   @Override public int hashCode() {

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/Employee.java

@@ -20,6 +20,7 @@
 
 import com.tickaroo.tikxml.annotation.PropertyElement;
 import com.tickaroo.tikxml.annotation.Xml;
+import java.util.Objects;
 
 /**
  * @author Hannes Dorfmann
@@ -35,7 +36,7 @@ public class Employee implements Person {
 
     Employee employee = (Employee) o;
 
-    return name != null ? name.equals(employee.name) : employee.name == null;
+    return Objects.equals(name, employee.name);
   }
 
   @Override public int hashCode() {

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/Person.java

@@ -18,8 +18,11 @@
 
 package com.tickaroo.tikxml.annotationprocessing.elementlist.polymorphism;
 
+import com.tickaroo.tikxml.annotation.GenericAdapter;
+
 /**
  * @author Hannes Dorfmann
  */
+@GenericAdapter
 public interface Person {
 }

annotationprocessortesting/src/main/java/com/tickaroo/tikxml/annotationprocessing/elementlist/polymorphism/autovalue/Person.java

@@ -18,8 +18,11 @@
 
 package com.tickaroo.tikxml.annotationprocessing.elementlist.polymorphism.autovalue;
 
+import com.tickaroo.tikxml.annotation.GenericAdapter;
+
 /**
  * @author Hannes Dorfmann
  */
+@GenericAdapter
 public interface Person {
 }