Issue-3234: Rename default in role_entity to defaultRole

bootstrap/sql/mysql/v004__create_db_connection_info.sql

@@ -53,6 +53,6 @@ SET json = JSON_SET(json, '$.default', TRUE)
 WHERE name = 'DataConsumer';
 
 ALTER TABLE role_entity
-ADD COLUMN `default` BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.default')),
-ADD INDEX(`default`);
+ADD COLUMN defaultRole BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.defaultRole')),
+ADD INDEX(defaultRole);
 

catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/CollectionDAO.java

@@ -1100,10 +1100,10 @@ default String getNameColumn() {
       return "name";
     }
 
-    @SqlQuery("SELECT id FROM role_entity WHERE `default` = TRUE")
+    @SqlQuery("SELECT id FROM role_entity WHERE `defaultRole` = TRUE")
     List<String> getDefaultRolesIds();
 
-    @SqlQuery("SELECT json FROM role_entity WHERE `default` = TRUE")
+    @SqlQuery("SELECT json FROM role_entity WHERE `defaultRole` = TRUE")
     List<String> getDefaultRoles();
 
     @Override

catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/RoleRepository.java

@@ -330,19 +330,19 @@ public void entitySpecificUpdate() throws IOException, ParseException {
 
     private void updateDefault(Role origRole, Role updatedRole) throws IOException, ParseException {
       long startTime = System.nanoTime();
-      if (Boolean.FALSE.equals(origRole.getDefault()) && Boolean.TRUE.equals(updatedRole.getDefault())) {
+      if (Boolean.FALSE.equals(origRole.getDefaultRole()) && Boolean.TRUE.equals(updatedRole.getDefaultRole())) {
         setDefaultToTrue(updatedRole);
       }
-      if (Boolean.TRUE.equals(origRole.getDefault()) && Boolean.FALSE.equals(updatedRole.getDefault())) {
+      if (Boolean.TRUE.equals(origRole.getDefaultRole()) && Boolean.FALSE.equals(updatedRole.getDefaultRole())) {
         setDefaultToFalse(updatedRole);
       }
-      recordChange("default", origRole.getDefault(), updatedRole.getDefault());
+      recordChange("default", origRole.getDefaultRole(), updatedRole.getDefaultRole());
       LOG.debug(
           "Took {} ns to update {} role field default from {} to {}",
           System.nanoTime() - startTime,
           updatedRole.getName(),
-          origRole.getDefault(),
-          updatedRole.getDefault());
+          origRole.getDefaultRole(),
+          updatedRole.getDefaultRole());
     }
 
     private void setDefaultToTrue(Role role) throws IOException, ParseException {
@@ -356,7 +356,7 @@ private void setDefaultToTrue(Role role) throws IOException, ParseException {
         }
         Role origDefaultRole = roleRepository.get(null, defaultRole.getId().toString(), ROLE_PATCH_FIELDS);
         Role updatedDefaultRole = roleRepository.get(null, defaultRole.getId().toString(), ROLE_PATCH_FIELDS);
-        updatedDefaultRole = updatedDefaultRole.withDefault(false);
+        updatedDefaultRole = updatedDefaultRole.withDefaultRole(false);
         new RoleUpdater(origDefaultRole, updatedDefaultRole, Operation.PATCH).update();
       }
       List<User> users = getAllUsers();

catalog-rest-service/src/main/resources/json/data/role/DataConsumer.json

@@ -3,5 +3,5 @@
   "displayName": "Data Consumer",
   "description": "Users with Data Consumer role use different data assets for their day to day work.",
   "deleted": false,
-  "default": true
+  "defaultRole": true
 }

catalog-rest-service/src/main/resources/json/schema/entity/teams/role.json

@@ -60,8 +60,8 @@
       "description": "Users that have this role assigned.",
       "$ref": "../../type/entityReference.json#/definitions/entityReferenceList"
     },
