a50808c9a385d75daaeae79168b37c15194b2617
Files Diff
- Added: 4
- Removed: 6
- Renamed: 0
- Modified: 35
Refactorings reported:
| Refactoring Name | Occurences | ||
|---|---|---|---|
| Rename Method | 10 | ||
| Rename Method public empty_result() : void renamed to public empty_result_with_views() : void in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Rename Method public setProject(project String) : DefaultTemplates renamed to public setProjectUuid(projectUuid String) : DefaultTemplates in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Rename Method public fail_if_uuid_is_not_provided() : void renamed to public fail_if_both_uuid_and_name_are_provided_without_views() : void in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Rename Method public fail_if_not_admin() : void renamed to public fail_if_uuid_is_not_known_without_views() : void in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Rename Method public getProject() : String renamed to public getViewUuid() : String in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Rename Method public fail_if_uuid_is_not_known() : void renamed to public fail_if_both_uuid_and_name_are_provided_with_views() : void in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Rename Method public setView(view String) : DefaultTemplates renamed to public setViewUuid(viewUuid String) : DefaultTemplates in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Rename Method public getView() : String renamed to public getProjectUuid() : String in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Rename Method public fail_if_not_logged_in() : void renamed to public fail_if_uuid_is_not_known_with_views() : void in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Rename Method private newRequest(id String) : TestResponse renamed to private newRequestByUuid(actionTester WsActionTester, id String) : TestResponse in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Change Parameter Type | 5 | ||
| Change Parameter Type organizationUuid : String to organization : OrganizationDto in method private checkWouldUserHavePermission(organization OrganizationDto, userId Long, permission String, expectedResult boolean) : void in class org.sonar.server.permission.PermissionTemplateServiceTest | From | To | |
| Change Parameter Type defaultTemplates : List<TemplateUuidQualifier> to defaultTemplates : ResolvedDefaultTemplates in method public defaultTemplates(defaultTemplates ResolvedDefaultTemplates) : Builder in class org.sonar.server.permission.ws.template.SearchTemplatesData.Builder | From | To | |
| Change Parameter Type defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in method public SearchTemplatesDataLoader(dbClient DbClient, defaultTemplatesResolver DefaultTemplatesResolver) in class org.sonar.server.permission.ws.template.SearchTemplatesDataLoader | From | To | |
| Change Parameter Type defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in method public DeleteTemplateAction(dbClient DbClient, userSession UserSession, support PermissionWsSupport, defaultTemplatesResolver DefaultTemplatesResolver) in class org.sonar.server.permission.ws.template.DeleteTemplateAction | From | To | |
| Change Parameter Type userId : long to userDto : UserDto in method private selectProjectPermissionsOfUser(userDto UserDto, project ComponentDto) : List<String> in class org.sonar.server.permission.PermissionTemplateServiceTest | From | To | |
| Rename Variable | 4 | ||
| Rename Variable orgUuid : String to defaultOrganizationUuid : String in method public start() : void in class org.sonar.server.startup.RegisterPermissionTemplates | From | To | |
| Rename Variable defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolverWithViews : DefaultTemplatesResolver in method protected buildWsAction() : SearchTemplatesAction in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Rename Variable template : PermissionTemplateDto to permissionTemplate : PermissionTemplateDto in method public apply_permission_template() : void in class org.sonar.server.permission.PermissionTemplateServiceTest | From | To | |
| Rename Variable dataLoader : SearchTemplatesDataLoader to dataLoaderWithViews : SearchTemplatesDataLoader in method protected buildWsAction() : SearchTemplatesAction in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Inline Method | 9 | ||
| Inline Method private insertDefaultTemplate() : PermissionTemplateDto inlined to public start() : void in class org.sonar.server.startup.RegisterPermissionTemplates | From | To | |
| Inline Method private insertProjectTemplateOnDefaultOrganization() : PermissionTemplateDto inlined to public search_in_organization() : void in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Inline Method private insertProjectTemplateOnDefaultOrganization() : PermissionTemplateDto inlined to public search_project_permissions() : void in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Inline Method private insertDeveloperTemplate() : PermissionTemplateDto inlined to public search_project_permissions() : void in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Inline Method private insertProjectTemplateOnDefaultOrganization() : PermissionTemplateDto inlined to public search_by_name_in_default_organization() : void in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Change Return Type | 1 | ||
| Change Return Type List<TemplateUuidQualifier> to ResolvedDefaultTemplates in method public defaultTemplates() : ResolvedDefaultTemplates in class org.sonar.server.permission.ws.template.SearchTemplatesData | From | To | |
| Move Attribute | 3 | ||
| Move Attribute private view : String from class org.sonar.db.organization.DefaultTemplates to private view : String from class org.sonar.server.permission.ws.template.DefaultTemplatesResolver.ResolvedDefaultTemplates | From | To | |
| Move Attribute private project : String from class org.sonar.db.organization.DefaultTemplates to private project : String from class org.sonar.server.permission.ws.template.DefaultTemplatesResolver.ResolvedDefaultTemplates | From | To | |
| Move Attribute private resourceTypes : ResourceTypesRule from class org.sonar.server.permission.ws.template.SearchTemplatesActionTest to private resourceTypes : ResourceTypesRule from class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Rename Class | 1 | ||
| Rename Class org.sonar.server.permission.ws.template.DefaultPermissionTemplateFinder renamed to org.sonar.server.permission.ws.template.DefaultTemplatesResolver | From | To | |
| Rename Attribute | 5 | ||
| Rename Attribute defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in class org.sonar.server.permission.ws.template.SearchTemplatesDataLoader | From | To | |
| Rename Attribute project : String to projectUuid : String in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Rename Attribute defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in class org.sonar.server.permission.ws.template.DeleteTemplateAction | From | To | |
| Rename Attribute settings : Settings to defaultTemplatesResolver : DefaultTemplatesResolver in class org.sonar.server.permission.PermissionTemplateService | From | To | |
| Rename Attribute view : String to viewUuid : String in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Change Variable Type | 1 | ||
| Change Variable Type defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolverWithViews : DefaultTemplatesResolver in method protected buildWsAction() : SearchTemplatesAction in class org.sonar.server.permission.ws.template.SearchTemplatesActionTest | From | To | |
| Extract Method | 4 | ||
| Extract Method private checkProjectNotNull(project String) : void extracted from public setProject(project String) : DefaultTemplates in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Extract Method private assertTemplateDoesNotExist(template PermissionTemplateDto) : void extracted from public delete_template_by_name_case_insensitive() : void in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Extract Method protected addTemplate(organizationDto OrganizationDto) : PermissionTemplateDto extracted from protected addTemplateToDefaultOrganization() : PermissionTemplateDto in class org.sonar.server.permission.ws.BasePermissionWsTest | From | To | |
| Extract Method private assertTemplateDoesNotExist(template PermissionTemplateDto) : void extracted from public delete_template_in_db() : void in class org.sonar.server.permission.ws.template.DeleteTemplateActionTest | From | To | |
| Change Attribute Type | 5 | ||
| Change Attribute Type defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in class org.sonar.server.permission.ws.template.SearchTemplatesDataLoader | From | To | |
| Change Attribute Type defaultTemplates : List<TemplateUuidQualifier> to defaultTemplates : ResolvedDefaultTemplates in class org.sonar.server.permission.ws.template.SearchTemplatesData | From | To | |
| Change Attribute Type defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in class org.sonar.server.permission.ws.template.DeleteTemplateAction | From | To | |
| Change Attribute Type settings : Settings to defaultTemplatesResolver : DefaultTemplatesResolver in class org.sonar.server.permission.PermissionTemplateService | From | To | |
| Change Attribute Type defaultTemplates : List<TemplateUuidQualifier> to defaultTemplates : ResolvedDefaultTemplates in class org.sonar.server.permission.ws.template.SearchTemplatesData.Builder | From | To | |
| Rename Parameter | 6 | ||
| Rename Parameter userId : long to userDto : UserDto in method private selectProjectPermissionsOfUser(userDto UserDto, project ComponentDto) : List<String> in class org.sonar.server.permission.PermissionTemplateServiceTest | From | To | |
| Rename Parameter defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in method public DeleteTemplateAction(dbClient DbClient, userSession UserSession, support PermissionWsSupport, defaultTemplatesResolver DefaultTemplatesResolver) in class org.sonar.server.permission.ws.template.DeleteTemplateAction | From | To | |
| Rename Parameter defaultPermissionTemplateFinder : DefaultPermissionTemplateFinder to defaultTemplatesResolver : DefaultTemplatesResolver in method public SearchTemplatesDataLoader(dbClient DbClient, defaultTemplatesResolver DefaultTemplatesResolver) in class org.sonar.server.permission.ws.template.SearchTemplatesDataLoader | From | To | |
| Rename Parameter view : String to viewUuid : String in method public setViewUuid(viewUuid String) : DefaultTemplates in class org.sonar.db.organization.DefaultTemplates | From | To | |
| Rename Parameter organizationUuid : String to organization : OrganizationDto in method private checkWouldUserHavePermission(organization OrganizationDto, userId Long, permission String, expectedResult boolean) : void in class org.sonar.server.permission.PermissionTemplateServiceTest | From | To | |
| Rename Parameter project : String to projectUuid : String in method public setProjectUuid(projectUuid String) : DefaultTemplates in class org.sonar.db.organization.DefaultTemplates | From | To |