Merge pull request #11930 from viktorsml/#11852-fix-override-in-typescript

HugoMario · web-flow · commit d80245857048 · 2023-10-04T18:53:31.000-05:00
#11852 fix override in typescript
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/encoder.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/encoder.mustache
@@ -12,11 +12,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore-security-test/typescript-angular/encoder.ts b/samples/client/petstore-security-test/typescript-angular/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore-security-test/typescript-angular2/encoder.ts b/samples/client/petstore-security-test/typescript-angular2/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts b/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/encoder.ts b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore/typescript-angular-v5/npm/encoder.ts b/samples/client/petstore/typescript-angular-v5/npm/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore/typescript-angular-v5/with-interfaces/encoder.ts b/samples/client/petstore/typescript-angular-v5/with-interfaces/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }
diff --git a/samples/client/petstore/typescript-angular-v6/npm/encoder.ts b/samples/client/petstore/typescript-angular-v6/npm/encoder.ts
@@ -6,11 +6,11 @@
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
 export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
-    encodeKey(k: string): string {
+    override encodeKey(k: string): string {
         k = super.encodeKey(k);
         return k.replace(/\+/gi, '%2B');
     }
-    encodeValue(v: string): string {
+    override encodeValue(v: string): string {
         v = super.encodeValue(v);
         return v.replace(/\+/gi, '%2B');
     }

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318`
`13`	`13`	`*/`
`14`	`14`	`export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {`
`15`		`- encodeKey(k: string): string {`
	`15`	`+ override encodeKey(k: string): string {`
`16`	`16`	`k = super.encodeKey(k);`
`17`	`17`	`return k.replace(/\+/gi, '%2B');`
`18`	`18`	`}`
`19`		`- encodeValue(v: string): string {`
	`19`	`+ override encodeValue(v: string): string {`
`20`	`20`	`v = super.encodeValue(v);`
`21`	`21`	`return v.replace(/\+/gi, '%2B');`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`	`* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318`
`7`	`7`	`*/`
`8`	`8`	`export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {`
`9`		`- encodeKey(k: string): string {`
	`9`	`+ override encodeKey(k: string): string {`
`10`	`10`	`k = super.encodeKey(k);`
`11`	`11`	`return k.replace(/\+/gi, '%2B');`
`12`	`12`	`}`
`13`		`- encodeValue(v: string): string {`
	`13`	`+ override encodeValue(v: string): string {`
`14`	`14`	`v = super.encodeValue(v);`
`15`	`15`	`return v.replace(/\+/gi, '%2B');`
`16`	`16`	`}`