From 62b7e645aaf4caac1c687b9c9c88da6c1ca4bd53 Mon Sep 17 00:00:00 2001 From: ballerina-bot Date: Mon, 19 Apr 2021 16:41:45 +0530 Subject: [PATCH 1/2] [Automated] Update dependencies --- gradle.properties | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5ef11c69..186dc58f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,24 @@ org.gradle.caching=true group=org.ballerinalang version=0.2.0-alpha8-SNAPSHOT -ballerinaLangVersion=2.0.0-alpha8-20210415-160600-dab819c1 +ballerinaLangVersion=2.0.0-alpha8-20210419-135100-df7a4e3f puppycrawlCheckstyleVersion=8.18 slf4jVersion=1.7.30 testngVersion=7.4.0 -stdlibHttpVersion=1.1.0-alpha8-20210418-092200-49c18e9 -stdlibMimeVersion=1.1.0-alpha8-20210418-001200-37a431c -stdlibAuthVersion=1.1.0-alpha8-20210418-001900-d55937b -stdlibFileVersion=0.7.0-alpha8-20210418-001100-ae8e9b0 -stdlibCacheVersion=2.1.0-alpha8-20210417-192100-1405723 -stdlibCryptoVersion=1.1.0-alpha8-20210417-134800-4ee385b -stdlibUrlVersion=1.1.0-alpha8-20210417-130600-0f55f66 -stdlibTaskVersion=2.0.0-alpha9-20210417-135300-7347ef9 -stdlibLogVersion=1.1.0-alpha8-20210417-161800-c42de3c -stdlibTimeVersion=2.0.0-alpha9-20210417-131000-020f5ad -stdlibOsVersion=0.8.0-alpha8-20210417-131700-bc63939 -stdlibIoVersion=0.6.0-alpha8-20210416-191300-0f2ca4d -stdlibRegexVersion=0.7.0-alpha8-20210417-130900-933fec6 -stdlibUuidVersion=0.10.0-alpha8-20210417-195500-bf7924c -stdlibJwtVersion=1.1.0-alpha8-20210418-001900-cfdccb8 -stdlibOAuth2Version=1.1.0-alpha8-20210418-002100-f258398 +stdlibHttpVersion=1.1.0-alpha8-20210419-163700-69671d0 +stdlibMimeVersion=1.1.0-alpha8-20210419-155000-6c328bd +stdlibAuthVersion=1.1.0-alpha8-20210419-160000-2fbc0ca +stdlibFileVersion=0.7.0-alpha8-20210419-154300-85954e6 +stdlibCacheVersion=2.1.0-alpha8-20210419-154300-cb61a81 +stdlibCryptoVersion=1.1.0-alpha8-20210419-152100-6e848d1 +stdlibUrlVersion=1.1.0-alpha8-20210419-151500-8f8e0f8 +stdlibTaskVersion=2.0.0-alpha9-20210419-153000-b823c58 +stdlibLogVersion=1.1.0-alpha8-20210419-152600-5c757c5 +stdlibTimeVersion=2.0.0-alpha9-20210419-151500-2eaf2a8 +stdlibOsVersion=0.8.0-alpha8-20210419-152500-b13f5c3 +stdlibIoVersion=0.6.0-alpha8-20210419-151200-3a2e185 +stdlibRegexVersion=0.7.0-alpha8-20210419-151500-0b7384c +stdlibUuidVersion=0.10.0-alpha8-20210419-154900-92095bc +stdlibJwtVersion=1.1.0-alpha8-20210419-160400-5cfdf48 +stdlibOAuth2Version=1.1.0-alpha8-20210419-160600-13088de From 644ef11ca66034a76691d980d4685bb5d0cd92e9 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Tue, 20 Apr 2021 13:03:38 +0530 Subject: [PATCH 2/2] Fix type validation issue with implicit new expressions --- .../src/test/resources/testng.xml | 2 +- .../ListenerInitiationExpressionVisitor.java | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/websubhub-compiler-plugin-test/src/test/resources/testng.xml b/websubhub-compiler-plugin-test/src/test/resources/testng.xml index bbd2633a..93827308 100644 --- a/websubhub-compiler-plugin-test/src/test/resources/testng.xml +++ b/websubhub-compiler-plugin-test/src/test/resources/testng.xml @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/websubhub-compiler-plugin/src/main/java/io/ballerina/stdlib/websubhub/task/visitor/ListenerInitiationExpressionVisitor.java b/websubhub-compiler-plugin/src/main/java/io/ballerina/stdlib/websubhub/task/visitor/ListenerInitiationExpressionVisitor.java index 302518ef..3d46a58c 100644 --- a/websubhub-compiler-plugin/src/main/java/io/ballerina/stdlib/websubhub/task/visitor/ListenerInitiationExpressionVisitor.java +++ b/websubhub-compiler-plugin/src/main/java/io/ballerina/stdlib/websubhub/task/visitor/ListenerInitiationExpressionVisitor.java @@ -20,6 +20,7 @@ import io.ballerina.compiler.api.ModuleID; import io.ballerina.compiler.api.symbols.ModuleSymbol; +import io.ballerina.compiler.api.symbols.ObjectTypeSymbol; import io.ballerina.compiler.api.symbols.Symbol; import io.ballerina.compiler.api.symbols.TypeDescKind; import io.ballerina.compiler.api.symbols.TypeReferenceTypeSymbol; @@ -61,17 +62,12 @@ public void visit(ImplicitNewExpressionNode node) { Optional parentSymbolOpt = context.semanticModel().symbol(parentType); if (parentSymbolOpt.isPresent() && parentSymbolOpt.get() instanceof TypeReferenceTypeSymbol) { TypeSymbol typeSymbol = ((TypeReferenceTypeSymbol) parentSymbolOpt.get()).typeDescriptor(); - if (typeSymbol.typeKind() == TypeDescKind.UNION) { - Optional refSymbolOpt = ((UnionTypeSymbol) typeSymbol).memberTypeDescriptors() - .stream().filter(e -> e.typeKind() == TypeDescKind.TYPE_REFERENCE).findFirst(); - if (refSymbolOpt.isPresent()) { - TypeReferenceTypeSymbol refSymbol = (TypeReferenceTypeSymbol) refSymbolOpt.get(); - TypeSymbol typeDescriptor = refSymbol.typeDescriptor(); - Optional moduleId = typeDescriptor.getModule().map(ModuleSymbol::id); - String identifier = typeDescriptor.getName().orElse(""); - if (moduleId.isPresent() && isWebSubHubListener(moduleId.get(), identifier)) { - implicitNewExpressionNodes.add(node); - } + if (typeSymbol.typeKind() == TypeDescKind.OBJECT) { + ObjectTypeSymbol objectSymbol = (ObjectTypeSymbol) typeSymbol; + Optional moduleId = objectSymbol.getModule().map(ModuleSymbol::id); + String identifier = objectSymbol.getName().orElse(""); + if (moduleId.isPresent() && isWebSubHubListener(moduleId.get(), identifier)) { + implicitNewExpressionNodes.add(node); } } }