From 95849469f45739ff10a5782c221cb8a0274cef3b Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 13 Oct 2016 12:05:07 +0200 Subject: [PATCH] Reverting returning ComponentDto in insert --- .../component/ComponentCleanerServiceTest.java | 12 ++++++++---- .../java/org/sonar/db/component/ComponentDao.java | 3 +-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java index cb512d5e502..ea9676adf31 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java @@ -149,8 +149,10 @@ public class ComponentCleanerServiceTest { @Test public void fail_to_delete_not_project_scope() throws Exception { mockResourceTypeAsValidProject(); - ComponentDto project = dbClient.componentDao().insert(dbSession, newProjectDto()); - ComponentDto file = dbClient.componentDao().insert(dbSession, newFileDto(project, null)); + ComponentDto project = newProjectDto(); + dbClient.componentDao().insert(dbSession, project); + ComponentDto file = newFileDto(project, null); + dbClient.componentDao().insert(dbSession, file); dbSession.commit(); expectedException.expect(IllegalArgumentException.class); @@ -162,7 +164,8 @@ public class ComponentCleanerServiceTest { ResourceType resourceType = mock(ResourceType.class); when(resourceType.getBooleanProperty("deletable")).thenReturn(false); when(mockResourceTypes.get(anyString())).thenReturn(resourceType); - ComponentDto project = dbClient.componentDao().insert(dbSession, newProjectDto()); + ComponentDto project = newProjectDto(); + dbClient.componentDao().insert(dbSession, project); dbSession.commit(); expectedException.expect(IllegalArgumentException.class); @@ -172,7 +175,8 @@ public class ComponentCleanerServiceTest { @Test public void fail_to_delete_null_resource_type() throws Exception { when(mockResourceTypes.get(anyString())).thenReturn(null); - ComponentDto project = dbClient.componentDao().insert(dbSession, newProjectDto()); + ComponentDto project = newProjectDto(); + dbClient.componentDao().insert(dbSession, project); dbSession.commit(); expectedException.expect(IllegalArgumentException.class); diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java index 09dc1e9d0f4..fd5fe9dc652 100644 --- a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java +++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java @@ -328,9 +328,8 @@ public class ComponentDao implements Dao { parameters.put("qualifier", Qualifiers.PROJECT); } - public ComponentDto insert(DbSession session, ComponentDto item) { + public void insert(DbSession session, ComponentDto item) { mapper(session).insert(item); - return item; } public void insertBatch(DbSession session, ComponentDto item) { -- 2.39.5