diff options
author | Guang Zhu <guangzhu@google.com> | 2015-12-29 17:02:27 -0500 |
---|---|---|
committer | Guang Zhu <guangzhu@google.com> | 2015-12-29 17:02:27 -0500 |
commit | 411c68a0baab86c090293e772053ce17edadf8aa (patch) | |
tree | a844051066620bab0a6bf086f454f31a1c45bdb6 | |
parent | 8892886436bdbdea4945e4f3277e8be39509e6c9 (diff) | |
download | loganalysis-411c68a0baab86c090293e772053ce17edadf8aa.tar.gz |
fix compiler warnings
Change-Id: Ifd2c923750dc6f2b5f8104aa3993277648fcf7b9
8 files changed, 11 insertions, 13 deletions
diff --git a/src/com/android/loganalysis/item/BugreportItem.java b/src/com/android/loganalysis/item/BugreportItem.java index 4b35816..969c90a 100644 --- a/src/com/android/loganalysis/item/BugreportItem.java +++ b/src/com/android/loganalysis/item/BugreportItem.java @@ -50,7 +50,9 @@ public class BugreportItem extends GenericItem { TIME, COMMAND_LINE, MEM_INFO, PROCRANK, TOP, KERNEL_LOG, LAST_KMSG, SYSTEM_LOG, SYSTEM_PROPS, DUMPSYS)); - public static class CommandLineItem extends GenericMapItem<String> {} + public static class CommandLineItem extends GenericMapItem<String> { + private static final long serialVersionUID = 0L; + } /** * The constructor for {@link BugreportItem}. diff --git a/src/com/android/loganalysis/item/DumpsysProcStatsItem.java b/src/com/android/loganalysis/item/DumpsysProcStatsItem.java index 846f70a..a0abb6d 100644 --- a/src/com/android/loganalysis/item/DumpsysProcStatsItem.java +++ b/src/com/android/loganalysis/item/DumpsysProcStatsItem.java @@ -20,5 +20,6 @@ package com.android.loganalysis.item; * used a helper item and not going to be marshalled to JSON */ public class DumpsysProcStatsItem extends GenericMapItem<String> { + private static final long serialVersionUID = 1L; } diff --git a/src/com/android/loganalysis/item/MemoryHealthItem.java b/src/com/android/loganalysis/item/MemoryHealthItem.java index 134eebe..92b5f11 100644 --- a/src/com/android/loganalysis/item/MemoryHealthItem.java +++ b/src/com/android/loganalysis/item/MemoryHealthItem.java @@ -48,6 +48,7 @@ public class MemoryHealthItem extends GenericItem { * Returns breakdown of memory usage of foreground processes. * @return Map that stores breakdown of memory usage */ + @SuppressWarnings("unchecked") public Map<String, Map<String, Long>> getForeground() { return (Map<String, Map<String, Long>>) super.getAttribute(FOREGROUND); } @@ -56,6 +57,7 @@ public class MemoryHealthItem extends GenericItem { * Returns breakdown of memory usage of foreground processes. * @return Map that stores breakdown of memory usage */ + @SuppressWarnings("unchecked") public Map<String, Map<String, Long>> getBackground() { return (Map<String, Map<String, Long>>) super.getAttribute(BACKGROUND); } diff --git a/src/com/android/loganalysis/util/ArrayUtil.java b/src/com/android/loganalysis/util/ArrayUtil.java index 95b1634..5e5b2d4 100644 --- a/src/com/android/loganalysis/util/ArrayUtil.java +++ b/src/com/android/loganalysis/util/ArrayUtil.java @@ -63,6 +63,7 @@ public class ArrayUtil { * @param inputAry an array, or a varargs list * @return a {@link List} instance with the identical contents */ + @SafeVarargs public static <T> List<T> list(T... inputAry) { List<T> retList = new ArrayList<T>(inputAry.length); for (T item : inputAry) { @@ -111,4 +112,3 @@ public class ArrayUtil { } } } - diff --git a/src/com/android/loganalysis/util/RegexTrie.java b/src/com/android/loganalysis/util/RegexTrie.java index f3c2d6a..1d0df9a 100644 --- a/src/com/android/loganalysis/util/RegexTrie.java +++ b/src/com/android/loganalysis/util/RegexTrie.java @@ -105,7 +105,7 @@ public class RegexTrie<V> { public void clear() { mValue = null; - for (RegexTrie child : mChildren.values()) { + for (RegexTrie<V> child : mChildren.values()) { child.clear(); } mChildren.clear(); diff --git a/src/com/android/loganalysis/util/config/OptionSetter.java b/src/com/android/loganalysis/util/config/OptionSetter.java index ca6ff06..e5549a2 100644 --- a/src/com/android/loganalysis/util/config/OptionSetter.java +++ b/src/com/android/loganalysis/util/config/OptionSetter.java @@ -55,6 +55,7 @@ import java.util.Map; * @see {@link ArgsOptionParser} */ //TODO: Use libTF once this is copied over. +@SuppressWarnings("rawtypes") public class OptionSetter { static final String BOOL_FALSE_PREFIX = "no-"; diff --git a/src/com/android/loganalysis/util/config/OptionUpdateRule.java b/src/com/android/loganalysis/util/config/OptionUpdateRule.java index ef2d428..3458eac 100644 --- a/src/com/android/loganalysis/util/config/OptionUpdateRule.java +++ b/src/com/android/loganalysis/util/config/OptionUpdateRule.java @@ -112,7 +112,7 @@ public enum OptionUpdateRule { * Check if the objects are {@link Comparable}, and if so, compare them using * {@see Comparable#compareTo}. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) private static int compare(String optionName, Object current, Object update) throws ConfigurationException { Comparable compCurrent; diff --git a/tests/src/com/android/loganalysis/util/config/OptionSetterTest.java b/tests/src/com/android/loganalysis/util/config/OptionSetterTest.java index dbac942..ecac1ee 100644 --- a/tests/src/com/android/loganalysis/util/config/OptionSetterTest.java +++ b/tests/src/com/android/loganalysis/util/config/OptionSetterTest.java @@ -33,14 +33,13 @@ public class OptionSetterTest extends TestCase { /** Option source with generic type. */ private static class GenericTypeOptionSource { - @SuppressWarnings("unused") @Option(name = "my_option", shortName = 'o') private Collection<?> mMyOption; } /** Option source with unparameterized type. */ + @SuppressWarnings("rawtypes") private static class CollectionTypeOptionSource { - @SuppressWarnings("unused") @Option(name = "my_option", shortName = 'o') private Collection mMyOption; } @@ -50,18 +49,15 @@ public class OptionSetterTest extends TestCase { /** Option source with unparameterized type. */ private static class NonCollectionGenericTypeOptionSource { - @SuppressWarnings("unused") @Option(name = "my_option", shortName = 'o') private MyGeneric<String> mMyOption; } /** Option source with options with same name. */ private static class DuplicateOptionSource { - @SuppressWarnings("unused") @Option(name = "string", shortName = 's') private String mMyOption; - @SuppressWarnings("unused") @Option(name = "string", shortName = 's') private String mMyDuplicateOption; } @@ -72,11 +68,9 @@ public class OptionSetterTest extends TestCase { @Option(name = "string", shortName = 's') private String mMyOption; - @SuppressWarnings("unused") @Option(name = "enum") private DefaultEnumClass mEnum = null; - @SuppressWarnings("unused") @Option(name = "string_collection") private Collection<String> mStringCollection = new ArrayList<String>(); @@ -93,7 +87,6 @@ public class OptionSetterTest extends TestCase { * Option source with an option with same name as AllTypesOptionSource, but a different type. */ private static class SharedOptionWrongTypeSource { - @SuppressWarnings("unused") @Option(name = "string", shortName = 's') private int mMyOption; } @@ -188,7 +181,6 @@ public class OptionSetterTest extends TestCase { * Option source with invalid option name. */ private static class BadOptionNameSource { - @SuppressWarnings("unused") @Option(name = "bad:string", shortName = 's') private int mMyOption; } |