Merge pull request #27 from alexstaeding/master

Adds support for Id field in pojo superclass

Author: FarooqKhan

src/main/java/io/jsondb/CollectionMetaData.java

@@ -71,7 +71,26 @@ public CollectionMetaData(String collectionName, Class<?> clazz, String schemaVe
  this.collectionLock = new ReentrantReadWriteLock();
 
  //Populate the class metadata
- Field[] fs = clazz.getDeclaredFields();
+ List<Field[]> fields = new ArrayList<>();
+ Field[] startFields = clazz.getDeclaredFields();
+ int totalFields = startFields.length;
+ fields.add(startFields);
+ while (clazz.getSuperclass() != Object.class) {
+ clazz = clazz.getSuperclass();
+ Field[] toAdd = clazz.getDeclaredFields();
+ totalFields += toAdd.length;
+ fields.add(toAdd);
+ }
+
+ int x = 0;
+ Field[] fs = new Field[totalFields];
+ for (Field[] field : fields) {
+ for (Field value : field) {
+ fs[x] = value;
+ x++;
+ }
+ }
+
  Method[] ms = clazz.getDeclaredMethods();
  for (Field f : fs) {
  String fieldName = f.getName();
@@ -115,9 +134,11 @@ public String getCollectionName() {
  public String getSchemaVersion() {
  return schemaVersion;
  }
+
  public String getActualSchemaVersion() {
  return actualSchemaVersion;
  }
+
  public void setActualSchemaVersion(String actualSchemaVersion) {
  this.actualSchemaVersion = actualSchemaVersion;
  int compareResult = schemaComparator.compare(schemaVersion, actualSchemaVersion);
@@ -132,6 +153,7 @@ public void setActualSchemaVersion(String actualSchemaVersion) {
  public Class getClazz() {
  return clazz;
  }
+
  public String getIdAnnotatedFieldName() {
  return idAnnotatedFieldName;
  }
@@ -206,7 +228,7 @@ public static Map<String, CollectionMetaData> builder(JsonDBConfig dbConfig) {
  Map<String, CollectionMetaData> collectionMetaData = new LinkedHashMap<String, CollectionMetaData>();
  Reflections reflections = new Reflections(dbConfig.getBaseScanPackage());
  Set<Class<?>> docClasses = reflections.getTypesAnnotatedWith(Document.class);
- for(Class<?> c : docClasses) {
+ for (Class<?> c : docClasses) {
  Document d = c.getAnnotation(Document.class);
  String collectionName = d.collection();
  String version = d.schemaVersion();