gs2 1.3.229 → 1.3.233

package/watch/model/FormationForm.ts

@@ -23,11 +23,11 @@ import FormationFormUsageDistributionStatistics from './FormationFormUsageDistri
 import FormationFormUsageDistributionSegment from './FormationFormUsageDistributionSegment';
 import FormationFormUsageDistribution from './FormationFormUsageDistribution';
 import FormationFormDistributions from './FormationFormDistributions';
-const grnFormat: string = "grn:gs2:{region}:{ownerId}:watch:metrics:{year}:{month}:{day}:formation:namespace:{namespaceName}:mold:{moldName}:form:{index}";
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:watch:metrics:{year}:{month}:{day}:formation:namespace:{namespaceName}:mold:{moldModelName}:form:{index}";
 
 export default class FormationForm implements IModel {
     private formId: string|null = null;
-    private index: string|null = null;
+    private index: number|null = null;
     private statistics: FormationFormStatistics|null = null;
     private distributions: FormationFormDistributions|null = null;
 
@@ -39,7 +39,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -56,7 +56,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -73,7 +73,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -90,7 +90,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '(.*)')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -107,7 +107,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '(.*)')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -124,7 +124,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '(.*)')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -133,7 +133,7 @@ export default class FormationForm implements IModel {
         return null;
     }
 
