Merge "Rename ZoneInfoDB -> ZoneInfoDb"
am: 414bdcd5b5
Change-Id: I6554f763d660a292a2a2b56894ad1655b2bde0ae
diff --git a/luni/src/main/java/libcore/icu/TimeZoneNames.java b/luni/src/main/java/libcore/icu/TimeZoneNames.java
index 32f2581..ec0fb8e 100644
--- a/luni/src/main/java/libcore/icu/TimeZoneNames.java
+++ b/luni/src/main/java/libcore/icu/TimeZoneNames.java
@@ -16,7 +16,6 @@
package libcore.icu;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
@@ -24,7 +23,6 @@
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import libcore.util.BasicLruCache;
-import libcore.timezone.ZoneInfoDB;
/**
* Provides access to ICU's time zone name data.
diff --git a/luni/src/main/java/libcore/timezone/CountryTimeZones.java b/luni/src/main/java/libcore/timezone/CountryTimeZones.java
index d0fa081..f170418 100644
--- a/luni/src/main/java/libcore/timezone/CountryTimeZones.java
+++ b/luni/src/main/java/libcore/timezone/CountryTimeZones.java
@@ -203,7 +203,7 @@
// We rely on ZoneInfoDB to tell us what the known valid time zone IDs are. ICU may
// recognize more but we want to be sure that zone IDs can be used with java.util as well as
// android.icu and ICU is expected to have a superset.
- String[] validTimeZoneIdsArray = ZoneInfoDB.getInstance().getAvailableIDs();
+ String[] validTimeZoneIdsArray = ZoneInfoDb.getInstance().getAvailableIDs();
HashSet<String> validTimeZoneIdsSet = new HashSet<>(Arrays.asList(validTimeZoneIdsArray));
List<TimeZoneMapping> validCountryTimeZoneMappings = new ArrayList<>();
for (TimeZoneMapping timeZoneMapping : timeZoneMappings) {
diff --git a/luni/src/main/java/libcore/timezone/ZoneInfoDB.java b/luni/src/main/java/libcore/timezone/ZoneInfoDb.java
similarity index 94%
rename from luni/src/main/java/libcore/timezone/ZoneInfoDB.java
rename to luni/src/main/java/libcore/timezone/ZoneInfoDb.java
index dd9260b..a94d293 100644
--- a/luni/src/main/java/libcore/timezone/ZoneInfoDB.java
+++ b/luni/src/main/java/libcore/timezone/ZoneInfoDb.java
@@ -38,12 +38,12 @@
* @hide - used to implement TimeZone
*/
@libcore.api.CorePlatformApi
-public final class ZoneInfoDB implements AutoCloseable {
+public final class ZoneInfoDb implements AutoCloseable {
// VisibleForTesting
public static final String TZDATA_FILE_NAME = "tzdata";
- private static final ZoneInfoDB DATA = ZoneInfoDB.loadTzDataWithFallback(
+ private static final ZoneInfoDb DATA = ZoneInfoDb.loadTzDataWithFallback(
TimeZoneDataFiles.getTimeZoneFilePaths(TZDATA_FILE_NAME));
// The database reserves 40 bytes for each id.
@@ -104,18 +104,18 @@
};
@libcore.api.CorePlatformApi
- public static ZoneInfoDB getInstance() {
+ public static ZoneInfoDb getInstance() {
return DATA;
}
/**
* Loads the data at the specified paths in order, returning the first valid one as a
- * {@link ZoneInfoDB} object. If there is no valid one found a basic fallback instance is created
+ * {@link ZoneInfoDb} object. If there is no valid one found a basic fallback instance is created
* containing just GMT.
*/
- public static ZoneInfoDB loadTzDataWithFallback(String... paths) {
+ public static ZoneInfoDb loadTzDataWithFallback(String... paths) {
for (String path : paths) {
- ZoneInfoDB tzData = new ZoneInfoDB();
+ ZoneInfoDb tzData = new ZoneInfoDb();
if (tzData.loadData(path)) {
return tzData;
}
@@ -125,29 +125,29 @@
// This is actually implemented in TimeZone itself, so if this is the only time zone
// we report, we won't be asked any more questions.
System.logE("Couldn't find any " + TZDATA_FILE_NAME + " file!");
- return ZoneInfoDB.createFallback();
+ return ZoneInfoDb.createFallback();
}
/**
- * Loads the data at the specified path and returns the {@link ZoneInfoDB} object if it is valid,
+ * Loads the data at the specified path and returns the {@link ZoneInfoDb} object if it is valid,
* otherwise {@code null}.
*/
@libcore.api.CorePlatformApi
- public static ZoneInfoDB loadTzData(String path) {
- ZoneInfoDB tzData = new ZoneInfoDB();
+ public static ZoneInfoDb loadTzData(String path) {
+ ZoneInfoDb tzData = new ZoneInfoDb();
if (tzData.loadData(path)) {
return tzData;
}
return null;
}
- private static ZoneInfoDB createFallback() {
- ZoneInfoDB tzData = new ZoneInfoDB();
+ private static ZoneInfoDb createFallback() {
+ ZoneInfoDb tzData = new ZoneInfoDb();
tzData.populateFallback();
return tzData;
}
- private ZoneInfoDB() {
+ private ZoneInfoDb() {
}
/**
@@ -177,7 +177,7 @@
/**
* Loads the data file at the specified path. If the data is valid {@code true} will be
- * returned and the {@link ZoneInfoDB} instance can be used. If {@code false} is returned then the
+ * returned and the {@link ZoneInfoDb} instance can be used. If {@code false} is returned then the
* ZoneInfoDB instance is left in a closed state and must be discarded.
*/
private boolean loadData(String path) {
diff --git a/luni/src/main/java/libcore/util/CoreLibraryDebug.java b/luni/src/main/java/libcore/util/CoreLibraryDebug.java
index dc1012f..abfa565 100644
--- a/luni/src/main/java/libcore/util/CoreLibraryDebug.java
+++ b/luni/src/main/java/libcore/util/CoreLibraryDebug.java
@@ -21,7 +21,7 @@
import libcore.timezone.TimeZoneDataFiles;
import libcore.timezone.TzDataSetVersion;
import libcore.timezone.TzDataSetVersion.TzDataSetException;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
import java.io.File;
import java.io.IOException;
@@ -109,7 +109,7 @@
android.icu.util.TimeZone.getTZDataVersion());
debugInfo.addStringEntry(
debugKeyPrefix + "libcore.tzdb_version",
- ZoneInfoDB.getInstance().getVersion());
+ ZoneInfoDb.getInstance().getVersion());
debugInfo.addStringEntry(
debugKeyPrefix + "icu4c.tzdb_version",
Icu4cMetadata.getTzdbVersion());
diff --git a/luni/src/main/java/libcore/util/ZoneInfo.java b/luni/src/main/java/libcore/util/ZoneInfo.java
index 88796dd..85bf1bc 100644
--- a/luni/src/main/java/libcore/util/ZoneInfo.java
+++ b/luni/src/main/java/libcore/util/ZoneInfo.java
@@ -32,7 +32,7 @@
import java.util.GregorianCalendar;
import java.util.TimeZone;
import libcore.io.BufferIterator;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
/**
* Our concrete TimeZone implementation, backed by zoneinfo data.
@@ -43,7 +43,7 @@
* {@code man 8 zic}) and an index by long name, e.g. Europe/London.
*
* <p>The compacted form is created by {@code external/icu/tools/ZoneCompactor.java} and is used
- * by both this and Bionic. {@link ZoneInfoDB} is responsible for mapping the binary file, and
+ * by both this and Bionic. {@link ZoneInfoDb} is responsible for mapping the binary file, and
* reading the index and creating a {@link BufferIterator} that provides access to an entry for a
* specific file. This class is responsible for reading the data from that {@link BufferIterator}
* and storing it a representation to support the {@link TimeZone} and {@link GregorianCalendar}
diff --git a/luni/src/test/java/libcore/libcore/icu/TimeZoneIntegrationTest.java b/luni/src/test/java/libcore/libcore/icu/TimeZoneIntegrationTest.java
index 9593caa..3b6289d 100644
--- a/luni/src/test/java/libcore/libcore/icu/TimeZoneIntegrationTest.java
+++ b/luni/src/test/java/libcore/libcore/icu/TimeZoneIntegrationTest.java
@@ -42,7 +42,7 @@
import libcore.timezone.TimeZoneDataFiles;
import libcore.timezone.TimeZoneFinder;
import libcore.timezone.TzDataSetVersion;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
import libcore.util.CoreLibraryDebug;
import libcore.util.DebugInfo;
@@ -185,7 +185,7 @@
public void testTimeZoneDataVersion() {
String icu4cTzVersion = Icu4cMetadata.getTzdbVersion();
- String zoneInfoTzVersion = ZoneInfoDB.getInstance().getVersion();
+ String zoneInfoTzVersion = ZoneInfoDb.getInstance().getVersion();
assertEquals(icu4cTzVersion, zoneInfoTzVersion);
String icu4jTzVersion = android.icu.util.TimeZone.getTZDataVersion();
@@ -291,7 +291,7 @@
"core_library.timezone.source.system_status"));
assertFileExists(
TimeZoneDataFiles.getSystemTzFile(TzDataSetVersion.DEFAULT_FILE_NAME));
- assertFileExists(TimeZoneDataFiles.getSystemTzFile(ZoneInfoDB.TZDATA_FILE_NAME));
+ assertFileExists(TimeZoneDataFiles.getSystemTzFile(ZoneInfoDb.TZDATA_FILE_NAME));
// The following files once existed in /system but have been removed as part of APEX work.
assertFileDoesNotExist(
TimeZoneDataFiles.getSystemTzFile(TimeZoneFinder.TZLOOKUP_FILE_NAME));
@@ -309,7 +309,7 @@
Function<String, String> pathCreationFunction) {
List<String> relativePaths = Arrays.asList(
TzDataSetVersion.DEFAULT_FILE_NAME,
- ZoneInfoDB.TZDATA_FILE_NAME,
+ ZoneInfoDb.TZDATA_FILE_NAME,
TimeZoneFinder.TZLOOKUP_FILE_NAME);
return relativePaths.stream().map(pathCreationFunction).collect(Collectors.toList());
}
@@ -336,7 +336,7 @@
*/
@Test
public void testTimeZoneIdLookup() {
- String[] zoneInfoDbAvailableIds = ZoneInfoDB.getInstance().getAvailableIDs();
+ String[] zoneInfoDbAvailableIds = ZoneInfoDb.getInstance().getAvailableIDs();
// ICU has a known set of IDs. We want ANY because we don't want to filter to ICU's
// canonical IDs only.
diff --git a/luni/src/test/java/libcore/libcore/timezone/ZoneInfoDBTest.java b/luni/src/test/java/libcore/libcore/timezone/ZoneInfoDbTest.java
similarity index 88%
rename from luni/src/test/java/libcore/libcore/timezone/ZoneInfoDBTest.java
rename to luni/src/test/java/libcore/libcore/timezone/ZoneInfoDbTest.java
index 1e869fa..48eb286 100644
--- a/luni/src/test/java/libcore/libcore/timezone/ZoneInfoDBTest.java
+++ b/luni/src/test/java/libcore/libcore/timezone/ZoneInfoDbTest.java
@@ -23,22 +23,22 @@
import libcore.timezone.TimeZoneDataFiles;
import libcore.timezone.testing.ZoneInfoTestHelper;
import libcore.util.ZoneInfo;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
-import static libcore.timezone.ZoneInfoDB.SIZEOF_INDEX_ENTRY;
+import static libcore.timezone.ZoneInfoDb.SIZEOF_INDEX_ENTRY;
-public class ZoneInfoDBTest extends junit.framework.TestCase {
+public class ZoneInfoDbTest extends junit.framework.TestCase {
// The base tzdata file, always present on a device.
private static final String TZDATA_FILE =
- TimeZoneDataFiles.getTimeZoneModuleTzFile(ZoneInfoDB.TZDATA_FILE_NAME);
+ TimeZoneDataFiles.getTimeZoneModuleTzFile(ZoneInfoDb.TZDATA_FILE_NAME);
// An empty override file should fall back to the default file.
public void testLoadTzDataWithFallback_emptyOverrideFile() throws Exception {
String emptyFilePath = makeEmptyFile().getPath();
- try (ZoneInfoDB data = ZoneInfoDB.loadTzData(TZDATA_FILE);
- ZoneInfoDB dataWithEmptyOverride =
- ZoneInfoDB.loadTzDataWithFallback(emptyFilePath, TZDATA_FILE)) {
+ try (ZoneInfoDb data = ZoneInfoDb.loadTzData(TZDATA_FILE);
+ ZoneInfoDb dataWithEmptyOverride =
+ ZoneInfoDb.loadTzDataWithFallback(emptyFilePath, TZDATA_FILE)) {
assertEquals(data.getVersion(), dataWithEmptyOverride.getVersion());
assertEquals(data.getAvailableIDs().length, dataWithEmptyOverride.getAvailableIDs().length);
}
@@ -47,9 +47,9 @@
// A corrupt override file should fall back to the default file.
public void testLoadTzDataWithFallback_corruptOverrideFile() throws Exception {
String corruptFilePath = makeCorruptFile().getPath();
- try (ZoneInfoDB data = ZoneInfoDB.loadTzData(TZDATA_FILE);
- ZoneInfoDB dataWithCorruptOverride =
- ZoneInfoDB.loadTzDataWithFallback(corruptFilePath, TZDATA_FILE)) {
+ try (ZoneInfoDb data = ZoneInfoDb.loadTzData(TZDATA_FILE);
+ ZoneInfoDb dataWithCorruptOverride =
+ ZoneInfoDb.loadTzDataWithFallback(corruptFilePath, TZDATA_FILE)) {
assertEquals(data.getVersion(), dataWithCorruptOverride.getVersion());
assertEquals(data.getAvailableIDs().length, dataWithCorruptOverride.getAvailableIDs().length);
}
@@ -58,7 +58,7 @@
// Given no tzdata files we can use, we should fall back to built-in "GMT".
public void testLoadTzDataWithFallback_noGoodFile() throws Exception {
String emptyFilePath = makeEmptyFile().getPath();
- try (ZoneInfoDB data = ZoneInfoDB.loadTzDataWithFallback(emptyFilePath)) {
+ try (ZoneInfoDb data = ZoneInfoDb.loadTzDataWithFallback(emptyFilePath)) {
assertEquals("missing", data.getVersion());
assertEquals(1, data.getAvailableIDs().length);
assertEquals("GMT", data.getAvailableIDs()[0]);
@@ -80,9 +80,9 @@
content[10] = 'z';
File goodFile = makeTemporaryFile(content);
- try (ZoneInfoDB dataWithOverride =
- ZoneInfoDB.loadTzDataWithFallback(goodFile.getPath(), TZDATA_FILE);
- ZoneInfoDB data = ZoneInfoDB.loadTzData(TZDATA_FILE)) {
+ try (ZoneInfoDb dataWithOverride =
+ ZoneInfoDb.loadTzDataWithFallback(goodFile.getPath(), TZDATA_FILE);
+ ZoneInfoDb data = ZoneInfoDb.loadTzData(TZDATA_FILE)) {
assertEquals("9999z", dataWithOverride.getVersion());
assertEquals(data.getAvailableIDs().length, dataWithOverride.getAvailableIDs().length);
@@ -106,7 +106,7 @@
byte[] data = new ZoneInfoTestHelper.TzDataBuilder().initializeToValid().build();
File testFile = makeTemporaryFile(data);
try {
- assertNotNull(ZoneInfoDB.loadTzData(testFile.getPath()));
+ assertNotNull(ZoneInfoDb.loadTzData(testFile.getPath()));
} finally {
testFile.delete();
}
@@ -149,7 +149,7 @@
// Sections must be in the correct order: section sizing is calculated using them.
int indexOffset = 10;
builder.setIndexOffsetOverride(indexOffset);
- int dataOffset = indexOffset + ZoneInfoDB.SIZEOF_INDEX_ENTRY - 1;
+ int dataOffset = indexOffset + ZoneInfoDb.SIZEOF_INDEX_ENTRY - 1;
builder.setDataOffsetOverride(dataOffset);
builder.setZoneTabOffsetOverride(dataOffset + 40);
@@ -207,7 +207,7 @@
private static void checkInvalidDataDetected(byte[] data) throws Exception {
File testFile = makeTemporaryFile(data);
try {
- assertNull(ZoneInfoDB.loadTzData(testFile.getPath()));
+ assertNull(ZoneInfoDb.loadTzData(testFile.getPath()));
} finally {
testFile.delete();
}
@@ -215,7 +215,7 @@
// Confirms any caching that exists correctly handles TimeZone mutability.
public void testMakeTimeZone_timeZoneMutability() throws Exception {
- try (ZoneInfoDB data = ZoneInfoDB.loadTzData(TZDATA_FILE)) {
+ try (ZoneInfoDb data = ZoneInfoDb.loadTzData(TZDATA_FILE)) {
String tzId = "Europe/London";
ZoneInfo first = data.makeTimeZone(tzId);
ZoneInfo second = data.makeTimeZone(tzId);
@@ -233,14 +233,14 @@
}
public void testMakeTimeZone_notFound() throws Exception {
- try (ZoneInfoDB data = ZoneInfoDB.loadTzData(TZDATA_FILE)) {
+ try (ZoneInfoDb data = ZoneInfoDb.loadTzData(TZDATA_FILE)) {
assertNull(data.makeTimeZone("THIS_TZ_DOES_NOT_EXIST"));
assertFalse(data.hasTimeZone("THIS_TZ_DOES_NOT_EXIST"));
}
}
public void testMakeTimeZone_found() throws Exception {
- try (ZoneInfoDB data = ZoneInfoDB.loadTzData(TZDATA_FILE)) {
+ try (ZoneInfoDb data = ZoneInfoDb.loadTzData(TZDATA_FILE)) {
assertNotNull(data.makeTimeZone("Europe/London"));
assertTrue(data.hasTimeZone("Europe/London"));
}
diff --git a/luni/src/test/java/libcore/libcore/util/ZoneInfoTest.java b/luni/src/test/java/libcore/libcore/util/ZoneInfoTest.java
index 6a54af1..8b9715f 100644
--- a/luni/src/test/java/libcore/libcore/util/ZoneInfoTest.java
+++ b/luni/src/test/java/libcore/libcore/util/ZoneInfoTest.java
@@ -26,7 +26,7 @@
import java.util.Arrays;
import java.util.Date;
import libcore.io.BufferIterator;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
import libcore.timezone.testing.ZoneInfoTestHelper;
import libcore.util.ZoneInfo;
@@ -470,7 +470,7 @@
* creates the {@link ZoneInfo} instances does not prevent any of the time zones being loaded.
*/
public void testReadTimeZone_All() throws Exception {
- ZoneInfoDB instance = ZoneInfoDB.getInstance();
+ ZoneInfoDb instance = ZoneInfoDb.getInstance();
String[] availableIDs = instance.getAvailableIDs();
Arrays.sort(availableIDs);
for (String id : availableIDs) {
diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index 0560a6e..c2f9b5a 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -1178,11 +1178,11 @@
ctor public TzDataSetVersion.TzDataSetException(String, Throwable);
}
- public final class ZoneInfoDB implements java.lang.AutoCloseable {
- method public static libcore.timezone.ZoneInfoDB getInstance();
+ public final class ZoneInfoDb implements java.lang.AutoCloseable {
+ method public static libcore.timezone.ZoneInfoDb getInstance();
method public String getVersion();
method public boolean hasTimeZone(String) throws java.io.IOException;
- method public static libcore.timezone.ZoneInfoDB loadTzData(String);
+ method public static libcore.timezone.ZoneInfoDb loadTzData(String);
method public libcore.util.ZoneInfo makeTimeZone(String) throws java.io.IOException;
method public void validate() throws java.io.IOException;
}
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 521d026..e3c8c16 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -258,7 +258,7 @@
"luni/src/main/java/libcore/timezone/TimeZoneFinder.java",
"luni/src/main/java/libcore/timezone/TzDataSetVersion.java",
"luni/src/main/java/libcore/timezone/XmlUtils.java",
- "luni/src/main/java/libcore/timezone/ZoneInfoDB.java",
+ "luni/src/main/java/libcore/timezone/ZoneInfoDb.java",
"luni/src/main/java/libcore/util/ArrayUtils.java",
"luni/src/main/java/libcore/util/BasicLruCache.java",
"luni/src/main/java/libcore/util/CoreLibraryDebug.java",
diff --git a/ojluni/src/main/java/java/util/TimeZone.java b/ojluni/src/main/java/java/util/TimeZone.java
index 61826ba..cf5e5f8 100644
--- a/ojluni/src/main/java/java/util/TimeZone.java
+++ b/ojluni/src/main/java/java/util/TimeZone.java
@@ -47,7 +47,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import libcore.io.IoUtils;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
import dalvik.system.RuntimeHooks;
@@ -557,7 +557,7 @@
* @return the specified <code>TimeZone</code>, or the GMT zone if the given ID
* cannot be understood.
*/
- // Android-changed: param s/ID/id; use ZoneInfoDB instead of ZoneInfo class.
+ // Android-changed: param s/ID/id; use ZoneInfoDb instead of ZoneInfo class.
public static synchronized TimeZone getTimeZone(String id) {
if (id == null) {
throw new NullPointerException("id == null");
@@ -576,7 +576,7 @@
// In the database?
TimeZone zone = null;
try {
- zone = ZoneInfoDB.getInstance().makeTimeZone(id);
+ zone = ZoneInfoDb.getInstance().makeTimeZone(id);
} catch (IOException ignored) {
}
@@ -666,7 +666,7 @@
* @see #getRawOffset()
*/
public static synchronized String[] getAvailableIDs(int rawOffset) {
- return ZoneInfoDB.getInstance().getAvailableIDs(rawOffset);
+ return ZoneInfoDb.getInstance().getAvailableIDs(rawOffset);
}
/**
@@ -674,7 +674,7 @@
* @return an array of IDs.
*/
public static synchronized String[] getAvailableIDs() {
- return ZoneInfoDB.getInstance().getAvailableIDs();
+ return ZoneInfoDb.getInstance().getAvailableIDs();
}
/**