From 5460d66f2db6441f7d8cfc849d16f89d3548b82a Mon Sep 17 00:00:00 2001
From: Romain Marcadier <rmuller@amazon.lu>
Date: Mon, 31 Jan 2022 18:13:46 +0100
Subject: [PATCH] fix(dontet): excessive overrides generated (#3355)

A mis-understanding of the jsii specification early on was carried over
in the .NET code generators until now, which caused all methods and
properties that are overrides (of other JS implementations) to result in
jsii overrides being registered by the runtime.

This behavior caused unnecessary round-trips between the .NET CLR and
the node sidekick process, which affected the performance of .NET
bindings (unnecessary round-trips with JSON encoding aren't free), and
had a tendency to hit obscure edge case bugs in the jsii kernel's Ser/De
behavior.

This PR removes all `isOverride: true` declarations from generated .NET
code and neutralizes the behavior of specifying it to be true.
User-defined overrides (.NET code overriding JS code) continue to work
as they previously did (the `isOverride` attribute should simply not
have existed, ever).



---

By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
---
 .../Amazon.JSII.Runtime/Deputy/DeputyBase.cs  |   4 +-
 .../Deputy/JsiiMethodAttribute.cs             |   6 +-
 .../Deputy/JsiiPropertyAttribute.cs           |  12 +-
 .../lib/targets/dotnet/dotnetgenerator.ts     |   2 +-
 .../targets/dotnet/dotnetruntimegenerator.ts  |  15 +-
 .../__snapshots__/examples.test.ts.snap       |  14 +-
 .../__snapshots__/target-dotnet.test.ts.snap  | 296 +++++++++---------
 7 files changed, 171 insertions(+), 178 deletions(-)

diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs
index 5d77f36cb5..99d9e3c1f8 100644
--- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs
+++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs
@@ -76,7 +76,7 @@ IEnumerable<Override> GetMethodOverrides()
                     var inheritedAttribute = method.GetAttribute<JsiiMethodAttribute>();
                     var uninheritedAttribute = method.GetAttribute<JsiiMethodAttribute>(false);
 
-                    if ((inheritedAttribute != null && uninheritedAttribute == null) || uninheritedAttribute?.IsOverride == true)
+                    if (inheritedAttribute != null && uninheritedAttribute == null)
                     {
                         yield return new Override(method: (inheritedAttribute ?? uninheritedAttribute)!.Name);
                     }
@@ -93,7 +93,7 @@ IEnumerable<Override> GetPropertyOverrides()
                     var inheritedAttribute = property.GetAttribute<JsiiPropertyAttribute>();
                     var uninheritedAttribute = property.GetAttribute<JsiiPropertyAttribute>(false);
 
-                    if ((inheritedAttribute != null && uninheritedAttribute == null) || uninheritedAttribute?.IsOverride == true)
+                    if (inheritedAttribute != null && uninheritedAttribute == null)
                     {
                         yield return new Override(property: (inheritedAttribute ?? uninheritedAttribute)!.Name);
                     }
diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs
index f757f657c8..19d8537d37 100644
--- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs
+++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs
@@ -12,6 +12,7 @@ public sealed class JsiiMethodAttribute : Attribute
             string? returnsJson = null,
             string? parametersJson = null,
             bool isAsync = false,
+            // Unused, retained for backwards-compatibility
             bool isOverride = false)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
@@ -23,7 +24,6 @@ public sealed class JsiiMethodAttribute : Attribute
                 : JsonConvert.DeserializeObject<Parameter[]>(parametersJson)
                   ?? throw new ArgumentException("Invalid JSON descriptor", nameof(parametersJson));
             IsAsync = isAsync;
-            IsOverride = isOverride;
         }
 
         public string Name { get; }
@@ -34,7 +34,5 @@ public sealed class JsiiMethodAttribute : Attribute
 
 
         public bool IsAsync { get; }
