gs2 1.0.4 → 1.3.0

package/src/identifier/model/Password.ts

@@ -45,10 +45,10 @@ export default class Password implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getUserName(grn) == null) {
+        if (this.getUserName(grn) == null || this.getUserName(grn) === '') {
             return false;
         }
         return true;
@@ -58,15 +58,9 @@ export default class Password implements IModel {
         ownerId: string|null,
         userName: string|null,
     ): string|null {
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (userName == null || userName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{ownerId}', ownerId!)
-            .replace('{userName}', userName!);
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{userName}', userName ?? '');
     }
 
     public getUserId(): string|null {

package/src/identifier/model/SecurityPolicy.ts

@@ -48,10 +48,10 @@ export default class SecurityPolicy implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getSecurityPolicyName(grn) == null) {
+        if (this.getSecurityPolicyName(grn) == null || this.getSecurityPolicyName(grn) === '') {
             return false;
         }
         return true;
@@ -61,15 +61,9 @@ export default class SecurityPolicy implements IModel {
         ownerId: string|null,
         securityPolicyName: string|null,
     ): string|null {
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (securityPolicyName == null || securityPolicyName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{ownerId}', ownerId!)
-            .replace('{securityPolicyName}', securityPolicyName!);
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{securityPolicyName}', securityPolicyName ?? '');
     }
 
     public getSecurityPolicyId(): string|null {

package/src/identifier/model/User.ts

@@ -47,10 +47,10 @@ export default class User implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getUserName(grn) == null) {
+        if (this.getUserName(grn) == null || this.getUserName(grn) === '') {
             return false;
         }
         return true;
@@ -60,15 +60,9 @@ export default class User implements IModel {
         ownerId: string|null,
         userName: string|null,
     ): string|null {
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (userName == null || userName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{ownerId}', ownerId!)
-            .replace('{userName}', userName!);
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{userName}', userName ?? '');
     }
 
     public getUserId(): string|null {

package/src/inbox/model/CurrentMessageMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentMessageMaster 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 CurrentMessageMaster 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/inbox/model/GlobalMessage.ts

@@ -80,16 +80,16 @@ export default class GlobalMessage 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.getGlobalMessageName(grn) == null) {
+        if (this.getGlobalMessageName(grn) == null || this.getGlobalMessageName(grn) === '') {
             return false;
         }
         return true;
@@ -101,23 +101,11 @@ export default class GlobalMessage implements IModel {
         namespaceName: string|null,
         globalMessageName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (globalMessageName == null || globalMessageName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{globalMessageName}', globalMessageName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{globalMessageName}', globalMessageName ?? '');
     }
 
     public getGlobalMessageId(): string|null {

package/src/inbox/model/GlobalMessageMaster.ts

@@ -81,16 +81,16 @@ export default class GlobalMessageMaster 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.getGlobalMessageName(grn) == null) {
+        if (this.getGlobalMessageName(grn) == null || this.getGlobalMessageName(grn) === '') {
             return false;
         }
         return true;
@@ -102,23 +102,11 @@ export default class GlobalMessageMaster implements IModel {
         namespaceName: string|null,
         globalMessageName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (globalMessageName == null || globalMessageName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{globalMessageName}', globalMessageName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{globalMessageName}', globalMessageName ?? '');
     }
 
     public getGlobalMessageId(): string|null {

package/src/inbox/model/Message.ts

@@ -100,19 +100,19 @@ export default class Message 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.getMessageName(grn) == null) {
+        if (this.getMessageName(grn) == null || this.getMessageName(grn) === '') {
             return false;
         }
         return true;
@@ -125,27 +125,12 @@ export default class Message implements IModel {
         userId: string|null,
         messageName: 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 (messageName == null || messageName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{messageName}', messageName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{messageName}', messageName ?? '');
     }
 
     public getMessageId(): string|null {

package/src/inbox/model/Namespace.ts

@@ -72,13 +72,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;
@@ -89,19 +89,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/inbox/model/Received.ts

@@ -77,16 +77,16 @@ export default class Received 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;
         }
         return true;
@@ -98,23 +98,11 @@ export default class Received implements IModel {
         namespaceName: string|null,
         userId: 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;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '');
     }
 
     public getReceivedId(): string|null {

package/src/inventory/model/CurrentItemModelMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentItemModelMaster 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 CurrentItemModelMaster 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/inventory/model/Inventory.ts

@@ -97,19 +97,19 @@ export default class Inventory 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.getInventoryName(grn) == null) {
+        if (this.getInventoryName(grn) == null || this.getInventoryName(grn) === '') {
             return false;
         }
         return true;
@@ -122,27 +122,12 @@ export default class Inventory implements IModel {
         userId: string|null,
         inventoryName: 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 (inventoryName == null || inventoryName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{inventoryName}', inventoryName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{inventoryName}', inventoryName ?? '');
     }
 
     public getInventoryId(): string|null {

package/src/inventory/model/InventoryModel.ts

@@ -78,16 +78,16 @@ export default class InventoryModel 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.getInventoryName(grn) == null) {
+        if (this.getInventoryName(grn) == null || this.getInventoryName(grn) === '') {
             return false;
         }
         return true;
@@ -99,23 +99,11 @@ export default class InventoryModel implements IModel {
         namespaceName: string|null,
         inventoryName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (inventoryName == null || inventoryName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{inventoryName}', inventoryName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{inventoryName}', inventoryName ?? '');
     }
 
     public getInventoryModelId(): string|null {

package/src/inventory/model/InventoryModelMaster.ts

@@ -81,16 +81,16 @@ export default class InventoryModelMaster 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.getInventoryName(grn) == null) {
+        if (this.getInventoryName(grn) == null || this.getInventoryName(grn) === '') {
             return false;
         }
         return true;
@@ -102,23 +102,11 @@ export default class InventoryModelMaster implements IModel {
         namespaceName: string|null,
         inventoryName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (inventoryName == null || inventoryName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{inventoryName}', inventoryName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{inventoryName}', inventoryName ?? '');
     }
 
     public getInventoryModelId(): string|null {

package/src/inventory/model/ItemModel.ts

@@ -96,19 +96,19 @@ export default class ItemModel 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.getInventoryName(grn) == null) {
+        if (this.getInventoryName(grn) == null || this.getInventoryName(grn) === '') {
             return false;
         }
-        if (this.getItemName(grn) == null) {
+        if (this.getItemName(grn) == null || this.getItemName(grn) === '') {
             return false;
         }
         return true;
@@ -121,27 +121,12 @@ export default class ItemModel implements IModel {
         inventoryName: string|null,
         itemName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (inventoryName == null || inventoryName === '') {
-            return null;
-        }
-        if (itemName == null || itemName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{inventoryName}', inventoryName!)
-            .replace('{itemName}', itemName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{inventoryName}', inventoryName ?? '')
+            .replace('{itemName}', itemName ?? '');
     }
 
     public getItemModelId(): string|null {