Merge "Allow GenericDocument accept a String property longer than 20_000." into sc-dev (2873eb7d) · Commits · e / os / android_frameworks_base

apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -51,9 +51,6 @@ import java.util.Set;
		public class GenericDocument {
		private static final String TAG = "AppSearchGenericDocumen";

		/** The maximum {@link String#length} of a {@link String} field. */
		private static final int MAX_STRING_LENGTH = 20_000;

		/** The maximum number of indexed properties a document can have. */
		private static final int MAX_INDEXED_PROPERTIES = 16;

		@@ -1286,15 +1283,6 @@ public class GenericDocument {
		for (int i = 0; i < values.length; i++) {
		if (values[i] == null) {
		throw new IllegalArgumentException("The String at " + i + " is null.");
		} else if (values[i].length() > MAX_STRING_LENGTH) {
		throw new IllegalArgumentException(
		"The String at "
		+ i
		+ " length is: "
		+ values[i].length()
		+ ", which exceeds length limit: "
		+ MAX_STRING_LENGTH
		+ ".");
		}
		}
		mProperties.putStringArray(name, values);

+14 −0

Original line number	Diff line number	Diff line
		@@ -62,4 +62,18 @@ public class GenericDocumentTest {
		assertThat(outDoc.getPropertyDocument("propDocument").getPropertyBytesArray("propBytes"))
		.isEqualTo(new byte[][] {{3, 4}});
		}

		@Test
		public void testPutLargeDocument_exceedLimit() throws Exception {
		// Create a String property that has a very large property.
		char[] chars = new char[10_000_000];
		String property = new StringBuilder().append(chars).append("the end.").toString();

		GenericDocument doc =
		new GenericDocument.Builder<>("namespace", "id1", "schema1")
		.setPropertyString("propString", property)
		.build();

		assertThat(doc.getPropertyString("propString")).isEqualTo(property);
		}
		}