Reland "aidl: Java simpler toString"
This reverts commit d166f83c5ffe8b6e9171150c6be5d07e27b54ee4.
Reason for revert: b/285361928
Change-Id: I6a4808f516453cf47694ca7e2b4bf6a472b78df6
diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index e137eb3..75383c6 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -599,21 +599,6 @@
Options java_options = Options::From("aidl --lang=java -I . -o out a/Foo.aidl");
EXPECT_TRUE(compile_aidl(java_options, io_delegate_));
EXPECT_EQ("", GetCapturedStderr());
-
- const string expected_to_string_method = R"--(
- @Override
- public String toString() {
- switch (_tag) {
- case a: return "a.Foo.a(" + (getA()) + ")";
- case b: return "a.Foo.b(" + (java.util.Arrays.toString(getB())) + ")";
- }
- throw new IllegalStateException("unknown field: " + _tag);
- }
-)--";
-
- string java_out;
- EXPECT_TRUE(io_delegate_.GetWrittenContents("out/a/Foo.java", &java_out));
- EXPECT_THAT(java_out, testing::HasSubstr(expected_to_string_method));
}
TEST_F(AidlTest, ParcelableSupportJavaDeriveEquals) {
diff --git a/generate_java.cpp b/generate_java.cpp
index f87f532..4144454 100644
--- a/generate_java.cpp
+++ b/generate_java.cpp
@@ -206,7 +206,7 @@
ToStringFor(ctx);
out << "));\n";
}
- out << "return \"" << parcel.GetCanonicalName() << "\" + _aidl_sj.toString() ;\n";
+ out << "return \"" << parcel.GetName() << "\" + _aidl_sj.toString() ;\n";
out.Dedent();
out << "}\n";
}
@@ -225,7 +225,7 @@
.var = GetterName(*field) + "()",
.min_sdk_version = options.GetMinSdkVersion(),
};
- out << "case " << field->GetName() << ": return \"" << parcel.GetCanonicalName() << "."
+ out << "case " << field->GetName() << ": return \"" << parcel.GetName() << "."
<< field->GetName() << "(\" + (";
ToStringFor(ctx);
out << ") + \")\";\n";
diff --git a/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java b/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
index a5a9ed0..3860c7b 100644
--- a/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
+++ b/tests/golden_output/aidl-test-fixedsizearray-java-source/gen/android/aidl/fixedsizearray/FixedSizeArrayExample.java
@@ -326,7 +326,7 @@
_aidl_sj.add("pfdNullableMatrix: " + (java.util.Arrays.deepToString(pfdNullableMatrix)));
_aidl_sj.add("parcelableNullableMatrix: " + (java.util.Arrays.deepToString(parcelableNullableMatrix)));
_aidl_sj.add("interfaceNullableMatrix: " + (java.util.Arrays.deepToString(interfaceNullableMatrix)));
- return "android.aidl.fixedsizearray.FixedSizeArrayExample" + _aidl_sj.toString() ;
+ return "FixedSizeArrayExample" + _aidl_sj.toString() ;
}
@Override
public int describeContents() {
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
index 713d501..bebf9ea 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ArrayOfInterfaces.java
@@ -368,7 +368,7 @@
_aidl_sj.add("nullable_iface: " + (java.util.Objects.toString(nullable_iface)));
_aidl_sj.add("iface_array: " + (java.util.Arrays.toString(iface_array)));
_aidl_sj.add("nullable_iface_array: " + (java.util.Arrays.toString(nullable_iface_array)));
- return "android.aidl.tests.ArrayOfInterfaces.MyParcelable" + _aidl_sj.toString() ;
+ return "MyParcelable" + _aidl_sj.toString() ;
}
@Override
public boolean equals(Object other) {
@@ -551,10 +551,10 @@
@Override
public String toString() {
switch (_tag) {
- case iface: return "android.aidl.tests.ArrayOfInterfaces.MyUnion.iface(" + (java.util.Objects.toString(getIface())) + ")";
- case nullable_iface: return "android.aidl.tests.ArrayOfInterfaces.MyUnion.nullable_iface(" + (java.util.Objects.toString(getNullable_iface())) + ")";
- case iface_array: return "android.aidl.tests.ArrayOfInterfaces.MyUnion.iface_array(" + (java.util.Arrays.toString(getIface_array())) + ")";
- case nullable_iface_array: return "android.aidl.tests.ArrayOfInterfaces.MyUnion.nullable_iface_array(" + (java.util.Arrays.toString(getNullable_iface_array())) + ")";
+ case iface: return "MyUnion.iface(" + (java.util.Objects.toString(getIface())) + ")";
+ case nullable_iface: return "MyUnion.nullable_iface(" + (java.util.Objects.toString(getNullable_iface())) + ")";
+ case iface_array: return "MyUnion.iface_array(" + (java.util.Arrays.toString(getIface_array())) + ")";
+ case nullable_iface_array: return "MyUnion.nullable_iface_array(" + (java.util.Arrays.toString(getNullable_iface_array())) + ")";
}
throw new IllegalStateException("unknown field: " + _tag);
}
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/GenericStructuredParcelable.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/GenericStructuredParcelable.java
index 1e19a6f..ca2a79f 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/GenericStructuredParcelable.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/GenericStructuredParcelable.java
@@ -52,7 +52,7 @@
java.util.StringJoiner _aidl_sj = new java.util.StringJoiner(", ", "{", "}");
_aidl_sj.add("a: " + (a));
_aidl_sj.add("b: " + (b));
- return "android.aidl.tests.GenericStructuredParcelable" + _aidl_sj.toString() ;
+ return "GenericStructuredParcelable" + _aidl_sj.toString() ;
}
@Override
public int describeContents() {
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
index f5cdd4b..4b87406 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ListOfInterfaces.java
@@ -356,7 +356,7 @@
_aidl_sj.add("nullable_iface: " + (java.util.Objects.toString(nullable_iface)));
_aidl_sj.add("iface_list: " + (java.util.Objects.toString(iface_list)));
_aidl_sj.add("nullable_iface_list: " + (java.util.Objects.toString(nullable_iface_list)));
- return "android.aidl.tests.ListOfInterfaces.MyParcelable" + _aidl_sj.toString() ;
+ return "MyParcelable" + _aidl_sj.toString() ;
}
@Override
public boolean equals(Object other) {
@@ -541,10 +541,10 @@
@Override
public String toString() {
switch (_tag) {
- case iface: return "android.aidl.tests.ListOfInterfaces.MyUnion.iface(" + (java.util.Objects.toString(getIface())) + ")";
- case nullable_iface: return "android.aidl.tests.ListOfInterfaces.MyUnion.nullable_iface(" + (java.util.Objects.toString(getNullable_iface())) + ")";
- case iface_list: return "android.aidl.tests.ListOfInterfaces.MyUnion.iface_list(" + (java.util.Objects.toString(getIface_list())) + ")";
- case nullable_iface_list: return "android.aidl.tests.ListOfInterfaces.MyUnion.nullable_iface_list(" + (java.util.Objects.toString(getNullable_iface_list())) + ")";
+ case iface: return "MyUnion.iface(" + (java.util.Objects.toString(getIface())) + ")";
+ case nullable_iface: return "MyUnion.nullable_iface(" + (java.util.Objects.toString(getNullable_iface())) + ")";
+ case iface_list: return "MyUnion.iface_list(" + (java.util.Objects.toString(getIface_list())) + ")";
+ case nullable_iface_list: return "MyUnion.nullable_iface_list(" + (java.util.Objects.toString(getNullable_iface_list())) + ")";
}
throw new IllegalStateException("unknown field: " + _tag);
}
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/OtherParcelableForToString.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/OtherParcelableForToString.java
index 11adbeb..3c35b8b 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/OtherParcelableForToString.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/OtherParcelableForToString.java
@@ -47,7 +47,7 @@
public String toString() {
java.util.StringJoiner _aidl_sj = new java.util.StringJoiner(", ", "{", "}");
_aidl_sj.add("field: " + (java.util.Objects.toString(field)));
- return "android.aidl.tests.OtherParcelableForToString" + _aidl_sj.toString() ;
+ return "OtherParcelableForToString" + _aidl_sj.toString() ;
}
@Override
public int describeContents() {
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ParcelableForToString.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ParcelableForToString.java
index 56242a5..53e615c 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ParcelableForToString.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/ParcelableForToString.java
@@ -157,7 +157,7 @@
_aidl_sj.add("nullList: " + (java.util.Objects.toString(nullList)));
_aidl_sj.add("parcelableGeneric: " + (java.util.Objects.toString(parcelableGeneric)));
_aidl_sj.add("unionValue: " + (java.util.Objects.toString(unionValue)));
- return "android.aidl.tests.ParcelableForToString" + _aidl_sj.toString() ;
+ return "ParcelableForToString" + _aidl_sj.toString() ;
}
@Override
public int describeContents() {
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/StructuredParcelable.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/StructuredParcelable.java
index ee59c9c..e7f6317 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/StructuredParcelable.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/StructuredParcelable.java
@@ -324,7 +324,7 @@
_aidl_sj.add("u: " + (java.util.Objects.toString(u)));
_aidl_sj.add("shouldBeConstS1: " + (java.util.Objects.toString(shouldBeConstS1)));
_aidl_sj.add("defaultWithFoo: " + (android.aidl.tests.IntEnum.$.toString(defaultWithFoo)));
- return "android.aidl.tests.StructuredParcelable" + _aidl_sj.toString() ;
+ return "StructuredParcelable" + _aidl_sj.toString() ;
}
@Override
public boolean equals(Object other) {
@@ -449,7 +449,7 @@
@Override
public String toString() {
java.util.StringJoiner _aidl_sj = new java.util.StringJoiner(", ", "{", "}");
- return "android.aidl.tests.StructuredParcelable.Empty" + _aidl_sj.toString() ;
+ return "Empty" + _aidl_sj.toString() ;
}
@Override
public boolean equals(Object other) {
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/Union.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/Union.java
index 0149b25..f1b5a9b 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/Union.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/Union.java
@@ -235,13 +235,13 @@
@Override
public String toString() {
switch (_tag) {
- case ns: return "android.aidl.tests.Union.ns(" + (java.util.Arrays.toString(getNs())) + ")";
- case n: return "android.aidl.tests.Union.n(" + (getN()) + ")";
- case m: return "android.aidl.tests.Union.m(" + (getM()) + ")";
- case s: return "android.aidl.tests.Union.s(" + (java.util.Objects.toString(getS())) + ")";
- case ibinder: return "android.aidl.tests.Union.ibinder(" + (java.util.Objects.toString(getIbinder())) + ")";
- case ss: return "android.aidl.tests.Union.ss(" + (java.util.Objects.toString(getSs())) + ")";
- case be: return "android.aidl.tests.Union.be(" + (getBe()) + ")";
+ case ns: return "Union.ns(" + (java.util.Arrays.toString(getNs())) + ")";
+ case n: return "Union.n(" + (getN()) + ")";
+ case m: return "Union.m(" + (getM()) + ")";
+ case s: return "Union.s(" + (java.util.Objects.toString(getS())) + ")";
+ case ibinder: return "Union.ibinder(" + (java.util.Objects.toString(getIbinder())) + ")";
+ case ss: return "Union.ss(" + (java.util.Objects.toString(getSs())) + ")";
+ case be: return "Union.be(" + (getBe()) + ")";
}
throw new IllegalStateException("unknown field: " + _tag);
}
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/EnumUnion.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/EnumUnion.java
index 44e8006..eff730a 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/EnumUnion.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/EnumUnion.java
@@ -139,9 +139,9 @@
@Override
public String toString() {
switch (_tag) {
- case intEnum: return "android.aidl.tests.unions.EnumUnion.intEnum(" + (android.aidl.tests.IntEnum.$.toString(getIntEnum())) + ")";
- case longEnum: return "android.aidl.tests.unions.EnumUnion.longEnum(" + (getLongEnum()) + ")";
- case deprecatedField: return "android.aidl.tests.unions.EnumUnion.deprecatedField(" + (getDeprecatedField()) + ")";
+ case intEnum: return "EnumUnion.intEnum(" + (android.aidl.tests.IntEnum.$.toString(getIntEnum())) + ")";
+ case longEnum: return "EnumUnion.longEnum(" + (getLongEnum()) + ")";
+ case deprecatedField: return "EnumUnion.deprecatedField(" + (getDeprecatedField()) + ")";
}
throw new IllegalStateException("unknown field: " + _tag);
}
diff --git a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/UnionInUnion.java b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/UnionInUnion.java
index 5725756..a780270 100644
--- a/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/UnionInUnion.java
+++ b/tests/golden_output/aidl-test-interface-java-source/gen/android/aidl/tests/unions/UnionInUnion.java
@@ -123,8 +123,8 @@
@Override
public String toString() {
switch (_tag) {
- case first: return "android.aidl.tests.unions.UnionInUnion.first(" + (java.util.Objects.toString(getFirst())) + ")";
- case second: return "android.aidl.tests.unions.UnionInUnion.second(" + (getSecond()) + ")";
+ case first: return "UnionInUnion.first(" + (java.util.Objects.toString(getFirst())) + ")";
+ case second: return "UnionInUnion.second(" + (getSecond()) + ")";
}
throw new IllegalStateException("unknown field: " + _tag);
}
diff --git a/tests/java/src/android/aidl/tests/TestServiceClient.java b/tests/java/src/android/aidl/tests/TestServiceClient.java
index 8ce2a19..3b69c4f 100644
--- a/tests/java/src/android/aidl/tests/TestServiceClient.java
+++ b/tests/java/src/android/aidl/tests/TestServiceClient.java
@@ -775,7 +775,7 @@
assertThat(p.u.getNs(), is(new int[] {1, 2, 3}));
assertThat(p.shouldBeConstS1.getS(), is(Union.S1));
- final String expected = "android.aidl.tests.StructuredParcelable{"
+ final String expected = "StructuredParcelable{"
+ "shouldContainThreeFs: [17, 17, 17], "
+ "f: 17, "
+ "shouldBeJerry: Jerry, "
@@ -809,7 +809,7 @@
+ "int64_max: 9223372036854775807, "
+ "hexInt32_neg_1: -1, "
+ "ibinder: null, "
- + "empty: android.aidl.tests.StructuredParcelable.Empty{}, "
+ + "empty: Empty{}, "
+ "int8_1: [1, 1, 1, 1, 1], "
+ "int32_1: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "
+ "1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "
@@ -830,8 +830,8 @@
+ "addString1: hello world!, "
+ "addString2: The quick brown fox jumps over the lazy dog., "
+ "shouldSetBit0AndBit2: 5, "
- + "u: android.aidl.tests.Union.ns([1, 2, 3]), "
- + "shouldBeConstS1: android.aidl.tests.Union.s(a string constant in union), "
+ + "u: Union.ns([1, 2, 3]), "
+ + "shouldBeConstS1: Union.s(a string constant in union), "
+ "defaultWithFoo: FOO"
+ "}";
assertThat(p.toString(), is(expected));
@@ -891,7 +891,7 @@
p.parcelableGeneric = gen;
p.unionValue = null; // for testing even though it is not @nullable in .aidl
- final String expected = "android.aidl.tests.ParcelableForToString{"
+ final String expected = "ParcelableForToString{"
+ "intValue: 10, "
+ "intArray: [20, 30], "
+ "longValue: 100, "
@@ -907,15 +907,15 @@
+ "stringValue: this is a string, "
+ "stringArray: [hello, world], "
+ "stringList: [alice, bob], "
- + "parcelableValue: android.aidl.tests.OtherParcelableForToString{field: other}, "
+ + "parcelableValue: OtherParcelableForToString{field: other}, "
+ "parcelableArray: ["
- + "android.aidl.tests.OtherParcelableForToString{field: other}, "
- + "android.aidl.tests.OtherParcelableForToString{field: other}], "
+ + "OtherParcelableForToString{field: other}, "
+ + "OtherParcelableForToString{field: other}], "
+ "enumValue: FOO, "
+ "enumArray: [FOO, BAR], "
+ "nullArray: null, "
+ "nullList: null, "
- + "parcelableGeneric: android.aidl.tests.GenericStructuredParcelable{a: 1, b: 2}, "
+ + "parcelableGeneric: GenericStructuredParcelable{a: 1, b: 2}, "
+ "unionValue: null"
+ "}";
