Skip to content

Commit caa55cb

Browse files
Further cleanup of experimental runtime.
PiperOrigin-RevId: 948949657
1 parent 48a0e09 commit caa55cb

2 files changed

Lines changed: 0 additions & 19 deletions

File tree

java/core/src/main/java/com/google/protobuf/ManifestSchemaFactory.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ private ManifestSchemaFactory(MessageInfoFactory messageInfoFactory) {
2727
}
2828

2929
public <T> Schema<T> createSchema(Class<T> messageType) {
30-
SchemaUtil.requireGeneratedMessage(messageType);
31-
3230
if (!useLiteRuntime(messageType)) {
3331
throw new IllegalArgumentException(
3432
"Full runtime messages are not supported by this schema factory: "

java/core/src/main/java/com/google/protobuf/SchemaUtil.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,13 @@
2121
@CheckReturnValue
2222
@SuppressWarnings("rawtypes")
2323
final class SchemaUtil {
24-
private static final Class<?> GENERATED_MESSAGE_CLASS = getGeneratedMessageClass();
2524
private static final UnknownFieldSchema<?, ?> UNKNOWN_FIELD_SET_LITE_SCHEMA =
2625
new UnknownFieldSetLiteSchema();
2726

2827
private static final int DEFAULT_LOOK_UP_START_NUMBER = 40;
2928

3029
private SchemaUtil() {}
3130

32-
/**
33-
* Requires that the given message extend {@link com.google.protobuf.GeneratedMessage} or {@link
34-
* GeneratedMessageLite}.
35-
*/
36-
public static void requireGeneratedMessage(Class<?> messageType) {
37-
// TODO decide if we're keeping support for Full in schema classes and handle this
38-
// better.
39-
if (!GeneratedMessageLite.class.isAssignableFrom(messageType)
40-
&& !Android.assumeLiteRuntime
41-
&& GENERATED_MESSAGE_CLASS != null
42-
&& !GENERATED_MESSAGE_CLASS.isAssignableFrom(messageType)) {
43-
throw new IllegalArgumentException(
44-
"Message classes must extend GeneratedMessage or GeneratedMessageLite");
45-
}
46-
}
47-
4831
public static void writeDouble(int fieldNumber, double value, CodedOutputStreamWriter writer)
4932
throws IOException {
5033
if (Double.doubleToRawLongBits(value) != 0) {

0 commit comments

Comments
 (0)