KON-24
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactPersonController.java b/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactPersonController.java
index 842902f..1ace3df 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactPersonController.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/controller/ContactPersonController.java
@@ -19,24 +19,16 @@
import io.swagger.annotations.ApiResponses;
import lombok.extern.log4j.Log4j2;
import org.eclipse.openk.contactbasedata.exceptions.BadRequestException;
-import org.eclipse.openk.contactbasedata.service.CompanyService;
import org.eclipse.openk.contactbasedata.service.ContactPersonService;
-import org.eclipse.openk.contactbasedata.viewmodel.CompanyDto;
import org.eclipse.openk.contactbasedata.viewmodel.ContactPersonDto;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
import java.net.URI;
-import java.util.List;
import java.util.UUID;
@Log4j2
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/model/TblContactPerson.java b/src/main/java/org/eclipse/openk/contactbasedata/model/TblContactPerson.java
index 9bcdf66..3529629 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/model/TblContactPerson.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/model/TblContactPerson.java
@@ -15,7 +15,6 @@
package org.eclipse.openk.contactbasedata.model;
import lombok.Data;
-
import javax.persistence.*;
@Data
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/repository/ContactPersonRepository.java b/src/main/java/org/eclipse/openk/contactbasedata/repository/ContactPersonRepository.java
index c8c3eae..cdb48e6 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/repository/ContactPersonRepository.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/repository/ContactPersonRepository.java
@@ -15,12 +15,8 @@
package org.eclipse.openk.contactbasedata.repository;
import org.eclipse.openk.contactbasedata.model.TblContactPerson;
-import org.eclipse.openk.contactbasedata.model.TblInternalPerson;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
import java.util.Optional;
import java.util.UUID;
@@ -30,6 +26,4 @@
@Query("select cp from TblContactPerson cp where cp.contact.uuid = ?1")
Optional< TblContactPerson > findByTblContactUuid(final UUID contactUuid);
-
-
}
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/service/ContactPersonService.java b/src/main/java/org/eclipse/openk/contactbasedata/service/ContactPersonService.java
index 2f51693..f1b2521 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/service/ContactPersonService.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/service/ContactPersonService.java
@@ -19,16 +19,11 @@
import org.eclipse.openk.contactbasedata.exceptions.NotFoundException;
import org.eclipse.openk.contactbasedata.mapper.ContactMapper;
import org.eclipse.openk.contactbasedata.mapper.ContactPersonMapper;
-import org.eclipse.openk.contactbasedata.mapper.ExternalPersonMapper;
import org.eclipse.openk.contactbasedata.model.TblContact;
import org.eclipse.openk.contactbasedata.model.TblContactPerson;
-import org.eclipse.openk.contactbasedata.model.TblExternalPerson;
import org.eclipse.openk.contactbasedata.repository.*;
import org.eclipse.openk.contactbasedata.viewmodel.ContactPersonDto;
-import org.eclipse.openk.contactbasedata.viewmodel.ExternalPersonDto;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -64,11 +59,9 @@
TblContactPerson tblContactPerson = contactPersonRepository
.findByTblContactUuid(contactPersonUuid)
.orElseThrow(() -> new NotFoundException("contact.uuid.not.existing"));
-
return contactPersonMapper.toContactPersonDto(tblContactPerson);
}
-
@Transactional
public ContactPersonDto insertContactPerson(ContactPersonDto contactPersonDto) {
TblContact contactToSave = new TblContact();
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/controller/ContactPersonControllerTest.java b/src/test/java/org/eclipse/openk/contactbasedata/controller/ContactPersonControllerTest.java
index d7c35cf..6a78eb7 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/controller/ContactPersonControllerTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/controller/ContactPersonControllerTest.java
@@ -17,23 +17,17 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.eclipse.openk.contactbasedata.ContactBaseDataApplication;
import org.eclipse.openk.contactbasedata.service.ContactPersonService;
-import org.eclipse.openk.contactbasedata.service.ExternalPersonService;
import org.eclipse.openk.contactbasedata.support.MockDataHelper;
import org.eclipse.openk.contactbasedata.viewmodel.ContactPersonDto;
-import org.eclipse.openk.contactbasedata.viewmodel.ExternalPersonDto;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.web.servlet.MockMvc;
-
import java.util.UUID;
-
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.mockito.ArgumentMatchers.any;
@@ -66,19 +60,6 @@
.andExpect(jsonPath("firstName", is( cp.getFirstName())));
}
-
-// @Test
-// public void shouldReturnAllContactPersons() throws Exception {
-// Page<ContactPersonDto> cpPage = MockDataHelper.mockContactPersonDtoPage();
-//
-// when(contactPersonService.findContactPersons(any(Pageable.class))).thenReturn(cpPage);
-//
-// mockMvc.perform(get("/contact-persons"))
-// .andExpect(status().is2xxSuccessful())
-// .andExpect(content().contentType(MediaType.APPLICATION_JSON))
-// .andExpect(jsonPath("totalElements", is( 2 )));
-// }
-
@Test
public void shouldUpdateContactPerson() throws Exception {
ContactPersonDto cp = MockDataHelper.mockContactPersonDto();
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/service/ContactPersonServiceTest.java b/src/test/java/org/eclipse/openk/contactbasedata/service/ContactPersonServiceTest.java
index 6aceeea..ef3a722 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/service/ContactPersonServiceTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/service/ContactPersonServiceTest.java
@@ -20,7 +20,6 @@
import org.eclipse.openk.contactbasedata.repository.*;
import org.eclipse.openk.contactbasedata.support.MockDataHelper;
import org.eclipse.openk.contactbasedata.viewmodel.ContactPersonDto;
-import org.eclipse.openk.contactbasedata.viewmodel.ExternalPersonDto;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -29,10 +28,8 @@
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ContextConfiguration;
-
import java.util.Optional;
import java.util.UUID;
-
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isA;
@@ -182,10 +179,7 @@
assertEquals(refPersonType.getUuid(), savedDto.getPersonTypeUuid());
assertEquals(refSalutation.getUuid(), savedDto.getSalutationUuid());
}
-
-
-
-
+
@Test
public void shouldDeleteContactPerson() {
TblContactPerson tblContactPerson = MockDataHelper.mockTblContactPerson();