-
-        public bool IsOverride { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiPropertyAttribute.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiPropertyAttribute.cs
index dfddd5233b..9d451d853c 100644
--- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiPropertyAttribute.cs
+++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiPropertyAttribute.cs
@@ -7,14 +7,18 @@ namespace Amazon.JSII.Runtime.Deputy
     [AttributeUsage(AttributeTargets.Property)]
     public sealed class JsiiPropertyAttribute : Attribute, IOptionalValue
     {
-        public JsiiPropertyAttribute(string name, string typeJson, bool isOptional = false, bool isOverride = false)
+        public JsiiPropertyAttribute(
+            string name,
+            string typeJson,
+            bool isOptional = false,
+            // Unused, retained for backwards-compatibility
+            bool isOverride = false)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
             Type = JsonConvert.DeserializeObject<TypeReference>(typeJson ??
                                                                 throw new ArgumentNullException(nameof(typeJson)))
                    ?? throw new ArgumentException("Invalid JSON descriptor", nameof(typeJson));
             IsOptional = isOptional;
-            IsOverride = isOverride;
         }
 
         public string Name { get; }
@@ -22,7 +26,5 @@ public JsiiPropertyAttribute(string name, string typeJson, bool isOptional = fal
         public TypeReference Type { get; }
 
         public bool IsOptional { get; }
-
-        public bool IsOverride { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts
index fa15aa74ed..b781fa6551 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts
@@ -942,7 +942,7 @@ export class DotNetGenerator extends Generator {
     if (prop.optional) {
       this.code.line('[JsiiOptional]');
     }
-    this.dotnetRuntimeGenerator.emitAttributesForProperty(prop, datatype);
+    this.dotnetRuntimeGenerator.emitAttributesForProperty(prop);
 
     let isOverrideKeyWord = '';
     let isVirtualKeyWord = '';
diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts
index df0e5244c1..ce16482130 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts
@@ -78,8 +78,6 @@ export class DotNetRuntimeGenerator {
     cls: spec.ClassType | spec.InterfaceType,
     method: spec.Method /*, emitForProxyOrDatatype: boolean = false*/,
   ): void {
-    const isOverride =
-      spec.isClassType(cls) && method.overrides ? ', isOverride: true' : '';
     const isAsync =
       spec.isClassType(cls) && method.async ? ', isAsync: true' : '';
     const parametersJson = method.parameters
@@ -92,7 +90,7 @@ export class DotNetRuntimeGenerator {
           .replace(/"/g, '\\"')
           .replace(/\\{2}"/g, 'test')}"`
       : '';
-    const jsiiAttribute = `[JsiiMethod(name: "${method.name}"${returnsJson}${parametersJson}${isAsync}${isOverride})]`;
+    const jsiiAttribute = `[JsiiMethod(name: "${method.name}"${returnsJson}${parametersJson}${isAsync})]`;
     this.code.line(jsiiAttribute);
     this.emitDeprecatedAttributeIfNecessary(method);
   }
@@ -100,20 +98,15 @@ export class DotNetRuntimeGenerator {
   /**
    * Emits the proper jsii .NET attribute for a property
    *
-   * Ex: [JsiiProperty(name: "foo", typeJson: "{\"fqn\":\"@scope/jsii-calc-base-of-base.Very\"}", isOptional: true, isOverride: true)]
+   * Ex: [JsiiProperty(name: "foo", typeJson: "{\"fqn\":\"@scope/jsii-calc-base-of-base.Very\"}", isOptional: true)]
    */
-  public emitAttributesForProperty(
-    prop: spec.Property,
-    datatype = false,
-  ): void {
-    // If we are on a datatype then we want the property to override in Jsii
-    const isJsiiOverride = datatype ? ', isOverride: true' : '';
+  public emitAttributesForProperty(prop: spec.Property): void {
     const isOptionalJsii = prop.optional ? ', isOptional: true' : '';
     const jsiiAttribute =
       `[JsiiProperty(name: "${prop.name}", ` +
       `typeJson: "${JSON.stringify(prop.type)
         .replace(/"/g, '\\"')
-        .replace(/\\{2}"/g, 'test')}"${isOptionalJsii}${isJsiiOverride})]`;
+        .replace(/\\{2}"/g, 'test')}"${isOptionalJsii})]`;
     this.code.line(jsiiAttribute);
     this.emitDeprecatedAttributeIfNecessary(prop);
   }
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
index 24cd0361f9..ba54e825bd 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
@@ -114,14 +114,14 @@ namespace Example.Test.Demo
     [JsiiByValue(fqn: "testpkg.Baz")]
     public class Baz_ : Example.Test.Demo.IBaz
     {
-        [JsiiProperty(name: "baz", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOverride: true)]
+        [JsiiProperty(name: "baz", typeJson: "{\\"primitive\\":\\"boolean\\"}")]
         public bool Baz
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Foo
         {
             get;
@@ -129,7 +129,7 @@ namespace Example.Test.Demo
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Bar
         {
             get;
@@ -186,7 +186,7 @@ namespace Example.Test.Demo
     [JsiiByValue(fqn: "testpkg.Foo")]
     public class Foo_ : Example.Test.Demo.IFoo
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Foo
         {
             get;
@@ -209,7 +209,7 @@ namespace Example.Test.Demo
     [JsiiByValue(fqn: "testpkg.FooBar")]
     public class FooBar : Example.Test.Demo.IFooBar
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Foo
         {
             get;
@@ -217,7 +217,7 @@ namespace Example.Test.Demo
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Bar
         {
             get;
@@ -1592,7 +1592,7 @@ namespace Example.Test.Demo
         [JsiiByValue(fqn: "testpkg.Namespace1.Foo")]
         public class Foo : Example.Test.Demo.Namespace1.IFoo
         {
-            [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+            [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}")]
             public string Bar
             {
                 get;
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
index 48f7cdd035..726a300cf1 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
@@ -127,14 +127,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace
     [JsiiByValue(fqn: "@scope/jsii-calc-base.BaseProps")]
     public class BaseProps : Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.IBaseProps
     {
-        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Bar
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-base-of-base.Very\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-base-of-base.Very\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very Foo
         {
             get;
@@ -733,7 +733,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
     [JsiiByValue(fqn: "@scope/jsii-calc-base-of-base.VeryBaseProps")]
     public class VeryBaseProps : Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.IVeryBaseProps
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-base-of-base.Very\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-base-of-base.Very\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very Foo
         {
             get;
@@ -1125,7 +1125,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "hoistedTop", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "hoistedTop", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         [System.Obsolete()]
         public string? HoistedTop
         {
@@ -1137,7 +1137,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "left", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "left", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         [System.Obsolete()]
         public double? Left
         {
@@ -1166,7 +1166,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "hoistedTop", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "hoistedTop", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         [System.Obsolete()]
         public string? HoistedTop
         {
@@ -1178,7 +1178,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "right", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "right", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         [System.Obsolete()]
         public bool? Right
         {
@@ -1808,7 +1808,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "anumber", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "anumber", typeJson: "{\\"primitive\\":\\"number\\"}")]
         [System.Obsolete()]
         public double Anumber
         {
@@ -1820,7 +1820,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "astring", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "astring", typeJson: "{\\"primitive\\":\\"string\\"}")]
         [System.Obsolete()]
         public string Astring
         {
@@ -1832,7 +1832,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "firstOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"string\\"},\\"kind\\":\\"array\\"}}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "firstOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"string\\"},\\"kind\\":\\"array\\"}}", isOptional: true)]
         [System.Obsolete()]
         public string[]? FirstOptional
         {
@@ -2031,7 +2031,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         [System.Obsolete()]
         public override abstract string ToString();
 
@@ -2063,7 +2063,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
             /// <remarks>
             /// <strong>Stability</strong>: Deprecated
             /// </remarks>
-            [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+            [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
             [System.Obsolete()]
             public override string ToString()
             {
@@ -2094,7 +2094,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "optional1", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optional1", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         [System.Obsolete()]
         public string? Optional1
         {
@@ -2106,7 +2106,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "optional2", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optional2", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         [System.Obsolete()]
         public double? Optional2
         {
@@ -2118,7 +2118,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "optional3", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optional3", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         [System.Obsolete()]
         public bool? Optional3
         {
@@ -2397,7 +2397,7 @@ namespace Amazon.JSII.Tests.CustomSubmoduleName
             /// <remarks>
             /// <strong>Stability</strong>: Deprecated
             /// </remarks>
-            [JsiiProperty(name: "name", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+            [JsiiProperty(name: "name", typeJson: "{\\"primitive\\":\\"string\\"}")]
             [System.Obsolete()]
             public string Name
             {
@@ -2428,7 +2428,7 @@ namespace Amazon.JSII.Tests.CustomSubmoduleName
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "key", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "key", typeJson: "{\\"primitive\\":\\"string\\"}")]
         [System.Obsolete()]
         public string Key
         {
@@ -2439,7 +2439,7 @@ namespace Amazon.JSII.Tests.CustomSubmoduleName
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"any\\"}", isOverride: true)]
+        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"any\\"}")]
         [System.Obsolete()]
         public object Value
         {
@@ -3412,7 +3412,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>(deprecated) String representation of the value.</summary>
-        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public override string ToString()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -3769,13 +3769,13 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         {
         }
 
-        [JsiiMethod(name: "provideAsClass", returnsJson: "{\\"type\\":{\\"fqn\\":\\"jsii-calc.Implementation\\"}}", isOverride: true)]
+        [JsiiMethod(name: "provideAsClass", returnsJson: "{\\"type\\":{\\"fqn\\":\\"jsii-calc.Implementation\\"}}")]
         public virtual Amazon.JSII.Tests.CalculatorNamespace.Implementation ProvideAsClass()
         {
             return InvokeInstanceMethod<Amazon.JSII.Tests.CalculatorNamespace.Implementation>(new System.Type[]{}, new object[]{})!;
         }
 
-        [JsiiMethod(name: "provideAsInterface", returnsJson: "{\\"type\\":{\\"fqn\\":\\"jsii-calc.IAnonymouslyImplementMe\\"}}", isOverride: true)]
+        [JsiiMethod(name: "provideAsInterface", returnsJson: "{\\"type\\":{\\"fqn\\":\\"jsii-calc.IAnonymouslyImplementMe\\"}}")]
         public virtual Amazon.JSII.Tests.CalculatorNamespace.IAnonymouslyImplementMe ProvideAsInterface()
         {
             return InvokeInstanceMethod<Amazon.JSII.Tests.CalculatorNamespace.IAnonymouslyImplementMe>(new System.Type[]{}, new object[]{})!;
@@ -3964,7 +3964,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         {
         }
 
-        [JsiiMethod(name: "ring", isOverride: true)]
+        [JsiiMethod(name: "ring")]
         public virtual void Ring()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -4014,7 +4014,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>(deprecated) Say hello!</summary>
-        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Hello()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -4057,7 +4057,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
             /// <remarks>
             /// <strong>Stability</strong>: Deprecated
             /// </remarks>
-            [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+            [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
             [System.Obsolete()]
             public override string ToString()
             {
@@ -4286,7 +4286,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: 0
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "initialValue", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "initialValue", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         public double? InitialValue
         {
             get;
@@ -4298,7 +4298,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: none
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "maximumValue", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "maximumValue", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         public double? MaximumValue
         {
             get;
@@ -4408,7 +4408,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Cdk16625.Donotimport
 
         /// <summary>Not quite random, but it'll do.</summary>
         /// <returns>1337</returns>
-        [JsiiMethod(name: "next", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", isOverride: true)]
+        [JsiiMethod(name: "next", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}")]
         public virtual double Next()
         {
             return InvokeInstanceMethod<double>(new System.Type[]{}, new object[]{})!;
@@ -4430,14 +4430,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.ChildStruct982")]
     public class ChildStruct982 : Amazon.JSII.Tests.CalculatorNamespace.IChildStruct982
     {
-        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Bar
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Foo
         {
             get;
@@ -4903,7 +4903,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Composition
         }
 
         /// <summary>(deprecated) String representation of the value.</summary>
-        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public override string ToString()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -5048,7 +5048,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class ConfusingToJacksonStruct : Amazon.JSII.Tests.CalculatorNamespace.IConfusingToJacksonStruct
     {
         [JsiiOptional]
-        [JsiiProperty(name: "unionProperty", typeJson: "{\\"union\\":{\\"types\\":[{\\"fqn\\":\\"@scope/jsii-calc-lib.IFriendly\\"},{\\"collection\\":{\\"elementtype\\":{\\"union\\":{\\"types\\":[{\\"fqn\\":\\"@scope/jsii-calc-lib.IFriendly\\"},{\\"fqn\\":\\"jsii-calc.AbstractClass\\"}]}},\\"kind\\":\\"array\\"}}]}}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "unionProperty", typeJson: "{\\"union\\":{\\"types\\":[{\\"fqn\\":\\"@scope/jsii-calc-lib.IFriendly\\"},{\\"collection\\":{\\"elementtype\\":{\\"union\\":{\\"types\\":[{\\"fqn\\":\\"@scope/jsii-calc-lib.IFriendly\\"},{\\"fqn\\":\\"jsii-calc.AbstractClass\\"}]}},\\"kind\\":\\"array\\"}}]}}", isOptional: true)]
         public object? UnionProperty
         {
             get;
@@ -5376,21 +5376,21 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.ContainerProps")]
     public class ContainerProps : Amazon.JSII.Tests.CalculatorNamespace.IContainerProps
     {
-        [JsiiProperty(name: "arrayProp", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"jsii-calc.DummyObj\\"},\\"kind\\":\\"array\\"}}", isOverride: true)]
+        [JsiiProperty(name: "arrayProp", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"jsii-calc.DummyObj\\"},\\"kind\\":\\"array\\"}}")]
         public Amazon.JSII.Tests.CalculatorNamespace.IDummyObj[] ArrayProp
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "objProp", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"jsii-calc.DummyObj\\"},\\"kind\\":\\"map\\"}}", isOverride: true)]
+        [JsiiProperty(name: "objProp", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"jsii-calc.DummyObj\\"},\\"kind\\":\\"map\\"}}")]
         public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.IDummyObj> ObjProp
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "recordProp", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"jsii-calc.DummyObj\\"},\\"kind\\":\\"map\\"}}", isOverride: true)]
+        [JsiiProperty(name: "recordProp", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"jsii-calc.DummyObj\\"},\\"kind\\":\\"map\\"}}")]
         public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.IDummyObj> RecordProp
         {
             get;
@@ -5720,7 +5720,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         [System.Obsolete("well, yeah")]
         public string ReadonlyProperty
         {
@@ -5816,14 +5816,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.DerivedStruct")]
     public class DerivedStruct : Amazon.JSII.Tests.CalculatorNamespace.IDerivedStruct
     {
-        [JsiiProperty(name: "anotherRequired", typeJson: "{\\"primitive\\":\\"date\\"}", isOverride: true)]
+        [JsiiProperty(name: "anotherRequired", typeJson: "{\\"primitive\\":\\"date\\"}")]
         public System.DateTime AnotherRequired
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "bool", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOverride: true)]
+        [JsiiProperty(name: "bool", typeJson: "{\\"primitive\\":\\"boolean\\"}")]
         public bool Bool
         {
             get;
@@ -5831,7 +5831,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>An example of a non primitive property.</summary>
-        [JsiiProperty(name: "nonPrimitive", typeJson: "{\\"fqn\\":\\"jsii-calc.DoubleTrouble\\"}", isOverride: true)]
+        [JsiiProperty(name: "nonPrimitive", typeJson: "{\\"fqn\\":\\"jsii-calc.DoubleTrouble\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive
         {
             get;
@@ -5840,7 +5840,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
 
         /// <summary>This is optional.</summary>
         [JsiiOptional]
-        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"map\\"}}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "anotherOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.NumericValue\\"},\\"kind\\":\\"map\\"}}", isOptional: true)]
         public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.NumericValue>? AnotherOptional
         {
             get;
@@ -5848,7 +5848,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "optionalAny", typeJson: "{\\"primitive\\":\\"any\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optionalAny", typeJson: "{\\"primitive\\":\\"any\\"}", isOptional: true)]
         public object? OptionalAny
         {
             get;
@@ -5856,7 +5856,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "optionalArray", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"string\\"},\\"kind\\":\\"array\\"}}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optionalArray", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"string\\"},\\"kind\\":\\"array\\"}}", isOptional: true)]
         public string[]? OptionalArray
         {
             get;
@@ -5867,7 +5867,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "anumber", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "anumber", typeJson: "{\\"primitive\\":\\"number\\"}")]
         [System.Obsolete()]
         public double Anumber
         {
@@ -5879,7 +5879,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
-        [JsiiProperty(name: "astring", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "astring", typeJson: "{\\"primitive\\":\\"string\\"}")]
         [System.Obsolete()]
         public string Astring
         {
@@ -5891,7 +5891,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "firstOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"string\\"},\\"kind\\":\\"array\\"}}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "firstOptional", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"string\\"},\\"kind\\":\\"array\\"}}", isOptional: true)]
         [System.Obsolete()]
         public string[]? FirstOptional
         {
@@ -5914,7 +5914,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class DiamondBottom : Amazon.JSII.Tests.CalculatorNamespace.IDiamondBottom
     {
         [JsiiOptional]
-        [JsiiProperty(name: "bottom", typeJson: "{\\"primitive\\":\\"date\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "bottom", typeJson: "{\\"primitive\\":\\"date\\"}", isOptional: true)]
         public System.DateTime? Bottom
         {
             get;
@@ -5925,7 +5925,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "hoistedTop", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "hoistedTop", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         [System.Obsolete()]
         public string? HoistedTop
         {
@@ -5937,7 +5937,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "left", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "left", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         [System.Obsolete()]
         public double? Left
         {
@@ -5949,7 +5949,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Stability</strong>: Deprecated
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "right", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "right", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         [System.Obsolete()]
         public bool? Right
         {
@@ -5973,7 +5973,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.DiamondInheritanceBaseLevelStruct")]
     public class DiamondInheritanceBaseLevelStruct : Amazon.JSII.Tests.CalculatorNamespace.IDiamondInheritanceBaseLevelStruct
     {
-        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string BaseLevelProperty
         {
             get;
@@ -5996,14 +5996,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.DiamondInheritanceFirstMidLevelStruct")]
     public class DiamondInheritanceFirstMidLevelStruct : Amazon.JSII.Tests.CalculatorNamespace.IDiamondInheritanceFirstMidLevelStruct
     {
-        [JsiiProperty(name: "firstMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "firstMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string FirstMidLevelProperty
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string BaseLevelProperty
         {
             get;
@@ -6026,14 +6026,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.DiamondInheritanceSecondMidLevelStruct")]
     public class DiamondInheritanceSecondMidLevelStruct : Amazon.JSII.Tests.CalculatorNamespace.IDiamondInheritanceSecondMidLevelStruct
     {
-        [JsiiProperty(name: "secondMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "secondMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string SecondMidLevelProperty
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string BaseLevelProperty
         {
             get;
@@ -6056,28 +6056,28 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.DiamondInheritanceTopLevelStruct")]
     public class DiamondInheritanceTopLevelStruct : Amazon.JSII.Tests.CalculatorNamespace.IDiamondInheritanceTopLevelStruct
     {
-        [JsiiProperty(name: "topLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "topLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string TopLevelProperty
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "firstMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "firstMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string FirstMidLevelProperty
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "baseLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string BaseLevelProperty
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "secondMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "secondMidLevelProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string SecondMidLevelProperty
         {
             get;
@@ -6369,14 +6369,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>(deprecated) Say hello!</summary>
-        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Hello()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>Returns another random number.</summary>
-        [JsiiMethod(name: "next", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", isOverride: true)]
+        [JsiiMethod(name: "next", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}")]
         public virtual double Next()
         {
             return InvokeInstanceMethod<double>(new System.Type[]{}, new object[]{})!;
@@ -6398,7 +6398,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.DummyObj")]
     public class DummyObj : Amazon.JSII.Tests.CalculatorNamespace.IDummyObj
     {
-        [JsiiProperty(name: "example", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "example", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Example
         {
             get;
@@ -6679,7 +6679,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class EraseUndefinedHashValuesOptions : Amazon.JSII.Tests.CalculatorNamespace.IEraseUndefinedHashValuesOptions
     {
         [JsiiOptional]
-        [JsiiProperty(name: "option1", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "option1", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Option1
         {
             get;
@@ -6687,7 +6687,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "option2", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "option2", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Option2
         {
             get;
@@ -6812,7 +6812,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>Stability</strong>: Experimental
         /// </remarks>
-        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string ReadonlyProperty
         {
             get;
@@ -6873,14 +6873,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.ExtendsInternalInterface")]
     public class ExtendsInternalInterface : Amazon.JSII.Tests.CalculatorNamespace.IExtendsInternalInterface
     {
-        [JsiiProperty(name: "boom", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOverride: true)]
+        [JsiiProperty(name: "boom", typeJson: "{\\"primitive\\":\\"boolean\\"}")]
         public bool Boom
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "prop", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "prop", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Prop
         {
             get;
@@ -7005,7 +7005,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <remarks>
         /// <strong>External</strong>: true
         /// </remarks>
-        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string ReadonlyProperty
         {
             get;
@@ -7091,7 +7091,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: world
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "name", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "name", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Name
         {
             get;
@@ -10883,7 +10883,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         {
         }
 
-        [JsiiMethod(name: "visible", isOverride: true)]
+        [JsiiMethod(name: "visible")]
         public virtual void Visible()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -10976,21 +10976,21 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.ImplictBaseOfBase")]
     public class ImplictBaseOfBase : Amazon.JSII.Tests.CalculatorNamespace.IImplictBaseOfBase
     {
-        [JsiiProperty(name: "goo", typeJson: "{\\"primitive\\":\\"date\\"}", isOverride: true)]
+        [JsiiProperty(name: "goo", typeJson: "{\\"primitive\\":\\"date\\"}")]
         public System.DateTime Goo
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Bar
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-base-of-base.Very\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"@scope/jsii-calc-base-of-base.Very\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very Foo
         {
             get;
@@ -11029,7 +11029,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         {
         }
 
-        [JsiiMethod(name: "ciao", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "ciao", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Ciao()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -11147,7 +11147,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceIncludesClas
     [JsiiByValue(fqn: "jsii-calc.InterfaceInNamespaceIncludesClasses.Hello")]
     public class Hello : Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceIncludesClasses.IHello
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Foo
         {
             get;
@@ -11204,7 +11204,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceOnlyInterfac
     [JsiiByValue(fqn: "jsii-calc.InterfaceInNamespaceOnlyInterface.Hello")]
     public class Hello : Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceOnlyInterface.IHello
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Foo
         {
             get;
@@ -12291,7 +12291,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         [JsiiByValue(fqn: "jsii-calc.LevelOne.PropBooleanValue")]
         public class PropBooleanValue : Amazon.JSII.Tests.CalculatorNamespace.LevelOne.IPropBooleanValue
         {
-            [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOverride: true)]
+            [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"boolean\\"}")]
             public bool Value
             {
                 get;
@@ -12326,7 +12326,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         [JsiiByValue(fqn: "jsii-calc.LevelOne.PropProperty")]
         public class PropProperty : Amazon.JSII.Tests.CalculatorNamespace.LevelOne.IPropProperty
         {
-            [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.LevelOne.PropBooleanValue\\"}", isOverride: true)]
+            [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.LevelOne.PropBooleanValue\\"}")]
             public Amazon.JSII.Tests.CalculatorNamespace.LevelOne.IPropBooleanValue Prop
             {
                 get;
@@ -12350,7 +12350,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.LevelOneProps")]
     public class LevelOneProps : Amazon.JSII.Tests.CalculatorNamespace.ILevelOneProps
     {
-        [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.LevelOne.PropProperty\\"}", isOverride: true)]
+        [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.LevelOne.PropProperty\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.LevelOne.IPropProperty Prop
         {
             get;
@@ -12379,7 +12379,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: 80
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "containerPort", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "containerPort", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         public double? ContainerPort
         {
             get;
@@ -12400,7 +12400,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: 256
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "cpu", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "cpu", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Cpu
         {
             get;
@@ -12427,7 +12427,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: 512
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "memoryMiB", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "memoryMiB", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? MemoryMiB
         {
             get;
@@ -12439,7 +12439,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: true
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "publicLoadBalancer", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "publicLoadBalancer", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         public bool? PublicLoadBalancer
         {
             get;
@@ -12451,7 +12451,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: false
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "publicTasks", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "publicTasks", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         public bool? PublicTasks
         {
             get;
@@ -12633,7 +12633,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2647
         }
 
         /// <summary>(deprecated) Say hello!</summary>
-        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Hello()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -12839,14 +12839,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2689.Structs
     [JsiiByValue(fqn: "jsii-calc.module2689.structs.MyStruct")]
     public class MyStruct : Amazon.JSII.Tests.CalculatorNamespace.Module2689.Structs.IMyStruct
     {
-        [JsiiProperty(name: "baseMap", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-base.BaseProps\\"},\\"kind\\":\\"map\\"}}", isOverride: true)]
+        [JsiiProperty(name: "baseMap", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-base.BaseProps\\"},\\"kind\\":\\"map\\"}}")]
         public System.Collections.Generic.IDictionary<string, Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.IBaseProps> BaseMap
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "numbers", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Number\\"},\\"kind\\":\\"array\\"}}", isOverride: true)]
+        [JsiiProperty(name: "numbers", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"fqn\\":\\"@scope/jsii-calc-lib.Number\\"},\\"kind\\":\\"array\\"}}")]
         public Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Number[] Numbers
         {
             get;
@@ -12869,7 +12869,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2692.Submodule1
     [JsiiByValue(fqn: "jsii-calc.module2692.submodule1.Bar")]
     public class Bar : Amazon.JSII.Tests.CalculatorNamespace.Module2692.Submodule1.IBar
     {
-        [JsiiProperty(name: "bar1", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar1", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Bar1
         {
             get;
@@ -12926,7 +12926,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2692.Submodule2
     [JsiiByValue(fqn: "jsii-calc.module2692.submodule2.Bar")]
     public class Bar : Amazon.JSII.Tests.CalculatorNamespace.Module2692.Submodule2.IBar
     {
-        [JsiiProperty(name: "bar2", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar2", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Bar2
         {
             get;
@@ -12949,21 +12949,21 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2692.Submodule2
     [JsiiByValue(fqn: "jsii-calc.module2692.submodule2.Foo")]
     public class Foo : Amazon.JSII.Tests.CalculatorNamespace.Module2692.Submodule2.IFoo
     {
-        [JsiiProperty(name: "foo2", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo2", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Foo2
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "bar2", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar2", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Bar2
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "bar1", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar1", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Bar1
         {
             get;
@@ -13082,7 +13082,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2700
         {
         }
 
-        [JsiiMethod(name: "bar", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "bar", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Bar()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -13206,7 +13206,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
         {
         }
 
-        [JsiiMethod(name: "bazMethod", isOverride: true)]
+        [JsiiMethod(name: "bazMethod")]
         public virtual void BazMethod()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -13320,13 +13320,13 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
         {
         }
 
-        [JsiiMethod(name: "bar", isOverride: true)]
+        [JsiiMethod(name: "bar")]
         public virtual void Bar()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
         }
 
-        [JsiiMethod(name: "foo", isOverride: true)]
+        [JsiiMethod(name: "foo")]
         public virtual void Foo()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -13370,7 +13370,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
         {
         }
 
-        [JsiiMethod(name: "constructMethod", isOverride: true)]
+        [JsiiMethod(name: "constructMethod")]
         public virtual void ConstructMethod()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -13608,7 +13608,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
         {
         }
 
-        [JsiiMethod(name: "resourceMethod", isOverride: true)]
+        [JsiiMethod(name: "resourceMethod")]
         public virtual void ResourceMethod()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -13660,7 +13660,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
         {
         }
 
-        [JsiiMethod(name: "vpcMethod", isOverride: true)]
+        [JsiiMethod(name: "vpcMethod")]
         public virtual void VpcMethod()
         {
             InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
@@ -13703,28 +13703,28 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>Say farewell.</summary>
-        [JsiiMethod(name: "farewell", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "farewell", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Farewell()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>Say goodbye.</summary>
-        [JsiiMethod(name: "goodbye", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "goodbye", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Goodbye()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>Returns another random number.</summary>
-        [JsiiMethod(name: "next", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}", isOverride: true)]
+        [JsiiMethod(name: "next", returnsJson: "{\\"type\\":{\\"primitive\\":\\"number\\"}}")]
         public virtual double Next()
         {
             return InvokeInstanceMethod<double>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>(deprecated) String representation of the value.</summary>
-        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public override string ToString()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -13810,28 +13810,28 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>Say farewell.</summary>
-        [JsiiMethod(name: "farewell", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "farewell", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Farewell()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>Say goodbye.</summary>
-        [JsiiMethod(name: "goodbye", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "goodbye", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Goodbye()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>(deprecated) Say hello!</summary>
-        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "hello", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public virtual string Hello()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
         }
 
         /// <summary>(deprecated) String representation of the value.</summary>
-        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+        [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
         public override string ToString()
         {
             return InvokeInstanceMethod<string>(new System.Type[]{}, new object[]{})!;
@@ -13895,7 +13895,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class NestedStruct : Amazon.JSII.Tests.CalculatorNamespace.INestedStruct
     {
         /// <summary>When provided, must be &gt; 0.</summary>
-        [JsiiProperty(name: "numberProp", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "numberProp", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double NumberProp
         {
             get;
@@ -14117,7 +14117,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.NullShouldBeTreatedAsUndefinedData")]
     public class NullShouldBeTreatedAsUndefinedData : Amazon.JSII.Tests.CalculatorNamespace.INullShouldBeTreatedAsUndefinedData
     {
-        [JsiiProperty(name: "arrayWithThreeElementsAndUndefinedAsSecondArgument", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"any\\"},\\"kind\\":\\"array\\"}}", isOverride: true)]
+        [JsiiProperty(name: "arrayWithThreeElementsAndUndefinedAsSecondArgument", typeJson: "{\\"collection\\":{\\"elementtype\\":{\\"primitive\\":\\"any\\"},\\"kind\\":\\"array\\"}}")]
         public object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument
         {
             get;
@@ -14125,7 +14125,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "thisShouldBeUndefined", typeJson: "{\\"primitive\\":\\"any\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "thisShouldBeUndefined", typeJson: "{\\"primitive\\":\\"any\\"}", isOptional: true)]
         public object? ThisShouldBeUndefined
         {
             get;
@@ -14458,7 +14458,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class OptionalStruct : Amazon.JSII.Tests.CalculatorNamespace.IOptionalStruct
     {
         [JsiiOptional]
-        [JsiiProperty(name: "field", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "field", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Field
         {
             get;
@@ -14631,7 +14631,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.ParentStruct982")]
     public class ParentStruct982 : Amazon.JSII.Tests.CalculatorNamespace.IParentStruct982
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Foo
         {
             get;
@@ -15256,7 +15256,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.PythonSelf
     [JsiiByValue(fqn: "jsii-calc.PythonSelf.StructWithSelf")]
     public class StructWithSelf : Amazon.JSII.Tests.CalculatorNamespace.PythonSelf.IStructWithSelf
     {
-        [JsiiProperty(name: "self", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "self", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Self
         {
             get;
@@ -15381,7 +15381,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class RootStruct : Amazon.JSII.Tests.CalculatorNamespace.IRootStruct
     {
         /// <summary>May not be empty.</summary>
-        [JsiiProperty(name: "stringProp", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "stringProp", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string StringProp
         {
             get;
@@ -15389,7 +15389,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "nestedStruct", typeJson: "{\\"fqn\\":\\"jsii-calc.NestedStruct\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "nestedStruct", typeJson: "{\\"fqn\\":\\"jsii-calc.NestedStruct\\"}", isOptional: true)]
         public Amazon.JSII.Tests.CalculatorNamespace.INestedStruct? NestedStruct
         {
             get;
@@ -15498,7 +15498,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class SecondLevelStruct : Amazon.JSII.Tests.CalculatorNamespace.ISecondLevelStruct
     {
         /// <summary>It's long and required.</summary>
-        [JsiiProperty(name: "deeperRequiredProp", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "deeperRequiredProp", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string DeeperRequiredProp
         {
             get;
@@ -15507,7 +15507,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
 
         /// <summary>It's long, but you'll almost never pass it.</summary>
         [JsiiOptional]
-        [JsiiProperty(name: "deeperOptionalProp", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "deeperOptionalProp", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? DeeperOptionalProp
         {
             get;
@@ -15696,14 +15696,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.SmellyStruct")]
     public class SmellyStruct : Amazon.JSII.Tests.CalculatorNamespace.ISmellyStruct
     {
-        [JsiiProperty(name: "property", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "property", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Property
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "yetAnoterOne", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOverride: true)]
+        [JsiiProperty(name: "yetAnoterOne", typeJson: "{\\"primitive\\":\\"boolean\\"}")]
         public bool YetAnoterOne
         {
             get;
@@ -15842,7 +15842,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.StableStruct")]
     public class StableStruct : Amazon.JSII.Tests.CalculatorNamespace.IStableStruct
     {
-        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "readonlyProperty", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string ReadonlyProperty
         {
             get;
@@ -15922,7 +15922,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         {
         }
 
-        [JsiiMethod(name: "method", isOverride: true)]
+        [JsiiMethod(name: "method")]
         public static new void Method()
         {
             InvokeStaticVoidMethod(typeof(Amazon.JSII.Tests.CalculatorNamespace.StaticHelloChild), new System.Type[]{}, new object[]{});
@@ -16163,7 +16163,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.StructA")]
     public class StructA : Amazon.JSII.Tests.CalculatorNamespace.IStructA
     {
-        [JsiiProperty(name: "requiredString", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "requiredString", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string RequiredString
         {
             get;
@@ -16171,7 +16171,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "optionalNumber", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optionalNumber", typeJson: "{\\"primitive\\":\\"number\\"}", isOptional: true)]
         public double? OptionalNumber
         {
             get;
@@ -16179,7 +16179,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "optionalString", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optionalString", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? OptionalString
         {
             get;
@@ -16203,7 +16203,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.StructB")]
     public class StructB : Amazon.JSII.Tests.CalculatorNamespace.IStructB
     {
-        [JsiiProperty(name: "requiredString", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "requiredString", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string RequiredString
         {
             get;
@@ -16211,7 +16211,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "optionalBoolean", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optionalBoolean", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         public bool? OptionalBoolean
         {
             get;
@@ -16219,7 +16219,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "optionalStructA", typeJson: "{\\"fqn\\":\\"jsii-calc.StructA\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optionalStructA", typeJson: "{\\"fqn\\":\\"jsii-calc.StructA\\"}", isOptional: true)]
         public Amazon.JSII.Tests.CalculatorNamespace.IStructA? OptionalStructA
         {
             get;
@@ -16246,7 +16246,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.StructParameterType")]
     public class StructParameterType : Amazon.JSII.Tests.CalculatorNamespace.IStructParameterType
     {
-        [JsiiProperty(name: "scope", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "scope", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Scope
         {
             get;
@@ -16254,7 +16254,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "props", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "props", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOptional: true)]
         public bool? Props
         {
             get;
@@ -16363,7 +16363,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class StructWithEnum : Amazon.JSII.Tests.CalculatorNamespace.IStructWithEnum
     {
         /// <summary>An enum value.</summary>
-        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"jsii-calc.StringEnum\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"fqn\\":\\"jsii-calc.StringEnum\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.StringEnum Foo
         {
             get;
@@ -16375,7 +16375,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// <strong>Default</strong>: AllTypesEnum.YOUR_ENUM_VALUE
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "bar", typeJson: "{\\"fqn\\":\\"jsii-calc.AllTypesEnum\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"fqn\\":\\"jsii-calc.AllTypesEnum\\"}", isOptional: true)]
         public Amazon.JSII.Tests.CalculatorNamespace.AllTypesEnum? Bar
         {
             get;
@@ -16398,7 +16398,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.StructWithJavaReservedWords")]
     public class StructWithJavaReservedWords : Amazon.JSII.Tests.CalculatorNamespace.IStructWithJavaReservedWords
     {
-        [JsiiProperty(name: "default", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "default", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Default
         {
             get;
@@ -16406,7 +16406,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "assert", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "assert", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Assert
         {
             get;
@@ -16414,7 +16414,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "result", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "result", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Result
         {
             get;
@@ -16422,7 +16422,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "that", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "that", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? That
         {
             get;
@@ -16479,7 +16479,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences
     [JsiiByValue(fqn: "jsii-calc.submodule.back_references.MyClassReference")]
     public class MyClassReference : Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences.IMyClassReference
     {
-        [JsiiProperty(name: "reference", typeJson: "{\\"fqn\\":\\"jsii-calc.submodule.MyClass\\"}", isOverride: true)]
+        [JsiiProperty(name: "reference", typeJson: "{\\"fqn\\":\\"jsii-calc.submodule.MyClass\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.Submodule.MyClass Reference
         {
             get;
@@ -16697,14 +16697,14 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child
     public class KwargsProps : Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.IKwargsProps
     {
         [JsiiOptional]
-        [JsiiProperty(name: "extra", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "extra", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Extra
         {
             get;
             set;
         }
 
-        [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.submodule.child.SomeEnum\\"}", isOverride: true)]
+        [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.submodule.child.SomeEnum\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.SomeEnum Prop
         {
             get;
@@ -16787,7 +16787,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child
     [JsiiByValue(fqn: "jsii-calc.submodule.child.SomeStruct")]
     public class SomeStruct : Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.ISomeStruct
     {
-        [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.submodule.child.SomeEnum\\"}", isOverride: true)]
+        [JsiiProperty(name: "prop", typeJson: "{\\"fqn\\":\\"jsii-calc.submodule.child.SomeEnum\\"}")]
         public Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.SomeEnum Prop
         {
             get;
@@ -16810,7 +16810,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child
     [JsiiByValue(fqn: "jsii-calc.submodule.child.Structure")]
     public class Structure : Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.IStructure
     {
-        [JsiiProperty(name: "bool", typeJson: "{\\"primitive\\":\\"boolean\\"}", isOverride: true)]
+        [JsiiProperty(name: "bool", typeJson: "{\\"primitive\\":\\"boolean\\"}")]
         public bool Bool
         {
             get;
@@ -16837,7 +16837,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule
     [JsiiByValue(fqn: "jsii-calc.submodule.Default")]
     public class Default : Amazon.JSII.Tests.CalculatorNamespace.Submodule.IDefault
     {
-        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Foo
         {
             get;
@@ -17165,7 +17165,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Param
     [JsiiByValue(fqn: "jsii-calc.submodule.param.SpecialParameter")]
     public class SpecialParameter : Amazon.JSII.Tests.CalculatorNamespace.Submodule.Param.ISpecialParameter
     {
-        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "value", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Value
         {
             get;
@@ -17327,7 +17327,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class SupportsNiceJavaBuilderProps : Amazon.JSII.Tests.CalculatorNamespace.ISupportsNiceJavaBuilderProps
     {
         /// <summary>Some number, like 42.</summary>
-        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"number\\"}", isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"primitive\\":\\"number\\"}")]
         public double Bar
         {
             get;
@@ -17339,7 +17339,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         /// But here we are, doing it like we didn't care.
         /// </remarks>
         [JsiiOptional]
-        [JsiiProperty(name: "id", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "id", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Id
         {
             get;
@@ -17649,7 +17649,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     public class TopLevelStruct : Amazon.JSII.Tests.CalculatorNamespace.ITopLevelStruct
     {
         /// <summary>This is a required field.</summary>
-        [JsiiProperty(name: "required", typeJson: "{\\"primitive\\":\\"string\\"}", isOverride: true)]
+        [JsiiProperty(name: "required", typeJson: "{\\"primitive\\":\\"string\\"}")]
         public string Required
         {
             get;
@@ -17657,7 +17657,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         /// <summary>A union to really stress test our serialization.</summary>
-        [JsiiProperty(name: "secondLevel", typeJson: "{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"number\\"},{\\"fqn\\":\\"jsii-calc.SecondLevelStruct\\"}]}}", isOverride: true)]
+        [JsiiProperty(name: "secondLevel", typeJson: "{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"number\\"},{\\"fqn\\":\\"jsii-calc.SecondLevelStruct\\"}]}}")]
         public object SecondLevel
         {
             get;
@@ -17666,7 +17666,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
 
         /// <summary>You don't have to pass this.</summary>
         [JsiiOptional]
-        [JsiiProperty(name: "optional", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "optional", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)]
         public string? Optional
         {
             get;
@@ -17852,7 +17852,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
             /// <remarks>
             /// <strong>Stability</strong>: Deprecated
             /// </remarks>
-            [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", isOverride: true)]
+            [JsiiMethod(name: "toString", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}")]
             [System.Obsolete()]
             public override string ToString()
             {
@@ -17876,7 +17876,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
     [JsiiByValue(fqn: "jsii-calc.UnionProperties")]
     public class UnionProperties : Amazon.JSII.Tests.CalculatorNamespace.IUnionProperties
     {
-        [JsiiProperty(name: "bar", typeJson: "{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"string\\"},{\\"primitive\\":\\"number\\"},{\\"fqn\\":\\"jsii-calc.AllTypes\\"}]}}", isOverride: true)]
+        [JsiiProperty(name: "bar", typeJson: "{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"string\\"},{\\"primitive\\":\\"number\\"},{\\"fqn\\":\\"jsii-calc.AllTypes\\"}]}}")]
         public object Bar
         {
             get;
@@ -17884,7 +17884,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace
         }
 
         [JsiiOptional]
-        [JsiiProperty(name: "foo", typeJson: "{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"string\\"},{\\"primitive\\":\\"number\\"}]}}", isOptional: true, isOverride: true)]
+        [JsiiProperty(name: "foo", typeJson: "{\\"union\\":{\\"types\\":[{\\"primitive\\":\\"string\\"},{\\"primitive\\":\\"number\\"}]}}", isOptional: true)]
         public object? Foo
         {
             get;