Skip to content

Decouple Soy undefined from Java null in Soy extern protocol. #2746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Decouple Soy undefined from Java null in Soy extern protocol. #2746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/src/com/google/template/soy/jbcsrc/ExternCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ private int methodAccess() {
* implementation.
*/
static SoyRuntimeType getRuntimeType(SoyType type) {
SoyType nonNullable = SoyTypes.excludeNullish(type.getEffectiveType());
SoyType nonNullable = SoyTypes.excludeNull(type.getEffectiveType());
SoyRuntimeType runtimeType =
SoyRuntimeType.getUnboxedType(nonNullable)
.orElseGet(() -> SoyRuntimeType.getBoxedType(nonNullable));
Expand Down Expand Up @@ -439,7 +439,7 @@ private static Expression adaptParameter(
return JbcSrcExternRuntime.CONVERT_SOY_VALUE_TO_BIG_INTEGER.invoke(actualParam.box());
}

SoyType nonNullableSoyType = SoyTypes.excludeNullish(soyType.getEffectiveType());
SoyType nonNullableSoyType = SoyTypes.excludeNull(soyType.getEffectiveType());

// For protos, we need to unbox as Message & then cast.
if (nonNullableSoyType instanceof MessageType) {
Expand Down
2 changes: 1 addition & 1 deletion java/src/com/google/template/soy/passes/ValidateExternsPass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ private static Class<?> getType(String typeName) {

private boolean typesAreCompatible(
TypeReference parameterizedType, SoyType soyType, ExternNode extern, Mode mode) {
return typesAreCompatible(parameterizedType, soyType, extern, mode, false);
return typesAreCompatible(parameterizedType, soyType, extern, mode, true);
}

private boolean typesAreCompatible(
Expand Down
Loading