-    public static getMoldName(grn: string): string|null {
+    public static getMoldModelName(grn: string): string|null {
         const match = grn.match(grnFormat
             .replace('{region}', '.*')
             .replace('{ownerId}', '.*')
@@ -141,7 +141,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '(.*)')
+            .replace('{moldModelName}', '(.*)')
             .replace('{index}', '.*')
         );
         if (match) {
@@ -158,7 +158,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
             .replace('{index}', '(.*)')
         );
         if (match) {
@@ -186,7 +186,7 @@ export default class FormationForm implements IModel {
         if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMoldName(grn) == null || this.getMoldName(grn) === '') {
+        if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
             return false;
         }
         if (this.getIndex(grn) == null || this.getIndex(grn) === '') {
@@ -202,7 +202,7 @@ export default class FormationForm implements IModel {
         month: string|null,
         day: string|null,
         namespaceName: string|null,
-        moldName: string|null,
+        moldModelName: string|null,
         index: string|null,
     ): string|null {
         return grnFormat
@@ -212,7 +212,7 @@ export default class FormationForm implements IModel {
             .replace('{month}', month ?? '')
             .replace('{day}', day ?? '')
             .replace('{namespaceName}', namespaceName ?? '')
-            .replace('{moldName}', moldName ?? '')
+            .replace('{moldModelName}', moldModelName ?? '')
             .replace('{index}', index ?? '');
     }
     public getFormId(): string|null {
@@ -226,14 +226,14 @@ export default class FormationForm implements IModel {
         this.formId = formId;
         return this;
     }
-    public getIndex(): string|null {
+    public getIndex(): number|null {
         return this.index;
     }
-    public setIndex(index: string|null) {
+    public setIndex(index: number|null) {
         this.index = index;
         return this;
     }
-    public withIndex(index: string|null): this {
+    public withIndex(index: number|null): this {
         this.index = index;
         return this;
     }

package/watch/model/FormationMold.d.ts

@@ -4,7 +4,7 @@ import FormationMoldDistributions from './FormationMoldDistributions';
 import FormationForm from './FormationForm';
 export default class FormationMold implements IModel {
     private moldId;
-    private moldName;
+    private moldModelName;
     private statistics;
     private distributions;
     private forms;
@@ -14,15 +14,15 @@ export default class FormationMold implements IModel {
     static getMonth(grn: string): string | null;
     static getDay(grn: string): string | null;
     static getNamespaceName(grn: string): string | null;
-    static getMoldName(grn: string): string | null;
+    static getMoldModelName(grn: string): string | null;
     static isValid(grn: string): boolean;
-    static createGrn(region: string | null, ownerId: string | null, year: string | null, month: string | null, day: string | null, namespaceName: string | null, moldName: string | null): string | null;
+    static createGrn(region: string | null, ownerId: string | null, year: string | null, month: string | null, day: string | null, namespaceName: string | null, moldModelName: string | null): string | null;
     getMoldId(): string | null;
     setMoldId(moldId: string | null): this;
     withMoldId(moldId: string | null): this;
-    getMoldName(): string | null;
-    setMoldName(moldName: string | null): this;
-    withMoldName(moldName: string | null): this;
+    getMoldModelName(): string | null;
+    setMoldModelName(moldModelName: string | null): this;
+    withMoldModelName(moldModelName: string | null): this;
     getStatistics(): FormationMoldStatistics | null;
     setStatistics(statistics: FormationMoldStatistics | null): this;
     withStatistics(statistics: FormationMoldStatistics | null): this;

package/watch/model/FormationMold.js

@@ -19,11 +19,11 @@ var tslib_1 = require("tslib");
 var FormationMoldStatistics_1 = tslib_1.__importDefault(require("./FormationMoldStatistics"));
 var FormationMoldDistributions_1 = tslib_1.__importDefault(require("./FormationMoldDistributions"));
 var FormationForm_1 = tslib_1.__importDefault(require("./FormationForm"));
-var grnFormat = "grn:gs2:{region}:{ownerId}:watch:metrics:{year}:{month}:{day}:formation:namespace:{namespaceName}:mold:{moldName}";
+var grnFormat = "grn:gs2:{region}:{ownerId}:watch:metrics:{year}:{month}:{day}:formation:namespace:{namespaceName}:mold:{moldModelName}";
 var FormationMold = /** @class */ (function () {
     function FormationMold() {
         this.moldId = null;
-        this.moldName = null;
+        this.moldModelName = null;
         this.statistics = null;
         this.distributions = null;
         this.forms = null;
@@ -36,7 +36,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*'));
+            .replace('{moldModelName}', '.*'));
         if (match) {
             return match[1];
         }
@@ -50,7 +50,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*'));
+            .replace('{moldModelName}', '.*'));
         if (match) {
             return match[1];
         }
@@ -64,7 +64,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*'));
+            .replace('{moldModelName}', '.*'));
         if (match) {
             return match[1];
         }
@@ -78,7 +78,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '(.*)')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*'));
+            .replace('{moldModelName}', '.*'));
         if (match) {
             return match[1];
         }
@@ -92,7 +92,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '.*')
             .replace('{day}', '(.*)')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*'));
+            .replace('{moldModelName}', '.*'));
         if (match) {
             return match[1];
         }
@@ -106,13 +106,13 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '(.*)')
-            .replace('{moldName}', '.*'));
+            .replace('{moldModelName}', '.*'));
         if (match) {
             return match[1];
         }
         return null;
     };
-    FormationMold.getMoldName = function (grn) {
+    FormationMold.getMoldModelName = function (grn) {
         var match = grn.match(grnFormat
             .replace('{region}', '.*')
             .replace('{ownerId}', '.*')
@@ -120,7 +120,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '(.*)'));
+            .replace('{moldModelName}', '(.*)'));
         if (match) {
             return match[1];
         }
@@ -145,12 +145,12 @@ var FormationMold = /** @class */ (function () {
         if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMoldName(grn) == null || this.getMoldName(grn) === '') {
+        if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
             return false;
         }
         return true;
     };
-    FormationMold.createGrn = function (region, ownerId, year, month, day, namespaceName, moldName) {
+    FormationMold.createGrn = function (region, ownerId, year, month, day, namespaceName, moldModelName) {
         return grnFormat
             .replace('{region}', region !== null && region !== void 0 ? region : '')
             .replace('{ownerId}', ownerId !== null && ownerId !== void 0 ? ownerId : '')
@@ -158,7 +158,7 @@ var FormationMold = /** @class */ (function () {
             .replace('{month}', month !== null && month !== void 0 ? month : '')
             .replace('{day}', day !== null && day !== void 0 ? day : '')
             .replace('{namespaceName}', namespaceName !== null && namespaceName !== void 0 ? namespaceName : '')
-            .replace('{moldName}', moldName !== null && moldName !== void 0 ? moldName : '');
+            .replace('{moldModelName}', moldModelName !== null && moldModelName !== void 0 ? moldModelName : '');
     };
     FormationMold.prototype.getMoldId = function () {
         return this.moldId;
@@ -171,15 +171,15 @@ var FormationMold = /** @class */ (function () {
         this.moldId = moldId;
         return this;
     };
-    FormationMold.prototype.getMoldName = function () {
-        return this.moldName;
+    FormationMold.prototype.getMoldModelName = function () {
+        return this.moldModelName;
     };
-    FormationMold.prototype.setMoldName = function (moldName) {
-        this.moldName = moldName;
+    FormationMold.prototype.setMoldModelName = function (moldModelName) {
+        this.moldModelName = moldModelName;
         return this;
     };
-    FormationMold.prototype.withMoldName = function (moldName) {
-        this.moldName = moldName;
+    FormationMold.prototype.withMoldModelName = function (moldModelName) {
+        this.moldModelName = moldModelName;
         return this;
     };
     FormationMold.prototype.getStatistics = function () {
@@ -221,7 +221,7 @@ var FormationMold = /** @class */ (function () {
         }
         return new FormationMold()
             .withMoldId(data["moldId"])
-            .withMoldName(data["moldName"])
+            .withMoldModelName(data["moldModelName"])
             .withStatistics(FormationMoldStatistics_1.default.fromDict(data["statistics"]))
             .withDistributions(FormationMoldDistributions_1.default.fromDict(data["distributions"]))
             .withForms(data.forms ?
@@ -233,7 +233,7 @@ var FormationMold = /** @class */ (function () {
         var _a, _b;
         return {
             "moldId": this.getMoldId(),
-            "moldName": this.getMoldName(),
+            "moldModelName": this.getMoldModelName(),
             "statistics": (_a = this.getStatistics()) === null || _a === void 0 ? void 0 : _a.toDict(),
             "distributions": (_b = this.getDistributions()) === null || _b === void 0 ? void 0 : _b.toDict(),
             "forms": this.getForms() ?

package/watch/model/FormationMold.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormationMold.js","sourceRoot":"","sources":["FormationMold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FormationMold.js","sourceRoot":"","sources":["FormationMold.ts"],"names":[],"mappings":"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"}

package/watch/model/FormationMold.ts

@@ -32,11 +32,11 @@ import FormationFormUsageDistributionSegment from './FormationFormUsageDistribut
 import FormationFormUsageDistribution from './FormationFormUsageDistribution';
 import FormationFormDistributions from './FormationFormDistributions';
 import FormationForm from './FormationForm';
-const grnFormat: string = "grn:gs2:{region}:{ownerId}:watch:metrics:{year}:{month}:{day}:formation:namespace:{namespaceName}:mold:{moldName}";
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:watch:metrics:{year}:{month}:{day}:formation:namespace:{namespaceName}:mold:{moldModelName}";
 
 export default class FormationMold implements IModel {
     private moldId: string|null = null;
-    private moldName: string|null = null;
+    private moldModelName: string|null = null;
     private statistics: FormationMoldStatistics|null = null;
     private distributions: FormationMoldDistributions|null = null;
     private forms: FormationForm[]|null = null;
@@ -49,7 +49,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -65,7 +65,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -81,7 +81,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -97,7 +97,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '(.*)')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -113,7 +113,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '(.*)')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -129,7 +129,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '(.*)')
-            .replace('{moldName}', '.*')
+            .replace('{moldModelName}', '.*')
         );
         if (match) {
             return match[1];
@@ -137,7 +137,7 @@ export default class FormationMold implements IModel {
         return null;
     }
 
-    public static getMoldName(grn: string): string|null {
+    public static getMoldModelName(grn: string): string|null {
         const match = grn.match(grnFormat
             .replace('{region}', '.*')
             .replace('{ownerId}', '.*')
@@ -145,7 +145,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', '.*')
             .replace('{day}', '.*')
             .replace('{namespaceName}', '.*')
-            .replace('{moldName}', '(.*)')
+            .replace('{moldModelName}', '(.*)')
         );
         if (match) {
             return match[1];
@@ -172,7 +172,7 @@ export default class FormationMold implements IModel {
         if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMoldName(grn) == null || this.getMoldName(grn) === '') {
+        if (this.getMoldModelName(grn) == null || this.getMoldModelName(grn) === '') {
             return false;
         }
         return true;
@@ -185,7 +185,7 @@ export default class FormationMold implements IModel {
         month: string|null,
         day: string|null,
         namespaceName: string|null,
-        moldName: string|null,
+        moldModelName: string|null,
     ): string|null {
         return grnFormat
             .replace('{region}', region ?? '')
@@ -194,7 +194,7 @@ export default class FormationMold implements IModel {
             .replace('{month}', month ?? '')
             .replace('{day}', day ?? '')
             .replace('{namespaceName}', namespaceName ?? '')
-            .replace('{moldName}', moldName ?? '');
+            .replace('{moldModelName}', moldModelName ?? '');
     }
     public getMoldId(): string|null {
         return this.moldId;
@@ -207,15 +207,15 @@ export default class FormationMold implements IModel {
         this.moldId = moldId;
         return this;
     }
-    public getMoldName(): string|null {
-        return this.moldName;
+    public getMoldModelName(): string|null {
+        return this.moldModelName;
     }
-    public setMoldName(moldName: string|null) {
-        this.moldName = moldName;
+    public setMoldModelName(moldModelName: string|null) {
+        this.moldModelName = moldModelName;
         return this;
     }
-    public withMoldName(moldName: string|null): this {
-        this.moldName = moldName;
+    public withMoldModelName(moldModelName: string|null): this {
+        this.moldModelName = moldModelName;
         return this;
     }
     public getStatistics(): FormationMoldStatistics|null {
@@ -258,7 +258,7 @@ export default class FormationMold implements IModel {
         }
         return new FormationMold()
             .withMoldId(data["moldId"])
-            .withMoldName(data["moldName"])
+            .withMoldModelName(data["moldModelName"])
             .withStatistics(FormationMoldStatistics.fromDict(data["statistics"]))
             .withDistributions(FormationMoldDistributions.fromDict(data["distributions"]))
             .withForms(data.forms ?
@@ -271,7 +271,7 @@ export default class FormationMold implements IModel {
     public toDict(): {[key: string]: any} {
         return {
             "moldId": this.getMoldId(),
-            "moldName": this.getMoldName(),
+            "moldModelName": this.getMoldModelName(),
             "statistics": this.getStatistics()?.toDict(),
             "distributions": this.getDistributions()?.toDict(),
             "forms": this.getForms() ?

package/watch/model/FormationNamespaceIncreaseCapacityByMoldDistributionSegment.d.ts

@@ -1,10 +1,10 @@
 import IModel from '../../core/interface/IModel';
 export default class FormationNamespaceIncreaseCapacityByMoldDistributionSegment implements IModel {
-    private moldName;
+    private moldModelName;
     private count;
-    getMoldName(): string | null;
-    setMoldName(moldName: string | null): this;
-    withMoldName(moldName: string | null): this;
+    getMoldModelName(): string | null;
+    setMoldModelName(moldModelName: string | null): this;
+    withMoldModelName(moldModelName: string | null): this;
     getCount(): number | null;
     setCount(count: number | null): this;
     withCount(count: number | null): this;

package/watch/model/FormationNamespaceIncreaseCapacityByMoldDistributionSegment.js

@@ -17,18 +17,18 @@ permissions and limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 var FormationNamespaceIncreaseCapacityByMoldDistributionSegment = /** @class */ (function () {
     function FormationNamespaceIncreaseCapacityByMoldDistributionSegment() {
-        this.moldName = null;
+        this.moldModelName = null;
         this.count = null;
     }
-    FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.getMoldName = function () {
-        return this.moldName;
+    FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.getMoldModelName = function () {
+        return this.moldModelName;
     };
-    FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.setMoldName = function (moldName) {
-        this.moldName = moldName;
+    FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.setMoldModelName = function (moldModelName) {
+        this.moldModelName = moldModelName;
         return this;
     };
-    FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.withMoldName = function (moldName) {
-        this.moldName = moldName;
+    FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.withMoldModelName = function (moldModelName) {
+        this.moldModelName = moldModelName;
         return this;
     };
     FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.getCount = function () {
@@ -47,12 +47,12 @@ var FormationNamespaceIncreaseCapacityByMoldDistributionSegment = /** @class */
             return null;
         }
         return new FormationNamespaceIncreaseCapacityByMoldDistributionSegment()
-            .withMoldName(data["moldName"])
+            .withMoldModelName(data["moldModelName"])
             .withCount(data["count"]);
     };
     FormationNamespaceIncreaseCapacityByMoldDistributionSegment.prototype.toDict = function () {
         return {
-            "moldName": this.getMoldName(),
+            "moldModelName": this.getMoldModelName(),
             "count": this.getCount(),
         };
     };

package/watch/model/FormationNamespaceIncreaseCapacityByMoldDistributionSegment.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormationNamespaceIncreaseCapacityByMoldDistributionSegment.js","sourceRoot":"","sources":["FormationNamespaceIncreaseCapacityByMoldDistributionSegment.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAIH;IAAA;QACY,aAAQ,GAAgB,IAAI,CAAC;QAC7B,UAAK,GAAgB,IAAI,CAAC;IAuCtC,CAAC;IAtCU,iFAAW,GAAlB;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACM,iFAAW,GAAlB,UAAmB,QAAqB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,kFAAY,GAAnB,UAAoB,QAAqB;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8EAAQ,GAAf;QACI,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IACM,8EAAQ,GAAf,UAAgB,KAAkB;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+EAAS,GAAhB,UAAiB,KAAkB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,oEAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,2DAA2D,EAAE;aACnE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC9B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,4EAAM,GAAb;QACI,OAAO;YACH,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE;YAC9B,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;SAC3B,CAAC;IACN,CAAC;IACL,kEAAC;AAAD,CAAC,AAzCD,IAyCC"}
+{"version":3,"file":"FormationNamespaceIncreaseCapacityByMoldDistributionSegment.js","sourceRoot":"","sources":["FormationNamespaceIncreaseCapacityByMoldDistributionSegment.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAIH;IAAA;QACY,kBAAa,GAAgB,IAAI,CAAC;QAClC,UAAK,GAAgB,IAAI,CAAC;IAuCtC,CAAC;IAtCU,sFAAgB,GAAvB;QACI,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACM,sFAAgB,GAAvB,UAAwB,aAA0B;QAC9C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,uFAAiB,GAAxB,UAAyB,aAA0B;QAC/C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,8EAAQ,GAAf;QACI,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IACM,8EAAQ,GAAf,UAAgB,KAAkB;QAC9B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IACM,+EAAS,GAAhB,UAAiB,KAAkB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEa,oEAAQ,GAAtB,UAAuB,IAA0B;QAC7C,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,2DAA2D,EAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACxC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,CAAC;IAEM,4EAAM,GAAb;QACI,OAAO;YACH,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE;YACxC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;SAC3B,CAAC;IACN,CAAC;IACL,kEAAC;AAAD,CAAC,AAzCD,IAyCC"}

package/watch/model/FormationNamespaceIncreaseCapacityByMoldDistributionSegment.ts

@@ -17,17 +17,17 @@ permissions and limitations under the License.
 import IModel from '../../core/interface/IModel';
 
 export default class FormationNamespaceIncreaseCapacityByMoldDistributionSegment implements IModel {
-    private moldName: string|null = null;
+    private moldModelName: string|null = null;
     private count: number|null = null;
-    public getMoldName(): string|null {
-        return this.moldName;
+    public getMoldModelName(): string|null {
+        return this.moldModelName;
     }
-    public setMoldName(moldName: string|null) {
-        this.moldName = moldName;
+    public setMoldModelName(moldModelName: string|null) {
+        this.moldModelName = moldModelName;
         return this;
     }
-    public withMoldName(moldName: string|null): this {
-        this.moldName = moldName;
+    public withMoldModelName(moldModelName: string|null): this {
+        this.moldModelName = moldModelName;
         return this;
     }
     public getCount(): number|null {
@@ -47,13 +47,13 @@ export default class FormationNamespaceIncreaseCapacityByMoldDistributionSegment
             return null;
         }
         return new FormationNamespaceIncreaseCapacityByMoldDistributionSegment()
-            .withMoldName(data["moldName"])
+            .withMoldModelName(data["moldModelName"])
             .withCount(data["count"]);
     }
 
     public toDict(): {[key: string]: any} {
         return {
-            "moldName": this.getMoldName(),
+            "moldModelName": this.getMoldModelName(),
             "count": this.getCount(),
         };
     }

package/watch/model/FormationNamespaceUpdateByMoldDistributionSegment.d.ts

@@ -1,10 +1,10 @@
 import IModel from '../../core/interface/IModel';
 export default class FormationNamespaceUpdateByMoldDistributionSegment implements IModel {
-    private moldName;
+    private moldModelName;
     private count;
-    getMoldName(): string | null;
-    setMoldName(moldName: string | null): this;
-    withMoldName(moldName: string | null): this;
+    getMoldModelName(): string | null;
+    setMoldModelName(moldModelName: string | null): this;
+    withMoldModelName(moldModelName: string | null): this;
     getCount(): number | null;
     setCount(count: number | null): this;
     withCount(count: number | null): this;