KON-13 KON-534 sonar work
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/ConflictException.java b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/ConflictException.java
index a0398b5..73c0a1f 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/ConflictException.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/ConflictException.java
@@ -19,11 +19,6 @@
@ResponseStatus(code = HttpStatus.CONFLICT)
public class ConflictException extends RuntimeException{
-
- public ConflictException() {
-
- }
-
public ConflictException(String message) {
super(message);
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/InternalServerErrorException.java b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/InternalServerErrorException.java
index 7e8101f..bda321d 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/InternalServerErrorException.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/InternalServerErrorException.java
@@ -19,10 +19,6 @@
@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
public class InternalServerErrorException extends RuntimeException{
-
- public InternalServerErrorException() {
- }
-
public InternalServerErrorException(String message) {
super(message);
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/OperationDeniedException.java b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/OperationDeniedException.java
index f4440ae..6ae1332 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/OperationDeniedException.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/OperationDeniedException.java
@@ -6,11 +6,6 @@
@ResponseStatus(code = HttpStatus.NOT_ACCEPTABLE)
public class OperationDeniedException extends RuntimeException{
-
- public OperationDeniedException() {
-
- }
-
public OperationDeniedException(OperationType operation, String message) {super(message);
}
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/UnauthorizedException.java b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/UnauthorizedException.java
index ab9864e..7c65132 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/exceptions/UnauthorizedException.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/exceptions/UnauthorizedException.java
@@ -5,11 +5,6 @@
@ResponseStatus(code = HttpStatus.UNAUTHORIZED)
public class UnauthorizedException extends RuntimeException{
-
- public UnauthorizedException() {
-
- }
-
public UnauthorizedException(String message) {
super(message);
}
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/controller/CommunicationTypeControllerTest.java b/src/test/java/org/eclipse/openk/contactbasedata/controller/CommunicationTypeControllerTest.java
index ebe1c07..ae2e2c5 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/controller/CommunicationTypeControllerTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/controller/CommunicationTypeControllerTest.java
@@ -15,6 +15,7 @@
package org.eclipse.openk.contactbasedata.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpStatus;
import org.eclipse.openk.contactbasedata.ContactBaseDataApplication;
import org.eclipse.openk.contactbasedata.service.CommunicationTypeService;
import org.eclipse.openk.contactbasedata.support.MockDataHelper;
@@ -28,10 +29,12 @@
import org.springframework.http.MediaType;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.web.servlet.MockMvc;
+
import java.util.List;
import java.util.UUID;
+
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -115,9 +118,21 @@
@Test
public void shouldDeleteCommunicationType() throws Exception {
- mockMvc.perform(delete("/communication-types/05ff2344-20a5-11ea-978f-2e728ce88125")
+ UUID uuid = UUID.fromString("05ff2344-20a5-11ea-978f-2e728ce88125");
+ doNothing().when(communicationTypeService).removeCommunicationType(isA(UUID.class));
+ mockMvc.perform(delete("/communication-types/"+uuid.toString())
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().is2xxSuccessful());
+ verify(communicationTypeService, times( 1 )).removeCommunicationType(uuid);
+ }
+
+ @Test
+ public void shouldFailWithDeleteCommunicationType() throws Exception {
+ UUID uuid = UUID.fromString("05ff2344-20a5-11ea-978f-2e728ce88125");
+ doThrow(new RuntimeException("Base Exception")).when(communicationTypeService).removeCommunicationType(isA(UUID.class));
+ mockMvc.perform(delete("/communication-types/"+uuid.toString())
+ .contentType(MediaType.APPLICATION_JSON))
+ .andExpect(status().is(HttpStatus.SC_CONFLICT));
}
}
\ No newline at end of file
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/service/CompanyServiceTest.java b/src/test/java/org/eclipse/openk/contactbasedata/service/CompanyServiceTest.java
index d834488..a928ea2 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/service/CompanyServiceTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/service/CompanyServiceTest.java
@@ -148,10 +148,14 @@
public void findContactPersonsToCompanyWithSuccess() {
TblCompany company = MockDataHelper.mockCompany();
company.setContactPersons( MockDataHelper.mockTblContactPersons());
+ company.getContactPersons().get(1).getContact().setAnonymized(true);
when(companyRepository.findByTblContactUuid(any(UUID.class))).thenReturn(Optional.of(company));
- List<ContactPersonDto> cpDtos = companyService.findContactPersonsToCompany(UUID.randomUUID(), false);
+ List<ContactPersonDto> cpDtos = companyService.findContactPersonsToCompany(UUID.randomUUID(), true);
assertEquals(company.getContactPersons().size(), cpDtos.size());
assertEquals(company.getContactPersons().get(1).getContact().getUuid(), cpDtos.get(1).getContactUuid());
+
+ List<ContactPersonDto> cpDtos2 = companyService.findContactPersonsToCompany(UUID.randomUUID(), false);
+ assertNotEquals(cpDtos.size(), cpDtos2.size());
}
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/service/ExternalPersonServiceTest.java b/src/test/java/org/eclipse/openk/contactbasedata/service/ExternalPersonServiceTest.java
index 3dd2d0e..0bfe889 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/service/ExternalPersonServiceTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/service/ExternalPersonServiceTest.java
@@ -32,6 +32,8 @@
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.test.context.ContextConfiguration;
import java.util.Optional;
@@ -39,7 +41,7 @@
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
@DataJpaTest
@ContextConfiguration(classes = {TestConfiguration.class})
@@ -71,6 +73,24 @@
}
@Test
+ public void shouldFindSeveralExternalPersonsProperly() {
+ Page<TblExternalPerson> page1 = MockDataHelper.mockExternalPersonPage();
+ Page<TblExternalPerson> page2 = MockDataHelper.mockExternalPersonPage();
+ when(externalPersonRepository.findAll(any(Pageable.class))).thenReturn(page1);
+ when(externalPersonRepository.findByContact_anonymizedFalseOrContact_anonymizedIsNull(any(Pageable.class))).thenReturn(page2);
+ Page<ExternalPersonDto> dtos1 = externalPersonService.findExternalPersons(true, Pageable.unpaged());
+ Page<ExternalPersonDto> dtos2 = externalPersonService.findExternalPersons(false, Pageable.unpaged());
+
+ assertEquals(page1.getContent().get(0).getContact().getUuid(), dtos1.get().findFirst().get().getContactUuid());
+ assertEquals(page2.getContent().get(1).getContact().getUuid(), dtos2.getContent().get(1).getContactUuid());
+ assertNotEquals(dtos1.getContent().get(0).getContactUuid(), dtos2.getContent().get(0).getContactUuid());
+
+ verify(externalPersonRepository, times(1)).findAll(any(Pageable.class));
+ verify(externalPersonRepository, times(1))
+ .findByContact_anonymizedFalseOrContact_anonymizedIsNull(any(Pageable.class));
+ }
+
+ @Test
public void shouldThrowInErrorCaseWithExternalPerson() {
TblExternalPerson ep = MockDataHelper.mockExternalPerson();
when(externalPersonRepository.findByTblContactUuid(any(UUID.class))).thenReturn(Optional.empty());
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/support/MockDataHelper.java b/src/test/java/org/eclipse/openk/contactbasedata/support/MockDataHelper.java
index e451828..f4e1808 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/support/MockDataHelper.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/support/MockDataHelper.java
@@ -87,6 +87,15 @@
return epd;
}
+ public static Page<TblExternalPerson> mockExternalPersonPage() {
+ TblExternalPerson ep1 = mockExternalPerson();
+ TblExternalPerson ep2 = mockExternalPerson();
+ ep2.setFirstName("Strofanov");
+ ep2.getContact().setUuid(UUID.randomUUID());
+ List<TblExternalPerson> list = Arrays.asList(ep1, ep2);
+ return new PageImpl<>(list, Pageable.unpaged(), list.size());
+ }
+
public static Page<ExternalPersonDto> mockExternalPersonDtoPage() {
ExternalPersonDto ep1 = mockExternalPersonDto();
ExternalPersonDto ep2 = mockExternalPersonDto();
