gs2 1.0.4 → 1.3.0

package/src/showcase/model/Showcase.ts

@@ -82,16 +82,16 @@ export default class Showcase implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getShowcaseName(grn) == null) {
+        if (this.getShowcaseName(grn) == null || this.getShowcaseName(grn) === '') {
             return false;
         }
         return true;
@@ -103,23 +103,11 @@ export default class Showcase implements IModel {
         namespaceName: string|null,
         showcaseName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (showcaseName == null || showcaseName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{showcaseName}', showcaseName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{showcaseName}', showcaseName ?? '');
     }
 
     public getShowcaseId(): string|null {

package/src/showcase/model/ShowcaseMaster.ts

@@ -81,16 +81,16 @@ export default class ShowcaseMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getShowcaseName(grn) == null) {
+        if (this.getShowcaseName(grn) == null || this.getShowcaseName(grn) === '') {
             return false;
         }
         return true;
@@ -102,23 +102,11 @@ export default class ShowcaseMaster implements IModel {
         namespaceName: string|null,
         showcaseName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (showcaseName == null || showcaseName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{showcaseName}', showcaseName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{showcaseName}', showcaseName ?? '');
     }
 
     public getShowcaseId(): string|null {

package/src/stamina/model/CurrentStaminaMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentStaminaMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;
@@ -75,19 +75,10 @@ export default class CurrentStaminaMaster 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/stamina/model/MaxStaminaTable.ts

@@ -77,16 +77,16 @@ export default class MaxStaminaTable implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMaxStaminaTableName(grn) == null) {
+        if (this.getMaxStaminaTableName(grn) == null || this.getMaxStaminaTableName(grn) === '') {
             return false;
         }
         return true;
@@ -98,23 +98,11 @@ export default class MaxStaminaTable implements IModel {
         namespaceName: string|null,
         maxStaminaTableName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (maxStaminaTableName == null || maxStaminaTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{maxStaminaTableName}', maxStaminaTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{maxStaminaTableName}', maxStaminaTableName ?? '');
     }
 
     public getMaxStaminaTableId(): string|null {

package/src/stamina/model/MaxStaminaTableMaster.ts

@@ -80,16 +80,16 @@ export default class MaxStaminaTableMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMaxStaminaTableName(grn) == null) {
+        if (this.getMaxStaminaTableName(grn) == null || this.getMaxStaminaTableName(grn) === '') {
             return false;
         }
         return true;
@@ -101,23 +101,11 @@ export default class MaxStaminaTableMaster implements IModel {
         namespaceName: string|null,
         maxStaminaTableName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (maxStaminaTableName == null || maxStaminaTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{maxStaminaTableName}', maxStaminaTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{maxStaminaTableName}', maxStaminaTableName ?? '');
     }
 
     public getMaxStaminaTableId(): string|null {

package/src/stamina/model/Namespace.ts

@@ -65,13 +65,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;
@@ -82,19 +82,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/stamina/model/RecoverIntervalTable.ts

@@ -77,16 +77,16 @@ export default class RecoverIntervalTable implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getRecoverIntervalTableName(grn) == null) {
+        if (this.getRecoverIntervalTableName(grn) == null || this.getRecoverIntervalTableName(grn) === '') {
             return false;
         }
         return true;
@@ -98,23 +98,11 @@ export default class RecoverIntervalTable implements IModel {
         namespaceName: string|null,
         recoverIntervalTableName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (recoverIntervalTableName == null || recoverIntervalTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{recoverIntervalTableName}', recoverIntervalTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{recoverIntervalTableName}', recoverIntervalTableName ?? '');
     }
 
     public getRecoverIntervalTableId(): string|null {

package/src/stamina/model/RecoverIntervalTableMaster.ts

@@ -80,16 +80,16 @@ export default class RecoverIntervalTableMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getRecoverIntervalTableName(grn) == null) {
+        if (this.getRecoverIntervalTableName(grn) == null || this.getRecoverIntervalTableName(grn) === '') {
             return false;
         }
         return true;
@@ -101,23 +101,11 @@ export default class RecoverIntervalTableMaster implements IModel {
         namespaceName: string|null,
         recoverIntervalTableName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (recoverIntervalTableName == null || recoverIntervalTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{recoverIntervalTableName}', recoverIntervalTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{recoverIntervalTableName}', recoverIntervalTableName ?? '');
     }
 
     public getRecoverIntervalTableId(): string|null {

package/src/stamina/model/RecoverValueTable.ts

@@ -77,16 +77,16 @@ export default class RecoverValueTable implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getRecoverValueTableName(grn) == null) {
+        if (this.getRecoverValueTableName(grn) == null || this.getRecoverValueTableName(grn) === '') {
             return false;
         }
         return true;
@@ -98,23 +98,11 @@ export default class RecoverValueTable implements IModel {
         namespaceName: string|null,
         recoverValueTableName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (recoverValueTableName == null || recoverValueTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{recoverValueTableName}', recoverValueTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{recoverValueTableName}', recoverValueTableName ?? '');
     }
 
     public getRecoverValueTableId(): string|null {

package/src/stamina/model/RecoverValueTableMaster.ts

@@ -80,16 +80,16 @@ export default class RecoverValueTableMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getRecoverValueTableName(grn) == null) {
+        if (this.getRecoverValueTableName(grn) == null || this.getRecoverValueTableName(grn) === '') {
             return false;
         }
         return true;
@@ -101,23 +101,11 @@ export default class RecoverValueTableMaster implements IModel {
         namespaceName: string|null,
         recoverValueTableName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (recoverValueTableName == null || recoverValueTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{recoverValueTableName}', recoverValueTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{recoverValueTableName}', recoverValueTableName ?? '');
     }
 
     public getRecoverValueTableId(): string|null {

package/src/stamina/model/Stamina.ts

@@ -102,19 +102,19 @@ export default class Stamina implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getStaminaName(grn) == null) {
+        if (this.getStaminaName(grn) == null || this.getStaminaName(grn) === '') {
             return false;
         }
         return true;
@@ -127,27 +127,12 @@ export default class Stamina implements IModel {
         userId: string|null,
         staminaName: 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 (staminaName == null || staminaName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{staminaName}', staminaName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{staminaName}', staminaName ?? '');
     }
 
     public getStaminaId(): string|null {

package/src/stamina/model/StaminaModel.ts

@@ -86,16 +86,16 @@ export default class StaminaModel implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getStaminaName(grn) == null) {
+        if (this.getStaminaName(grn) == null || this.getStaminaName(grn) === '') {
             return false;
         }
         return true;
@@ -107,23 +107,11 @@ export default class StaminaModel implements IModel {
         namespaceName: string|null,
         staminaName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (staminaName == null || staminaName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{staminaName}', staminaName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{staminaName}', staminaName ?? '');
     }
 
     public getStaminaModelId(): string|null {

package/src/stamina/model/StaminaModelMaster.ts

@@ -86,16 +86,16 @@ export default class StaminaModelMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getStaminaName(grn) == null) {
+        if (this.getStaminaName(grn) == null || this.getStaminaName(grn) === '') {
             return false;
         }
         return true;
@@ -107,23 +107,11 @@ export default class StaminaModelMaster implements IModel {
         namespaceName: string|null,
         staminaName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (staminaName == null || staminaName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{staminaName}', staminaName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{staminaName}', staminaName ?? '');
     }
 
     public getStaminaModelId(): string|null {