aws · NetaNir · Feb 6, 2020 · Jan 22, 2020 · Jan 25, 2020 · Jan 25, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+
+### Bug Fixes
+
+* **java:** invalid collections returned with non-class elements ([#1197](https://github.com/aws/jsii/issues/1197)) ([bbc2302](https://github.com/aws/jsii/commit/bbc23029746038e34fdd572312cec218344a368a)), closes [#1196](https://github.com/aws/jsii/issues/1196)
+
+
+### Features
+
+* **java:** annotate nullability ([#1234](https://github.com/aws/jsii/issues/1234)) ([6f2ab03](https://github.com/aws/jsii/commit/6f2ab03dfc4fe5625d97cfacdc980e85b54928a7)), closes [aws/aws-cdk#6026](https://github.com/aws/aws-cdk/issues/6026)
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 

diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "0.21.2"
+  "version": "0.22.0"
 }
diff --git a/package.json b/package.json
@@ -10,10 +10,10 @@
     "test:update": "lerna run test:update --stream"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.17.0",
-    "@typescript-eslint/parser": "^2.17.0",
+    "@typescript-eslint/eslint-plugin": "^2.19.0",
+    "@typescript-eslint/parser": "^2.19.0",
     "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.20.0",
+    "eslint-plugin-import": "^2.20.1",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-import-resolver-typescript": "^2.0.0",
     "lerna": "^3.20.2"

diff --git a/packages/@jsii/dotnet-analyzers/CHANGELOG.md b/packages/@jsii/dotnet-analyzers/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+**Note:** Version bump only for package @jsii/dotnet-analyzers
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 **Note:** Version bump only for package @jsii/dotnet-analyzers

diff --git a/packages/@jsii/dotnet-analyzers/package.json b/packages/@jsii/dotnet-analyzers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsii/dotnet-analyzers",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "private": true,
   "description": ".NET Roslyn Analyzers for Jsii",
   "license": "Apache-2.0",
@@ -37,8 +37,8 @@
     "package": "package-dotnet"
   },
   "devDependencies": {
-    "@types/node": "^10.17.13",
-    "jsii-build-tools": "^0.21.2",
+    "@types/node": "^10.17.14",
+    "jsii-build-tools": "^0.22.0",
     "typescript": "~3.7.5"
   }
 }
diff --git a/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md b/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+**Note:** Version bump only for package @jsii/dotnet-jsonmodel
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 **Note:** Version bump only for package @jsii/dotnet-jsonmodel

diff --git a/packages/@jsii/dotnet-jsonmodel/package.json b/packages/@jsii/dotnet-jsonmodel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsii/dotnet-jsonmodel",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "private": true,
   "description": ".NET json model for jsii spec and api.",
   "license": "Apache-2.0",
@@ -35,8 +35,8 @@
     "package": "package-dotnet"
   },
   "devDependencies": {
-    "@types/node": "^10.17.13",
-    "jsii-build-tools": "^0.21.2",
+    "@types/node": "^10.17.14",
+    "jsii-build-tools": "^0.22.0",
     "typescript": "~3.7.5"
   }
 }
diff --git a/...tnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj b/...tnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />

diff --git a/packages/@jsii/dotnet-runtime-test/CHANGELOG.md b/packages/@jsii/dotnet-runtime-test/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+
+### Bug Fixes
+
+* **java:** invalid collections returned with non-class elements ([#1197](https://github.com/aws/jsii/issues/1197)) ([bbc2302](https://github.com/aws/jsii/commit/bbc23029746038e34fdd572312cec218344a368a)), closes [#1196](https://github.com/aws/jsii/issues/1196)
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 **Note:** Version bump only for package @jsii/dotnet-runtime-test

diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsii/dotnet-runtime-test",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "private": true,
   "description": "Tests for the .NET client for jsii runtime",
   "license": "Apache-2.0",
@@ -30,10 +30,10 @@
     "test:update": "UPDATE_DIFF=1 npm run test"
   },
   "devDependencies": {
-    "@jsii/dotnet-runtime": "^0.21.2",
-    "@types/node": "^10.17.13",
-    "jsii-calc": "^0.21.2",
-    "jsii-pacmak": "^0.21.2",
+    "@jsii/dotnet-runtime": "^0.22.0",
+    "@types/node": "^10.17.14",
+    "jsii-calc": "^0.22.0",
+    "jsii-pacmak": "^0.22.0",
     "typescript": "~3.7.5"
   }
 }
diff --git a/...est/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj b/...est/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj
@@ -12,7 +12,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

diff --git a/...es/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/...es/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs
@@ -1423,5 +1423,41 @@ protected override string Property
                 set => _property = $"String<{value}>";
             }
         }
+
+        [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_ListOfStructs))]
+        public void CollectionOfInterfaces_ListOfStructs()
+        {
+            foreach (var elt in InterfaceCollections.ListOfStructs())
+            {
+                Assert.IsAssignableFrom<IStructA>(elt);
+            }
+        }
+
+        [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_ListOfInterfaces))]
+        public void CollectionOfInterfaces_ListOfInterfaces()
+        {
+            foreach (var elt in InterfaceCollections.ListOfInterfaces())
+            {
+                Assert.IsAssignableFrom<IBell>(elt);
+            }
+        }
+
+        [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_MapOfStructs))]
+        public void CollectionOfInterfaces_MapOfStructs()
+        {
+            foreach (var elt in InterfaceCollections.MapOfStructs().Values)
+            {
+                Assert.IsAssignableFrom<IStructA>(elt);
+            }
+        }
+
+        [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_MapOfInterfaces))]
+        public void CollectionOfInterfaces_MapOfInterfaces()
+        {
+            foreach (var elt in InterfaceCollections.MapOfInterfaces().Values)
+            {
+                Assert.IsAssignableFrom<IBell>(elt);
+            }
+        }
     }
 }
