1 files changed, 115 insertions, 157 deletions
diff --git a/src/main/java/com/android/vts/entity/ApiCoverageEntity.java b/src/main/java/com/android/vts/entity/ApiCoverageEntity.java
index 0a41743..9c74032 100644
--- a/src/main/java/com/android/vts/entity/ApiCoverageEntity.java
+++ b/src/main/java/com/android/vts/entity/ApiCoverageEntity.java
@@ -35,167 +35,125 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-/**
- * Entity Class for ApiCoverageEntity
- */
+/** Entity Class for ApiCoverageEntity */
 @Cache
 @Entity(name = "ApiCoverage")
 @EqualsAndHashCode(of = "id")
 @NoArgsConstructor
 @JsonAutoDetect(fieldVisibility = Visibility.ANY)
 @JsonIgnoreProperties({"id", "parent"})
-public class ApiCoverageEntity {
-
-  /**
-   * ApiCoverageEntity id field
-   */
-  @Id
-  @Getter
-  @Setter
-  String id;
-
-  @Parent
-  @Getter
-  Key<?> parent;
-
-  /**
-   * HAL package name. e.g. android.hardware.foo.
-   */
-  @Index
-  @Getter
-  @Setter
-  String halPackageName;
-
-  /**
-   * HAL (major) version. e.g. 1.
-   */
-  @Index
-  @Getter
-  @Setter
-  int halMajorVersion;
-
-  /**
-   * HAL (minor) version. e.g. 0.
-   */
-  @Index
-  @Getter
-  @Setter
-  int halMinorVersion;
-
-  /**
-   * HAL interface name. e.g. IFoo.
-   */
-  @Index
-  @Getter
-  @Setter
-  String halInterfaceName;
-
-  /**
-   * List of HAL API
-   */
-  @Getter
-  @Setter
-  List<String> halApi;
-
-  /**
-   * List of HAL covered API
-   */
-  @Getter
-  @Setter
-  List<String> coveredHalApi;
-
-  /**
-   * When this record was created or updated
-   */
-  @Index
-  Date updated;
-
-  /**
-   * Constructor function for ApiCoverageEntity Class
-   */
-  public ApiCoverageEntity(com.google.appengine.api.datastore.Key testRunKey, String halPackageName,
-      int halVersionMajor, int halVersionMinor, String halInterfaceName, List<String> halApi,
-      List<String> coveredHalApi) {
-
-    this.parent = getParentKey(testRunKey);
-
-    this.halPackageName = halPackageName;
-    this.halMajorVersion = halVersionMajor;
-    this.halMinorVersion = halVersionMinor;
-    this.halInterfaceName = halInterfaceName;
-    this.halApi = halApi;
-    this.coveredHalApi = coveredHalApi;
-  }
-
-  /**
-   * Constructor function for ApiCoverageEntity Class with objectify Key.
-   */
-  public ApiCoverageEntity(Key testRunKey, String halPackageName,
-                           int halVersionMajor, int halVersionMinor, String halInterfaceName,
-                           List<String> halApi, List<String> coveredHalApi) {
-    this.parent = testRunKey;
-
-    this.halPackageName = halPackageName;
-    this.halMajorVersion = halVersionMajor;
-    this.halMinorVersion = halVersionMinor;
-    this.halInterfaceName = halInterfaceName;
-    this.halApi = halApi;
-    this.coveredHalApi = coveredHalApi;
-  }
-
-  /**
-   * Get objectify Key from datastore Key type
-   */
-  private Key getParentKey(com.google.appengine.api.datastore.Key testRunKey) {
-    Key testParentKey = Key.create(TestEntity.class, testRunKey.getParent().getName());
-    return Key.create(testParentKey, TestRunEntity.class, testRunKey.getId());
-  }
-
-  /**
-   * Get UrlSafeKey from ApiCoverageEntity Information
-   */
-  public String getUrlSafeKey() {
-    Key uuidKey = Key.create(this.parent, ApiCoverageEntity.class, this.id);
-    return uuidKey.toUrlSafe();
-  }
-
-  /**
-   * Saving function for the instance of this class
-   */
-  public Key<ApiCoverageEntity> save() {
-    this.id = UUID.randomUUID().toString();
-    this.updated = new Date();
-    return ofy().save().entity(this).now();
-  }
-
-  /**
-   * Get List of ApiCoverageEntity by HAL interface name
-   */
-  public static ApiCoverageEntity getByUrlSafeKey(String urlSafeKey) {
-    return ofy().load()
-        .type(ApiCoverageEntity.class)
-        .filterKey(com.google.cloud.datastore.Key.fromUrlSafe(urlSafeKey))
-        .first()
-        .now();
-  }
-
-  /**
-   * Get List of ApiCoverageEntity by HAL interface name
-   */
-  public static List<ApiCoverageEntity> getByInterfaceNameList(String halInterfaceName) {
-    return ofy().load()
-        .type(ApiCoverageEntity.class)
-        .filter("halInterfaceName", halInterfaceName)
-        .list();
-  }
-
-  /**
-   * Get List of ApiCoverageEntity by HAL package name
-   */
-  public static List<ApiCoverageEntity> getByPackageNameList(String packageName) {
-    return ofy().load()
-        .type(ApiCoverageEntity.class)
-        .filter("halPackageName", packageName)
-        .list();
-  }
+public class ApiCoverageEntity implements DashboardEntity {
+
+    /** ApiCoverageEntity id field */
+    @Id @Getter @Setter String id;
+
+    @Parent @Getter Key<?> parent;
+
+    /** HAL package name. e.g. android.hardware.foo. */
+    @Index @Getter @Setter String halPackageName;
+
+    /** HAL (major) version. e.g. 1. */
+    @Index @Getter @Setter int halMajorVersion;
+
+    /** HAL (minor) version. e.g. 0. */
+    @Index @Getter @Setter int halMinorVersion;
+
+    /** HAL interface name. e.g. IFoo. */
+    @Index @Getter @Setter String halInterfaceName;
+
+    /** List of HAL API */
+    @Getter @Setter List<String> halApi;
+
+    /** List of HAL covered API */
+    @Getter @Setter List<String> coveredHalApi;
+
+    /** When this record was created or updated */
+    @Index Date updated;
+
+    /** Constructor function for ApiCoverageEntity Class */
+    public ApiCoverageEntity(
+            com.google.appengine.api.datastore.Key testRunKey,
+            String halPackageName,
+            int halVersionMajor,
+            int halVersionMinor,
+            String halInterfaceName,
+            List<String> halApi,
+            List<String> coveredHalApi) {
+        this.id = UUID.randomUUID().toString();
+        this.parent = getParentKey(testRunKey);
+
+        this.halPackageName = halPackageName;
+        this.halMajorVersion = halVersionMajor;
+        this.halMinorVersion = halVersionMinor;
+        this.halInterfaceName = halInterfaceName;
+        this.halApi = halApi;
+        this.coveredHalApi = coveredHalApi;
+        this.updated = new Date();
+    }
+
+    /** Constructor function for ApiCoverageEntity Class with objectify Key. */
+    public ApiCoverageEntity(
+            Key testRunKey,
+            String halPackageName,
+            int halVersionMajor,
+            int halVersionMinor,
+            String halInterfaceName,
+            List<String> halApi,
+            List<String> coveredHalApi) {
+        this.id = UUID.randomUUID().toString();
+        this.parent = testRunKey;
+
+        this.halPackageName = halPackageName;
+        this.halMajorVersion = halVersionMajor;
+        this.halMinorVersion = halVersionMinor;
+        this.halInterfaceName = halInterfaceName;
+        this.halApi = halApi;
+        this.coveredHalApi = coveredHalApi;
+        this.updated = new Date();
+    }
+
+    /** Get objectify Key from datastore Key type */
+    private Key getParentKey(com.google.appengine.api.datastore.Key testRunKey) {
+        Key testParentKey = Key.create(TestEntity.class, testRunKey.getParent().getName());
+        return Key.create(testParentKey, TestRunEntity.class, testRunKey.getId());
+    }
+
+    /** Get UrlSafeKey from ApiCoverageEntity Information */
+    public String getUrlSafeKey() {
+        Key uuidKey = Key.create(this.parent, ApiCoverageEntity.class, this.id);
+        return uuidKey.toUrlSafe();
+    }
+
+    /** Saving function for the instance of this class */
+    @Override
+    public Key<ApiCoverageEntity> save() {
+        this.id = UUID.randomUUID().toString();
+        this.updated = new Date();
+        return ofy().save().entity(this).now();
+    }
+
+    /** Get List of ApiCoverageEntity by HAL interface name */
+    public static ApiCoverageEntity getByUrlSafeKey(String urlSafeKey) {
+        return ofy().load()
+                .type(ApiCoverageEntity.class)
+                .filterKey(com.google.cloud.datastore.Key.fromUrlSafe(urlSafeKey))
+                .first()
+                .now();
+    }
+
+    /** Get List of ApiCoverageEntity by HAL interface name */
+    public static List<ApiCoverageEntity> getByInterfaceNameList(String halInterfaceName) {
+        return ofy().load()
+                .type(ApiCoverageEntity.class)
+                .filter("halInterfaceName", halInterfaceName)
+                .list();
+    }
+
+    /** Get List of ApiCoverageEntity by HAL package name */
+    public static List<ApiCoverageEntity> getByPackageNameList(String packageName) {
+        return ofy().load()
+                .type(ApiCoverageEntity.class)
+                .filter("halPackageName", packageName)
+                .list();
+    }
 }