gs2 1.0.4 → 1.0.5

package/src/distributor/model/DistributorModelMaster.ts

@@ -101,23 +101,11 @@ export default class DistributorModelMaster implements IModel {
         namespaceName: string|null,
         distributorName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (distributorName == null || distributorName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{distributorName}', distributorName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{distributorName}', distributorName ?? '');
     }
 
     public getDistributorModelId(): string|null {

package/src/distributor/model/Namespace.ts

@@ -81,19 +81,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/enhance/model/CurrentRateMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentRateMaster implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/enhance/model/Namespace.ts

@@ -85,19 +85,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/enhance/model/RateModel.ts

@@ -104,23 +104,11 @@ export default class RateModel implements IModel {
         namespaceName: string|null,
         rateName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (rateName == null || rateName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{rateName}', rateName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{rateName}', rateName ?? '');
     }
 
     public getRateModelId(): string|null {

package/src/enhance/model/RateModelMaster.ts

@@ -106,23 +106,11 @@ export default class RateModelMaster implements IModel {
         namespaceName: string|null,
         rateName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (rateName == null || rateName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{rateName}', rateName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{rateName}', rateName ?? '');
     }
 
     public getRateModelId(): string|null {

package/src/exchange/model/Await.ts

@@ -121,27 +121,12 @@ export default class Await implements IModel {
         userId: string|null,
         awaitName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (awaitName == null || awaitName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{awaitName}', awaitName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{awaitName}', awaitName ?? '');
     }
 
     public getAwaitId(): string|null {

package/src/exchange/model/CurrentRateMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentRateMaster implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/exchange/model/Namespace.ts

@@ -86,19 +86,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/exchange/model/RateModel.ts

@@ -104,23 +104,11 @@ export default class RateModel implements IModel {
         namespaceName: string|null,
         rateName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (rateName == null || rateName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{rateName}', rateName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{rateName}', rateName ?? '');
     }
 
     public getRateModelId(): string|null {

package/src/exchange/model/RateModelMaster.ts

@@ -107,23 +107,11 @@ export default class RateModelMaster implements IModel {
         namespaceName: string|null,
         rateName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (rateName == null || rateName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{rateName}', rateName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{rateName}', rateName ?? '');
     }
 
     public getRateModelId(): string|null {

package/src/experience/model/CurrentExperienceMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentExperienceMaster implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/experience/model/ExperienceModel.ts

@@ -101,23 +101,11 @@ export default class ExperienceModel implements IModel {
         namespaceName: string|null,
         experienceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (experienceName == null || experienceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{experienceName}', experienceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{experienceName}', experienceName ?? '');
     }
 
     public getExperienceModelId(): string|null {

package/src/experience/model/ExperienceModelMaster.ts

@@ -103,23 +103,11 @@ export default class ExperienceModelMaster implements IModel {
         namespaceName: string|null,
         experienceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (experienceName == null || experienceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{experienceName}', experienceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{experienceName}', experienceName ?? '');
     }
 
     public getExperienceModelId(): string|null {

package/src/experience/model/Namespace.ts

@@ -86,19 +86,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/experience/model/Status.ts

@@ -148,31 +148,13 @@ export default class Status implements IModel {
         experienceName: string|null,
         propertyId: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (experienceName == null || experienceName === '') {
-            return null;
-        }
-        if (propertyId == null || propertyId === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{experienceName}', experienceName!)
-            .replace('{propertyId}', propertyId!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{experienceName}', experienceName ?? '')
+            .replace('{propertyId}', propertyId ?? '');
     }
 
     public getStatusId(): string|null {

package/src/experience/model/ThresholdMaster.ts

@@ -100,23 +100,11 @@ export default class ThresholdMaster implements IModel {
         namespaceName: string|null,
         thresholdName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (thresholdName == null || thresholdName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{thresholdName}', thresholdName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{thresholdName}', thresholdName ?? '');
     }
 
     public getThresholdId(): string|null {

package/src/formation/model/CurrentFormMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentFormMaster implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/formation/model/Form.ts

@@ -146,31 +146,13 @@ export default class Form implements IModel {
         moldName: string|null,
         index: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (moldName == null || moldName === '') {
-            return null;
-        }
-        if (index == null || index === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{moldName}', moldName!)
-            .replace('{index}', index!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{moldName}', moldName ?? '')
+            .replace('{index}', index ?? '');
     }
 
     public getFormId(): string|null {

package/src/formation/model/FormModel.ts

@@ -98,23 +98,11 @@ export default class FormModel implements IModel {
         namespaceName: string|null,
         formModelName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (formModelName == null || formModelName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{formModelName}', formModelName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{formModelName}', formModelName ?? '');
     }
 
     public getFormModelId(): string|null {

package/src/formation/model/FormModelMaster.ts

@@ -101,23 +101,11 @@ export default class FormModelMaster implements IModel {
         namespaceName: string|null,
         formModelName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (formModelName == null || formModelName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{formModelName}', formModelName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{formModelName}', formModelName ?? '');
     }
 
     public getFormModelId(): string|null {

package/src/formation/model/Mold.ts

@@ -121,27 +121,12 @@ export default class Mold implements IModel {
         userId: string|null,
         moldName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (moldName == null || moldName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{moldName}', moldName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{moldName}', moldName ?? '');
     }
 
     public getMoldId(): string|null {

package/src/formation/model/MoldModel.ts

@@ -101,23 +101,11 @@ export default class MoldModel implements IModel {
         namespaceName: string|null,
         moldName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (moldName == null || moldName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{moldName}', moldName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{moldName}', moldName ?? '');
     }
 
     public getMoldModelId(): string|null {