#207 use jakarta namespace in tests

src/test/java/com/cloudogu/smeagol/CustomErrorControllerTest.java

@@ -1,5 +1,7 @@
 package com.cloudogu.smeagol;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Before;
@@ -9,8 +11,6 @@
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.http.HttpStatus;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.MockitoAnnotations.openMocks;
 

src/test/java/com/cloudogu/smeagol/DevelopmentDispatcherTest.java

@@ -3,18 +3,18 @@
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -23,9 +23,7 @@
 import java.net.URL;
 import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

src/test/java/com/cloudogu/smeagol/ProductionDispatcherTest.java

@@ -1,14 +1,14 @@
 package com.cloudogu.smeagol;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 import static org.junit.Assert.assertFalse;

src/test/java/com/cloudogu/smeagol/UiFilterTest.java

@@ -1,14 +1,14 @@
 package com.cloudogu.smeagol;
 
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 import static org.mockito.Mockito.*;

src/test/java/com/cloudogu/smeagol/authc/infrastructure/AjaxAwareAuthenticationRedirectStrategyTest.java

@@ -9,7 +9,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import java.io.IOException;
 
 import static com.cloudogu.smeagol.authc.infrastructure.AjaxAwareAuthenticationRedirectStrategy.AJAX_HEADER;

src/test/java/com/cloudogu/smeagol/authc/infrastructure/SignOutControllerTest.java

@@ -1,5 +1,7 @@
 package com.cloudogu.smeagol.authc.infrastructure;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,9 +12,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/com/cloudogu/smeagol/wiki/infrastructure/DirectoryControllerTest.java

@@ -5,6 +5,7 @@
 import com.cloudogu.smeagol.wiki.domain.Path;
 import com.cloudogu.smeagol.wiki.domain.WikiId;
 import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,7 +18,6 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

src/test/java/com/cloudogu/smeagol/wiki/infrastructure/HistoryControllerTest.java

@@ -3,6 +3,7 @@
 import com.cloudogu.smeagol.wiki.domain.CommitRepository;
 import com.cloudogu.smeagol.wiki.domain.History;
 import com.cloudogu.smeagol.wiki.domain.WikiId;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,7 +16,6 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 
 import static com.cloudogu.smeagol.wiki.DomainTestData.COMMIT;

src/test/java/com/cloudogu/smeagol/wiki/infrastructure/PageControllerTest.java

@@ -6,6 +6,7 @@
 import com.cloudogu.smeagol.wiki.usecase.EditPageCommand;
 import com.cloudogu.smeagol.wiki.usecase.RestorePageCommand;
 import de.triology.cb.CommandBus;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,7 +21,6 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.Instant;
 import java.util.Optional;
 

src/test/java/com/cloudogu/smeagol/wiki/infrastructure/StaticContentControllerTest.java

@@ -4,6 +4,7 @@
 import com.cloudogu.smeagol.wiki.domain.WikiId;
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -19,7 +20,6 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 
 import static org.junit.Assert.assertTrue;

src/test/java/com/cloudogu/smeagol/wiki/infrastructure/WikiControllerTest.java

@@ -4,6 +4,7 @@
 import com.cloudogu.smeagol.wiki.usecase.EditWikiCommand;
 import com.cloudogu.smeagol.wiki.usecase.InitWikiCommand;
 import de.triology.cb.CommandBus;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,7 +18,6 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.net.URL;
 import java.util.Optional;
 

src/test/java/com/cloudogu/smeagol/wiki/infrastructure/WildcardPathExtractorTest.java

@@ -3,13 +3,12 @@
 import com.cloudogu.smeagol.wiki.DomainTestData;
 import com.cloudogu.smeagol.wiki.domain.Path;
 import com.cloudogu.smeagol.wiki.domain.WikiId;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import javax.servlet.http.HttpServletRequest;
-
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;