diff --git a/packages/jsii-java-runtime-test/project/.gitignore b/packages/jsii-java-runtime-test/project/.gitignore index 58d35b13a4..46aa9ff1a5 100644 --- a/packages/jsii-java-runtime-test/project/.gitignore +++ b/packages/jsii-java-runtime-test/project/.gitignore @@ -1,3 +1,5 @@ +bin/ + !index.js .idea pom.xml diff --git a/packages/jsii-java-runtime/project/.gitignore b/packages/jsii-java-runtime/project/.gitignore index d0b519a66f..a6e9c72336 100644 --- a/packages/jsii-java-runtime/project/.gitignore +++ b/packages/jsii-java-runtime/project/.gitignore @@ -1,3 +1,5 @@ +bin/ + !index.js .idea pom.xml diff --git a/packages/jsii-pacmak/test/.gitignore b/packages/jsii-pacmak/test/.gitignore index 013c75f014..140158118b 100644 --- a/packages/jsii-pacmak/test/.gitignore +++ b/packages/jsii-pacmak/test/.gitignore @@ -1,2 +1,3 @@ +java/bin !*.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/bin/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/bin/pom.xml deleted file mode 100644 index 971a2a28fb..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/bin/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - 4.0.0 - ${project.groupId}:${project.artifactId} - An example direct dependency for jsii-calc. - https://github.com/awslabs/jsii.git - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - An OSI-approved license - - - - - Amazon Web Services - - author - - https://aws.amazon.com - - - - scm:git:https://github.com/awslabs/jsii.git - https://github.com/awslabs/jsii.git - - calculator-base - software.amazon.jsii.tests - 0.7.8 - jar - - UTF-8 - - - - calculator-base-of-base - software.amazon.jsii.tests - 0.7.8 - - - software.amazon.jsii - jsii-runtime - 0.7.8 - - - javax.annotation - javax.annotation-api - [1.3.2,) - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - true - - true - true - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - - attach-javadocs - - jar - - - - - false - protected - - - - - diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.7.8.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.7.8.jsii.tgz deleted file mode 100644 index eef7587bf2..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.7.8.jsii.tgz +++ /dev/null @@ -1,2 +0,0 @@ -Placeholder for the expected module tarball -The diff-test.sh harness will replace it with the real expected tarball diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/bin/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/bin/pom.xml deleted file mode 100644 index 456375ca28..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/bin/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - 4.0.0 - ${project.groupId}:${project.artifactId} - A simple calcuator library built on JSII. - https://github.com/awslabs/jsii.git - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - An OSI-approved license - - - - - Amazon Web Services - - author - - https://aws.amazon.com - - - - scm:git:https://github.com/awslabs/jsii.git - https://github.com/awslabs/jsii.git - - calculator-lib - software.amazon.jsii.tests - 0.7.8 - jar - - UTF-8 - - - - calculator-base - software.amazon.jsii.tests - 0.7.8 - - - software.amazon.jsii - jsii-runtime - 0.7.8 - - - javax.annotation - javax.annotation-api - [1.3.2,) - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - true - - true - true - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - - attach-javadocs - - jar - - - - - false - protected - - - - - diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.7.8.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.7.8.jsii.tgz deleted file mode 100644 index eef7587bf2..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.7.8.jsii.tgz +++ /dev/null @@ -1,2 +0,0 @@ -Placeholder for the expected module tarball -The diff-test.sh harness will replace it with the real expected tarball diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii index 4c24af0f45..d245fa15e5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii @@ -2273,72 +2273,6 @@ } ] }, - "jsii-calc.NullShouldBeTreatedAsUndefined": { - "assembly": "jsii-calc", - "docs": { - "comment": "jsii#282, aws-cdk#157: null should be treated as \"undefined\"" - }, - "fqn": "jsii-calc.NullShouldBeTreatedAsUndefined", - "initializer": { - "initializer": true - }, - "kind": "class", - "methods": [ - { - "name": "giveMeUndefined", - "parameters": [ - { - "name": "value", - "type": { - "optional": true, - "primitive": "any" - } - } - ] - }, - { - "name": "giveMeUndefinedInsideAnObject", - "parameters": [ - { - "name": "input", - "type": { - "fqn": "jsii-calc.NullShouldBeTreatedAsUndefinedData" - } - } - ] - } - ], - "name": "NullShouldBeTreatedAsUndefined" - }, - "jsii-calc.NullShouldBeTreatedAsUndefinedData": { - "assembly": "jsii-calc", - "datatype": true, - "fqn": "jsii-calc.NullShouldBeTreatedAsUndefinedData", - "kind": "interface", - "name": "NullShouldBeTreatedAsUndefinedData", - "properties": [ - { - "abstract": true, - "name": "arrayWithThreeElementsAndUndefinedAsSecondArgument", - "type": { - "collection": { - "elementtype": { - "primitive": "any" - }, - "kind": "array" - } - } - }, - { - "abstract": true, - "name": "thisShouldBeUndefined", - "type": { - "optional": true, - "primitive": "any" - } - } - ] - }, "jsii-calc.NumberGenerator": { "assembly": "jsii-calc", "docs": { @@ -3510,5 +3444,5 @@ } }, "version": "0.7.8", - "fingerprint": "XAdwxl3kDei+rmEu3BW+q0nGJxSclmt9xO7wA7KL38o=" + "fingerprint": "2BaszImarh4WChl9DFUcygfTpEfXU17fHQT2wgEptfM=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs deleted file mode 100644 index c5eed0cac8..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Amazon.JSII.Runtime.Deputy; - -namespace Amazon.JSII.Tests.CalculatorNamespace -{ - [JsiiInterface(typeof(INullShouldBeTreatedAsUndefinedData), "jsii-calc.NullShouldBeTreatedAsUndefinedData")] - public interface INullShouldBeTreatedAsUndefinedData - { - [JsiiProperty("arrayWithThreeElementsAndUndefinedAsSecondArgument", "{\"collection\":{\"kind\":\"array\",\"elementtype\":{\"primitive\":\"any\"}}}")] - object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument - { - get; - set; - } - - [JsiiProperty("thisShouldBeUndefined", "{\"primitive\":\"any\",\"optional\":true}")] - object ThisShouldBeUndefined - { - get; - set; - } - } -} \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs deleted file mode 100644 index b85feaf001..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Amazon.JSII.Runtime.Deputy; - -namespace Amazon.JSII.Tests.CalculatorNamespace -{ - /// jsii#282, aws-cdk#157: null should be treated as "undefined" - [JsiiClass(typeof(NullShouldBeTreatedAsUndefined), "jsii-calc.NullShouldBeTreatedAsUndefined", "[]")] - public class NullShouldBeTreatedAsUndefined : DeputyBase - { - public NullShouldBeTreatedAsUndefined(): base(new DeputyProps(new object[]{})) - { - } - - protected NullShouldBeTreatedAsUndefined(ByRefValue reference): base(reference) - { - } - - protected NullShouldBeTreatedAsUndefined(DeputyProps props): base(props) - { - } - - [JsiiMethod("giveMeUndefined", null, "[{\"name\":\"value\",\"type\":{\"primitive\":\"any\",\"optional\":true}}]")] - public virtual void GiveMeUndefined(object value) - { - InvokeInstanceVoidMethod(new object[]{value}); - } - - [JsiiMethod("giveMeUndefinedInsideAnObject", null, "[{\"name\":\"input\",\"type\":{\"fqn\":\"jsii-calc.NullShouldBeTreatedAsUndefinedData\"}}]")] - public virtual void GiveMeUndefinedInsideAnObject(INullShouldBeTreatedAsUndefinedData input) - { - InvokeInstanceVoidMethod(new object[]{input}); - } - } -} \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs deleted file mode 100644 index 9be4f5bbd0..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Amazon.JSII.Runtime.Deputy; - -namespace Amazon.JSII.Tests.CalculatorNamespace -{ - public class NullShouldBeTreatedAsUndefinedData : DeputyBase, INullShouldBeTreatedAsUndefinedData - { - [JsiiProperty("arrayWithThreeElementsAndUndefinedAsSecondArgument", "{\"collection\":{\"kind\":\"array\",\"elementtype\":{\"primitive\":\"any\"}}}", true)] - public object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument - { - get; - set; - } - - [JsiiProperty("thisShouldBeUndefined", "{\"primitive\":\"any\",\"optional\":true}", true)] - public object ThisShouldBeUndefined - { - get; - set; - } - } -} \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs deleted file mode 100644 index 0456317c14..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Amazon.JSII.Runtime.Deputy; - -namespace Amazon.JSII.Tests.CalculatorNamespace -{ - [JsiiTypeProxy(typeof(INullShouldBeTreatedAsUndefinedData), "jsii-calc.NullShouldBeTreatedAsUndefinedData")] - internal sealed class NullShouldBeTreatedAsUndefinedDataProxy : DeputyBase, INullShouldBeTreatedAsUndefinedData - { - private NullShouldBeTreatedAsUndefinedDataProxy(ByRefValue reference): base(reference) - { - } - - [JsiiProperty("arrayWithThreeElementsAndUndefinedAsSecondArgument", "{\"collection\":{\"kind\":\"array\",\"elementtype\":{\"primitive\":\"any\"}}}")] - public object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument - { - get => GetInstanceProperty(); - set => SetInstanceProperty(value); - } - - [JsiiProperty("thisShouldBeUndefined", "{\"primitive\":\"any\",\"optional\":true}")] - public object ThisShouldBeUndefined - { - get => GetInstanceProperty(); - set => SetInstanceProperty(value); - } - } -} \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/pom.xml deleted file mode 100644 index d2a98ce47b..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/pom.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - 4.0.0 - ${project.groupId}:${project.artifactId} - A simple calcuator built on JSII. - https://github.com/awslabs/jsii.git - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - An OSI-approved license - - - - - Amazon Web Services - - author - - https://aws.amazon.com - - - Elad Ben-Israel - - maintainer - - https://github.com/eladb - - - Rico Huijbers - - maintainer - - https://github.com/rix0rrr - - - Romain Marcadier-Muller - - maintainer - - https://github.com/RomainMuller - - - - scm:git:https://github.com/awslabs/jsii.git - https://github.com/awslabs/jsii.git - - calculator - software.amazon.jsii.tests - 0.7.8 - jar - - UTF-8 - - - - calculator-base - software.amazon.jsii.tests - 0.7.8 - - - calculator-lib - software.amazon.jsii.tests - 0.7.8 - - - calculator-base-of-base - software.amazon.jsii.tests - 0.7.8 - - - software.amazon.jsii - jsii-runtime - 0.7.8 - - - javax.annotation - javax.annotation-api - [1.3.2,) - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - true - - true - true - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - - attach-javadocs - - jar - - - - - false - protected - - - - - diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/$Module.class b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/$Module.class index ed72ef5d0c..e5261d6a7e 100644 Binary files a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/$Module.class and b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/$Module.class differ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefined.class b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefined.class deleted file mode 100644 index 7d33559e28..0000000000 Binary files a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefined.class and /dev/null differ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData$Builder.class b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData$Builder.class deleted file mode 100644 index 662dc53d64..0000000000 Binary files a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData$Builder.class and /dev/null differ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData$Jsii$Proxy.class b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData$Jsii$Proxy.class deleted file mode 100644 index c56dee7671..0000000000 Binary files a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData$Jsii$Proxy.class and /dev/null differ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData.class b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData.class deleted file mode 100644 index 0f565e058f..0000000000 Binary files a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData.class and /dev/null differ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.7.8.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.7.8.jsii.tgz deleted file mode 100644 index eef7587bf2..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/bin/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.7.8.jsii.tgz +++ /dev/null @@ -1,2 +0,0 @@ -Placeholder for the expected module tarball -The diff-test.sh harness will replace it with the real expected tarball diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java index 7648aaf8e8..946461ede3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java @@ -61,8 +61,6 @@ protected Class resolveClass(final String fqn) throws ClassNotFoundException case "jsii-calc.MutableObjectLiteral": return software.amazon.jsii.tests.calculator.MutableObjectLiteral.class; case "jsii-calc.Negate": return software.amazon.jsii.tests.calculator.Negate.class; case "jsii-calc.NodeStandardLibrary": return software.amazon.jsii.tests.calculator.NodeStandardLibrary.class; - case "jsii-calc.NullShouldBeTreatedAsUndefined": return software.amazon.jsii.tests.calculator.NullShouldBeTreatedAsUndefined.class; - case "jsii-calc.NullShouldBeTreatedAsUndefinedData": return software.amazon.jsii.tests.calculator.NullShouldBeTreatedAsUndefinedData.class; case "jsii-calc.NumberGenerator": return software.amazon.jsii.tests.calculator.NumberGenerator.class; case "jsii-calc.ObjectRefsInCollections": return software.amazon.jsii.tests.calculator.ObjectRefsInCollections.class; case "jsii-calc.OptionalConstructorArgument": return software.amazon.jsii.tests.calculator.OptionalConstructorArgument.class; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefined.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefined.java deleted file mode 100644 index 35f8258dd0..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefined.java +++ /dev/null @@ -1,28 +0,0 @@ -package software.amazon.jsii.tests.calculator; - -/** - * jsii#282, aws-cdk#157: null should be treated as "undefined" - */ -@javax.annotation.Generated(value = "jsii-pacmak") -@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.NullShouldBeTreatedAsUndefined") -public class NullShouldBeTreatedAsUndefined extends software.amazon.jsii.JsiiObject { - protected NullShouldBeTreatedAsUndefined(final software.amazon.jsii.JsiiObject.InitializationMode mode) { - super(mode); - } - public NullShouldBeTreatedAsUndefined() { - super(software.amazon.jsii.JsiiObject.InitializationMode.Jsii); - software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this); - } - - public void giveMeUndefined(@javax.annotation.Nullable final java.lang.Object value) { - this.jsiiCall("giveMeUndefined", Void.class, java.util.stream.Stream.of(value).toArray()); - } - - public void giveMeUndefined() { - this.jsiiCall("giveMeUndefined", Void.class); - } - - public void giveMeUndefinedInsideAnObject(final software.amazon.jsii.tests.calculator.NullShouldBeTreatedAsUndefinedData input) { - this.jsiiCall("giveMeUndefinedInsideAnObject", Void.class, java.util.stream.Stream.of(java.util.Objects.requireNonNull(input, "input is required")).toArray()); - } -} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData.java deleted file mode 100644 index e54655c3bf..0000000000 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/NullShouldBeTreatedAsUndefinedData.java +++ /dev/null @@ -1,108 +0,0 @@ -package software.amazon.jsii.tests.calculator; - -@javax.annotation.Generated(value = "jsii-pacmak") -public interface NullShouldBeTreatedAsUndefinedData extends software.amazon.jsii.JsiiSerializable { - java.util.List getArrayWithThreeElementsAndUndefinedAsSecondArgument(); - void setArrayWithThreeElementsAndUndefinedAsSecondArgument(final java.util.List value); - java.lang.Object getThisShouldBeUndefined(); - void setThisShouldBeUndefined(final java.lang.Object value); - - /** - * @return a {@link Builder} of {@link NullShouldBeTreatedAsUndefinedData} - */ - static Builder builder() { - return new Builder(); - } - - /** - * A builder for {@link NullShouldBeTreatedAsUndefinedData} - */ - final class Builder { - private java.util.List _arrayWithThreeElementsAndUndefinedAsSecondArgument; - @javax.annotation.Nullable - private java.lang.Object _thisShouldBeUndefined; - - /** - * Sets the value of ArrayWithThreeElementsAndUndefinedAsSecondArgument - * @param value the value to be set - * @return {@code this} - */ - public Builder withArrayWithThreeElementsAndUndefinedAsSecondArgument(final java.util.List value) { - this._arrayWithThreeElementsAndUndefinedAsSecondArgument = java.util.Objects.requireNonNull(value, "arrayWithThreeElementsAndUndefinedAsSecondArgument is required"); - return this; - } - /** - * Sets the value of ThisShouldBeUndefined - * @param value the value to be set - * @return {@code this} - */ - public Builder withThisShouldBeUndefined(@javax.annotation.Nullable final java.lang.Object value) { - this._thisShouldBeUndefined = value; - return this; - } - - /** - * Builds the configured instance. - * @return a new instance of {@link NullShouldBeTreatedAsUndefinedData} - * @throws NullPointerException if any required attribute was not provided - */ - public NullShouldBeTreatedAsUndefinedData build() { - return new NullShouldBeTreatedAsUndefinedData() { - private java.util.List $arrayWithThreeElementsAndUndefinedAsSecondArgument = java.util.Objects.requireNonNull(_arrayWithThreeElementsAndUndefinedAsSecondArgument, "arrayWithThreeElementsAndUndefinedAsSecondArgument is required"); - @javax.annotation.Nullable - private java.lang.Object $thisShouldBeUndefined = _thisShouldBeUndefined; - - @Override - public java.util.List getArrayWithThreeElementsAndUndefinedAsSecondArgument() { - return this.$arrayWithThreeElementsAndUndefinedAsSecondArgument; - } - - @Override - public void setArrayWithThreeElementsAndUndefinedAsSecondArgument(final java.util.List value) { - this.$arrayWithThreeElementsAndUndefinedAsSecondArgument = java.util.Objects.requireNonNull(value, "arrayWithThreeElementsAndUndefinedAsSecondArgument is required"); - } - - @Override - public java.lang.Object getThisShouldBeUndefined() { - return this.$thisShouldBeUndefined; - } - - @Override - public void setThisShouldBeUndefined(@javax.annotation.Nullable final java.lang.Object value) { - this.$thisShouldBeUndefined = value; - } - - }; - } - } - - /** - * A proxy class which represents a concrete javascript instance of this type. - */ - final static class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.NullShouldBeTreatedAsUndefinedData { - protected Jsii$Proxy(final software.amazon.jsii.JsiiObject.InitializationMode mode) { - super(mode); - } - - @Override - public java.util.List getArrayWithThreeElementsAndUndefinedAsSecondArgument() { - return this.jsiiGet("arrayWithThreeElementsAndUndefinedAsSecondArgument", java.util.List.class); - } - - @Override - public void setArrayWithThreeElementsAndUndefinedAsSecondArgument(final java.util.List value) { - this.jsiiSet("arrayWithThreeElementsAndUndefinedAsSecondArgument", java.util.Objects.requireNonNull(value, "arrayWithThreeElementsAndUndefinedAsSecondArgument is required")); - } - - @Override - @javax.annotation.Nullable - public java.lang.Object getThisShouldBeUndefined() { - return this.jsiiGet("thisShouldBeUndefined", java.lang.Object.class); - } - - @Override - public void setThisShouldBeUndefined(@javax.annotation.Nullable final java.lang.Object value) { - this.jsiiSet("thisShouldBeUndefined", value); - } - } -} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst b/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst index 571f6e1e68..91db1c06f9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst +++ b/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst @@ -2778,88 +2778,6 @@ NodeStandardLibrary :type: string *(readonly)* -NullShouldBeTreatedAsUndefined -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. py:class:: NullShouldBeTreatedAsUndefined() - - **Language-specific names:** - - .. tabs:: - - .. code-tab:: c# - - using Amazon.JSII.Tests.CalculatorNamespace; - - .. code-tab:: java - - import software.amazon.jsii.tests.calculator.NullShouldBeTreatedAsUndefined; - - .. code-tab:: javascript - - const { NullShouldBeTreatedAsUndefined } = require('jsii-calc'); - - .. code-tab:: typescript - - import { NullShouldBeTreatedAsUndefined } from 'jsii-calc'; - - - - jsii#282, aws-cdk#157: null should be treated as "undefined" - - - - .. py:method:: giveMeUndefined([value]) - - :param value: - :type value: any or ``undefined`` - - - .. py:method:: giveMeUndefinedInsideAnObject(input) - - :param input: - :type input: :py:class:`~jsii-calc.NullShouldBeTreatedAsUndefinedData`\ - - -NullShouldBeTreatedAsUndefinedData (interface) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. py:class:: NullShouldBeTreatedAsUndefinedData - - **Language-specific names:** - - .. tabs:: - - .. code-tab:: c# - - using Amazon.JSII.Tests.CalculatorNamespace; - - .. code-tab:: java - - import software.amazon.jsii.tests.calculator.NullShouldBeTreatedAsUndefinedData; - - .. code-tab:: javascript - - // NullShouldBeTreatedAsUndefinedData is an interface - - .. code-tab:: typescript - - import { NullShouldBeTreatedAsUndefinedData } from 'jsii-calc'; - - - - - - .. py:attribute:: arrayWithThreeElementsAndUndefinedAsSecondArgument - - :type: any[] *(abstract)* - - - .. py:attribute:: thisShouldBeUndefined - - :type: any or ``undefined`` *(abstract)* - - NumberGenerator ^^^^^^^^^^^^^^^