-    "default": {
-      "description": "If `true`, this role is set as default and will be assigned to all users.",
+    "defaultRole": {
+      "description": "If `true`, this role is set as default role and will be assigned to all users.",
       "type": "boolean",
       "default": false
     },

catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/RoleResourceTest.java

@@ -125,7 +125,7 @@ public Role createRolesAndSetDefault(TestInfo test, @Positive int numberOfRoles,
             RoleResource.FIELDS,
             ADMIN_AUTH_HEADERS);
     String originalJson = JsonUtils.pojoToJson(role);
-    role.setDefault(true);
+    role.setDefaultRole(true);
     ChangeDescription change = getChangeDescription(role.getVersion());
     change.getFieldsUpdated().add(new FieldChange().withName("default").withOldValue(false).withNewValue(true));
     return patchEntityAndCheck(role, originalJson, ADMIN_AUTH_HEADERS, MINOR_UPDATE, change);

catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/UserResourceTest.java

@@ -107,9 +107,13 @@ void userDefaultRoleAssignment(TestInfo test) throws IOException {
     // Given a global default role has been set, ...
     RoleResourceTest roleResourceTest = new RoleResourceTest();
     List<Role> roles = roleResourceTest.listEntities(Collections.emptyMap(), ADMIN_AUTH_HEADERS).getData();
-    UUID nonDefaultRoleId = roles.stream().filter(role -> !role.getDefault()).findAny().orElseThrow().getId();
+    UUID nonDefaultRoleId = roles.stream().filter(role -> !role.getDefaultRole()).findAny().orElseThrow().getId();
     UUID defaultRoleId =
-        roles.stream().filter(Role::getDefault).findAny().orElseThrow().getId(); // DataConsumer is global default role.
+        roles.stream()
+            .filter(Role::getDefaultRole)
+            .findAny()
+            .orElseThrow()
+            .getId(); // DataConsumer is global default role.
 
     // ... when a user is created without any roles, then the global default role should be assigned.
     CreateUser create = createRequest(test, 1);
@@ -128,7 +132,7 @@ void userDefaultRoleAssignment(TestInfo test) throws IOException {
     UUID prevDefaultRoleId = defaultRoleId;
     Role defaultRole = roleResourceTest.createEntity(roleResourceTest.createRequest(test, 1000), ADMIN_AUTH_HEADERS);
     String defaultRoleJson = JsonUtils.pojoToJson(defaultRole);
-    defaultRole.setDefault(true);
+    defaultRole.setDefaultRole(true);
     defaultRoleId = defaultRole.getId(); // New global default role.
     assertNotEquals(prevDefaultRoleId, defaultRoleId);
     roleResourceTest.patchEntity(defaultRoleId, defaultRoleJson, defaultRole, ADMIN_AUTH_HEADERS);
@@ -305,7 +309,7 @@ void post_validUserWithRoles_200_ok(TestInfo test) throws IOException {
     Role role2 = roleResourceTest.createEntity(roleResourceTest.createRequest(test, 2), ADMIN_AUTH_HEADERS);
     UUID defaultRoleId =
         roleResourceTest.listEntities(Collections.emptyMap(), ADMIN_AUTH_HEADERS).getData().stream()
-            .filter(Role::getDefault)
+            .filter(Role::getDefaultRole)
             .findAny()
             .orElseThrow()
             .getId(); // DataConsumer is default role.
@@ -460,7 +464,7 @@ void patch_userAttributes_as_admin_200_ok(TestInfo test) throws IOException {
     RoleResourceTest roleResourceTest = new RoleResourceTest();
     List<Role> roles = roleResourceTest.listEntities(Collections.emptyMap(), ADMIN_AUTH_HEADERS).getData();
     UUID defaultRoleId =
-        roles.stream().filter(Role::getDefault).findAny().orElseThrow().getId(); // DataConsumer is default role.
+        roles.stream().filter(Role::getDefaultRole).findAny().orElseThrow().getId(); // DataConsumer is default role.
     EntityReference defaultRoleRef =
         new RoleEntityInterface(roleResourceTest.getEntity(defaultRoleId, RoleResource.FIELDS, ADMIN_AUTH_HEADERS))
             .getEntityReference();