gs2 1.0.4 → 1.0.5

package/src/formation/model/MoldModelMaster.ts

@@ -102,23 +102,11 @@ export default class MoldModelMaster 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 {

package/src/formation/model/Namespace.ts

@@ -83,19 +83,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/friend/model/BlackList.ts

@@ -98,23 +98,11 @@ export default class BlackList 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 getBlackListId(): string|null {

package/src/friend/model/Follow.ts

@@ -98,23 +98,11 @@ export default class Follow 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 getFollowId(): string|null {

package/src/friend/model/Friend.ts

@@ -98,23 +98,11 @@ export default class Friend 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 getFriendId(): string|null {

package/src/friend/model/Inbox.ts

@@ -98,23 +98,11 @@ export default class Inbox 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 getInboxId(): string|null {

package/src/friend/model/Namespace.ts

@@ -93,19 +93,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/friend/model/Profile.ts

@@ -100,23 +100,11 @@ export default class Profile 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 getProfileId(): string|null {

package/src/friend/model/SendBox.ts

@@ -98,23 +98,11 @@ export default class SendBox 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 getSendBoxId(): string|null {

package/src/gateway/model/FirebaseToken.ts

@@ -98,23 +98,11 @@ export default class FirebaseToken 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 getFirebaseTokenId(): string|null {

package/src/gateway/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/gateway/model/WebSocketSession.ts

@@ -121,27 +121,12 @@ export default class WebSocketSession implements IModel {
         userId: string|null,
         connectionId: 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 (connectionId == null || connectionId === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{connectionId}', connectionId!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{connectionId}', connectionId ?? '');
     }
 
     public getWebSocketSessionId(): string|null {

package/src/identifier/model/AttachSecurityPolicy.ts

@@ -58,15 +58,9 @@ export default class AttachSecurityPolicy 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/Password.ts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 {