BENCH-195 conflicts resolved

Author: AudriusPutys

src/test/java/com/answerdigital/answerking/builder/AddCategoryRequestTestBuilder.java

@@ -1,6 +1,6 @@
 package com.answerdigital.answerking.builder;
 
-import com.answerdigital.answerking.request.AddCategoryRequest;
+import com.answerdigital.answerking.request.CategoryRequest;
 
 public class AddCategoryRequestTestBuilder {
 
@@ -23,7 +23,7 @@ public AddCategoryRequestTestBuilder withDescription(final String description) {
         return this;
     }
 
-    public AddCategoryRequest build() {
-        return new AddCategoryRequest(name, description);
+    public CategoryRequest build() {
+        return new CategoryRequest(name, description);
     }
 }

src/test/java/com/answerdigital/answerking/builder/UpdateCategoryRequestTestBuilder.java

@@ -1,6 +1,6 @@
 package com.answerdigital.answerking.builder;
 
-import com.answerdigital.answerking.request.UpdateCategoryRequest;
+import com.answerdigital.answerking.request.CategoryRequest;
 
 public class UpdateCategoryRequestTestBuilder {
 
@@ -23,7 +23,7 @@ public UpdateCategoryRequestTestBuilder withDescription(final String description
         return this;
     }
 
-    public UpdateCategoryRequest build() {
-        return new UpdateCategoryRequest(name, description);
+    public CategoryRequest build() {
+        return new CategoryRequest(name, description);
     }
 }

src/test/java/com/answerdigital/answerking/service/CategoryServiceTest.java

@@ -12,7 +12,6 @@
 import com.answerdigital.answerking.model.Product;
 import com.answerdigital.answerking.repository.CategoryRepository;
 import com.answerdigital.answerking.request.CategoryRequest;
-
 import com.answerdigital.answerking.response.CategoryResponse;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -21,10 +20,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.HashSet;
 import java.util.Optional;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.any;
@@ -72,7 +73,7 @@ void tearDown() {
     @Test
     void testAddCategory() {
         // given
-        final AddCategoryRequest addCategoryRequest = addCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest addCategoryRequest = addCategoryRequestTestBuilder.withDefaultValues().build();
         final Category expectedResponse = categoryTestBuilder.withDefaultValues().build();
 
         // when
@@ -93,7 +94,7 @@ void testAddCategory() {
     @Test
     void testAddCategoryThatAlreadyExists() {
         // given
-        final AddCategoryRequest addCategoryRequest = addCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest addCategoryRequest = addCategoryRequestTestBuilder.withDefaultValues().build();
 
         // when
         doReturn(true).when(categoryRepository).existsByName(anyString());
@@ -109,7 +110,7 @@ void testAddCategoryThatAlreadyExists() {
     void testUpdateCategory() {
         // given
         final Category existingCategory = categoryTestBuilder.withDefaultValues().build();
-        final UpdateCategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
         final Category expectedResponse = categoryTestBuilder
                 .withDefaultValues()
                 .withName(updateCategoryRequest.name())
@@ -133,7 +134,7 @@ void testUpdateCategory() {
     @Test
     void testUpdateCategoryThatDoesNotExist() {
         // given
-        final UpdateCategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
 
         // when
         doReturn(false).when(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());
@@ -151,7 +152,7 @@ void testUpdateCategoryThatDoesNotExist() {
     void testUpdateCategoryNameToCategoryThatAlreadyExists() {
         // given
         final Category existingCategory = categoryTestBuilder.withDefaultValues().build();
-        final UpdateCategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
+        final CategoryRequest updateCategoryRequest = updateCategoryRequestTestBuilder.withDefaultValues().build();
 
         // when
         doReturn(true).when(categoryRepository).existsByNameAndIdIsNot(anyString(), anyLong());