From 80e3892b5bc6c6f5294f9bf0bd2aada06677de1d Mon Sep 17 00:00:00 2001
From: maxwelb <maxwelb@google.com>
Date: Fri, 4 May 2018 17:32:56 -0700
Subject: Move SpamStatus classes into subpackage

Test: Build
PiperOrigin-RevId: 195498557
Change-Id: I28525d0475f847b2ff5a128580256e2688ed47d5
---
 .../dialer/phonelookup/spam/SpamPhoneLookup.java   |  2 +-
 java/com/android/dialer/spam/SimpleSpamStatus.java | 36 -------------------
 java/com/android/dialer/spam/Spam.java             |  1 +
 java/com/android/dialer/spam/SpamStatus.java       | 40 ----------------------
 java/com/android/dialer/spam/SpamStub.java         |  2 ++
 .../dialer/spam/status/SimpleSpamStatus.java       | 36 +++++++++++++++++++
 .../com/android/dialer/spam/status/SpamStatus.java | 40 ++++++++++++++++++++++
 7 files changed, 80 insertions(+), 77 deletions(-)
 delete mode 100644 java/com/android/dialer/spam/SimpleSpamStatus.java
 delete mode 100644 java/com/android/dialer/spam/SpamStatus.java
 create mode 100644 java/com/android/dialer/spam/status/SimpleSpamStatus.java
 create mode 100644 java/com/android/dialer/spam/status/SpamStatus.java

(limited to 'java/com/android/dialer')

diff --git a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
index 6b77036cf..71341ba64 100644
--- a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
@@ -27,7 +27,7 @@ import com.android.dialer.phonelookup.PhoneLookup;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.PhoneLookupInfo.SpamInfo;
 import com.android.dialer.spam.Spam;
-import com.android.dialer.spam.SpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.storage.Unencrypted;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
diff --git a/java/com/android/dialer/spam/SimpleSpamStatus.java b/java/com/android/dialer/spam/SimpleSpamStatus.java
deleted file mode 100644
index b49241cf8..000000000
--- a/java/com/android/dialer/spam/SimpleSpamStatus.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.spam;
-
-import android.support.annotation.Nullable;
-import com.google.auto.value.AutoValue;
-import com.google.common.base.Optional;
-
-/** Holds a boolean and long to represent spam status. */
-@AutoValue
-public abstract class SimpleSpamStatus implements SpamStatus {
-
-  /** Returns a SimpleSpamStatus with the given boolean and timestamp. */
-  public static SimpleSpamStatus create(boolean isSpam, @Nullable Long timestampMillis) {
-    return new AutoValue_SimpleSpamStatus(isSpam, Optional.fromNullable(timestampMillis));
-  }
-
-  /** Returns a SimpleSpamStatus that's not marked as spam and has no timestamp. */
-  public static SimpleSpamStatus notSpam() {
-    return create(false, null);
-  }
-}
diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java
index 6aa69af4a..181a55dea 100644
--- a/java/com/android/dialer/spam/Spam.java
+++ b/java/com/android/dialer/spam/Spam.java
@@ -24,6 +24,7 @@ import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.status.SpamStatus;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
diff --git a/java/com/android/dialer/spam/SpamStatus.java b/java/com/android/dialer/spam/SpamStatus.java
deleted file mode 100644
index 0b859d1c7..000000000
--- a/java/com/android/dialer/spam/SpamStatus.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.spam;
-
-import com.google.common.base.Optional;
-
-/** An interface representing a number's spam status. */
-@SuppressWarnings("Guava")
-public interface SpamStatus {
-
-  /** Returns true if the number is spam. */
-  boolean isSpam();
-
-  /**
-   * Returns the timestamp (in milliseconds) indicating when the number's spam status entered the
-   * underlying data source.
-   *
-   * <p>{@code Optional.absent()} is returned if
-   *
-   * <ul>
-   *   <li>the number's spam status doesn't exist in the underlying data source, or
-   *   <li>the underlying data source can't provide a timestamp.
-   * </ul>
-   */
-  Optional<Long> getTimestampMillis();
-}
diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java
index a2e7258ee..2789c01e7 100644
--- a/java/com/android/dialer/spam/SpamStub.java
+++ b/java/com/android/dialer/spam/SpamStub.java
@@ -22,6 +22,8 @@ import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.status.SimpleSpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
diff --git a/java/com/android/dialer/spam/status/SimpleSpamStatus.java b/java/com/android/dialer/spam/status/SimpleSpamStatus.java
new file mode 100644
index 000000000..ec28b9dce
--- /dev/null
+++ b/java/com/android/dialer/spam/status/SimpleSpamStatus.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.spam.status;
+
+import android.support.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+
+/** Holds a boolean and long to represent spam status. */
+@AutoValue
+public abstract class SimpleSpamStatus implements SpamStatus {
+
+  /** Returns a SimpleSpamStatus with the given boolean and timestamp. */
+  public static SimpleSpamStatus create(boolean isSpam, @Nullable Long timestampMillis) {
+    return new AutoValue_SimpleSpamStatus(isSpam, Optional.fromNullable(timestampMillis));
+  }
+
+  /** Returns a SimpleSpamStatus that's not marked as spam and has no timestamp. */
+  public static SimpleSpamStatus notSpam() {
+    return create(false, null);
+  }
+}
diff --git a/java/com/android/dialer/spam/status/SpamStatus.java b/java/com/android/dialer/spam/status/SpamStatus.java
new file mode 100644
index 000000000..8186ac5cc
--- /dev/null
+++ b/java/com/android/dialer/spam/status/SpamStatus.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.spam.status;
+
+import com.google.common.base.Optional;
+
+/** An interface representing a number's spam status. */
+@SuppressWarnings("Guava")
+public interface SpamStatus {
+
+  /** Returns true if the number is spam. */
+  boolean isSpam();
+
+  /**
+   * Returns the timestamp (in milliseconds) indicating when the number's spam status entered the
+   * underlying data source.
+   *
+   * <p>{@code Optional.absent()} is returned if
+   *
+   * <ul>
+   *   <li>the number's spam status doesn't exist in the underlying data source, or
+   *   <li>the underlying data source can't provide a timestamp.
+   * </ul>
+   */
+  Optional<Long> getTimestampMillis();
+}
-- 
cgit v1.2.3