diff --git a/packages/@jsii/dotnet-runtime/CHANGELOG.md b/packages/@jsii/dotnet-runtime/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+**Note:** Version bump only for package @jsii/dotnet-runtime
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 **Note:** Version bump only for package @jsii/dotnet-runtime

diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsii/dotnet-runtime",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "private": true,
   "description": ".NET client for jsii runtime",
   "license": "Apache-2.0",
@@ -37,12 +37,12 @@
     "package": "package-dotnet"
   },
   "devDependencies": {
-    "@jsii/dotnet-jsonmodel": "^0.21.2",
-    "@jsii/runtime": "^0.21.2",
-    "@types/node": "^10.17.13",
-    "@types/semver": "^6.2.0",
-    "jsii-build-tools": "^0.21.2",
-    "semver": "^7.1.1",
+    "@jsii/dotnet-jsonmodel": "^0.22.0",
+    "@jsii/runtime": "^0.22.0",
+    "@types/node": "^10.17.14",
+    "@types/semver": "^7.1.0",
+    "jsii-build-tools": "^0.22.0",
+    "semver": "^7.1.2",
     "typescript": "~3.7.5"
   }
 }
diff --git a/...sii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj b/...sii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NSubstitute" Version="4.2.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

diff --git a/packages/@jsii/java-runtime-test/CHANGELOG.md b/packages/@jsii/java-runtime-test/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+
+### Bug Fixes
+
+* **java:** invalid collections returned with non-class elements ([#1197](https://github.com/aws/jsii/issues/1197)) ([bbc2302](https://github.com/aws/jsii/commit/bbc23029746038e34fdd572312cec218344a368a)), closes [#1196](https://github.com/aws/jsii/issues/1196)
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 **Note:** Version bump only for package @jsii/java-runtime-test

diff --git a/packages/@jsii/java-runtime-test/package.json b/packages/@jsii/java-runtime-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsii/java-runtime-test",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "private": true,
   "description": "Tests for the Java client for jsii runtime",
   "license": "Apache-2.0",
@@ -28,8 +28,8 @@
     "test:update": "UPDATE_DIFF=1 npm run test"
   },
   "devDependencies": {
-    "@jsii/java-runtime": "^0.21.2",
-    "jsii-calc": "^0.21.2",
-    "jsii-pacmak": "^0.21.2"
+    "@jsii/java-runtime": "^0.22.0",
+    "jsii-calc": "^0.22.0",
+    "jsii-pacmak": "^0.22.0"
   }
 }
diff --git a/.../java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java b/.../java-runtime-test/project/src/test/java/software/amazon/jsii/testing/ComplianceTest.java
@@ -1691,4 +1691,32 @@ protected void setProperty(String value) {
 
         assertEquals("Wrapped<String<Oomf!>>", abstractSuite.workItAll("Oomf!"));
     }
+
+    @Test
+    public void collectionOfInterfaces_ListOfStructs() {
+        for (final Object obj : InterfaceCollections.listOfStructs()) {
+            assertTrue(obj + " is an instance of " + StructA.class.getCanonicalName(), obj instanceof StructA);
+        }
+    }
+
+    @Test
+    public void collectionOfInterfaces_ListOfInterfaces() {
+        for (final Object obj : InterfaceCollections.listOfInterfaces()) {
+            assertTrue(obj + " is an instance of " + IBell.class.getCanonicalName(), obj instanceof IBell);
+        }
+    }
+
+    @Test
+    public void collectionOfInterfaces_MapOfStructs() {
+        for (final Object obj : InterfaceCollections.mapOfStructs().values()) {
+            assertTrue(obj + " is an instance of " + StructA.class.getCanonicalName(), obj instanceof StructA);
+        }
+    }
+
+    @Test
+    public void collectionOfInterfaces_MapOfInterfaces() {
+        for (final Object obj : InterfaceCollections.mapOfInterfaces().values()) {
+            assertTrue(obj + " is an instance of " + IBell.class.getCanonicalName(), obj instanceof IBell);
+        }
+    }
 }
diff --git a/packages/@jsii/java-runtime/CHANGELOG.md b/packages/@jsii/java-runtime/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06)
+
+
+### Bug Fixes
+
+* **java:** invalid collections returned with non-class elements ([#1197](https://github.com/aws/jsii/issues/1197)) ([bbc2302](https://github.com/aws/jsii/commit/bbc23029746038e34fdd572312cec218344a368a)), closes [#1196](https://github.com/aws/jsii/issues/1196)
+
+
+
+
+
 ## [0.21.2](https://github.com/aws/jsii/compare/v0.21.1...v0.21.2) (2020-01-22)
 
 

diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsii/java-runtime",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "private": true,
   "description": "Java client for jsii runtime",
   "license": "Apache-2.0",
@@ -31,9 +31,9 @@
     "package": "package-java"
   },
   "devDependencies": {
-    "@jsii/runtime": "^0.21.2",
-    "@types/node": "^10.17.13",
-    "jsii-build-tools": "^0.21.2",
+    "@jsii/runtime": "^0.22.0",
+    "@types/node": "^10.17.14",
+    "jsii-build-tools": "^0.22.0",
     "typescript": "~3.7.5"
   }
 }
diff --git a/packages/@jsii/java-runtime/pom.xml.t.js b/packages/@jsii/java-runtime/pom.xml.t.js
@@ -113,10 +113,10 @@ process.stdout.write(`<?xml version="1.0" encoding="UTF-8"?>
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter -->
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <version>\${mockito.version}</version>
             <scope>test</scope>
         </dependency>