test: allow non-transactional controller integration tests

by moving the @transactional annotation from our ControllerIntegrationTestBase to the test itself.
We did the same for our service/repo integration tests already.

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/test/webapi/AuthenticationApiTestBase.java

@@ -40,6 +40,7 @@
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Base class for convenient testing of the web API on basis of {@link
@@ -58,6 +59,7 @@
       WebMvcConfig.class,
       AuthConfigProviderConfig.class,
     })
+@Transactional
 public abstract class AuthenticationApiTestBase extends H2ControllerIntegrationTestBase {
 
   static class AuthConfigProviderConfig {

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/test/webapi/ControllerIntegrationTestBase.java

@@ -63,7 +63,6 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -88,7 +87,6 @@
  */
 @WebAppConfiguration
 @ContextConfiguration(classes = {MvcTestConfig.class, WebTestConfig.class})
-@Transactional
 public abstract class ControllerIntegrationTestBase extends IntegrationTestBase
     implements WebClient {
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/test/webapi/ControllerWithApiTokenAuthTestBase.java

@@ -37,6 +37,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Base class for convenient testing of the web API on basis of {@link
@@ -51,6 +52,7 @@
 @ContextConfiguration(
     inheritLocations = false,
     classes = {H2TestConfig.class, WebMvcConfig.class})
+@Transactional
 public abstract class ControllerWithApiTokenAuthTestBase extends H2ControllerIntegrationTestBase {
   @Autowired private FilterChainProxy springSecurityFilterChain;
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/test/webapi/ControllerWithJwtTokenAuthTestBase.java

@@ -40,6 +40,7 @@
 import org.springframework.security.web.FilterChainProxy;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Base class for convenient testing of the web API on basis of {@link
@@ -50,6 +51,7 @@
 @ContextConfiguration(
     inheritLocations = false,
     classes = {DhisConfig.class, WebMvcConfig.class})
+@Transactional
 public abstract class ControllerWithJwtTokenAuthTestBase extends H2ControllerIntegrationTestBase {
 
   static class DhisConfig {

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/test/webapi/WebSpringTestBase.java

@@ -37,12 +37,14 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.filter.CharacterEncodingFilter;
 
 /**
  * @author Morten Olav Hansen <[email protected]>
  */
 @ExtendWith({RestDocumentationExtension.class})
+@Transactional
 public abstract class WebSpringTestBase extends H2ControllerIntegrationTestBase {
 
   @BeforeEach

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AbstractCrudControllerTest.java

@@ -74,13 +74,15 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the generic operations offered by the {@link AbstractCrudController} using specific
  * endpoints.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class AbstractCrudControllerTest extends H2ControllerIntegrationTestBase {
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AbstractDataValueControllerTest.java

@@ -39,7 +39,9 @@
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
 import org.hisp.dhis.user.User;
 import org.junit.jupiter.api.BeforeEach;
+import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 abstract class AbstractDataValueControllerTest extends H2ControllerIntegrationTestBase {
   protected String dataElementId;
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AbstractDatastoreControllerTest.java

@@ -35,13 +35,15 @@
 import org.hisp.dhis.test.utils.JavaToJson;
 import org.hisp.dhis.test.web.HttpStatus;
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Base class for testing the {@link DatastoreController} providing helpers to set up entries in the
  * store.
  *
  * @author Jan Bernitt
  */
+@Transactional
 abstract class AbstractDatastoreControllerTest extends H2ControllerIntegrationTestBase {
 
   /**

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AbstractFullReadOnlyControllerTest.java

@@ -41,13 +41,15 @@
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the generic operations offered by the {@link AbstractFullReadOnlyController} using specific
  * endpoints.
  *
  * @author David Mackessy
  */
+@Transactional
 class AbstractFullReadOnlyControllerTest extends H2ControllerIntegrationTestBase {
 
   @Autowired private DataElementService dataElementService;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AbstractGistControllerTest.java

@@ -42,12 +42,14 @@
 import org.hisp.dhis.user.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Base class for controller tests of the Gist API.
  *
  * @author Jan Bernitt
  */
+@Transactional
 abstract class AbstractGistControllerTest extends H2ControllerIntegrationTestBase {
   @Autowired protected OrganisationUnitService organisationUnitService;
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AbstractUserDatastoreControllerTest.java

@@ -35,13 +35,15 @@
 import org.hisp.dhis.test.utils.JavaToJson;
 import org.hisp.dhis.test.web.HttpStatus;
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Base class for testing the {@link UserDatastoreController} providing helpers to set up entries in
  * the store.
  *
  * @author Jan Bernitt
  */
+@Transactional
 public abstract class AbstractUserDatastoreControllerTest extends H2ControllerIntegrationTestBase {
 
   /**

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AccountControllerTest.java

@@ -50,12 +50,14 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link AccountController} using (mocked) REST requests.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class AccountControllerTest extends PostgresControllerIntegrationTestBase {
   @Autowired private SystemSettingManager systemSettingManager;
   @Autowired private FakeMessageSender messageSender;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AnalyticsOutlierDetectionControllerTest.java

@@ -34,6 +34,7 @@
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link
@@ -42,6 +43,7 @@
  *
  * @author david mackessy
  */
+@Transactional
 class AnalyticsOutlierDetectionControllerTest extends H2ControllerIntegrationTestBase {
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AppControllerTest.java

@@ -51,6 +51,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link AppController}
@@ -61,6 +62,7 @@
     classes = {
       DhisConfig.class,
     })
+@Transactional
 class AppControllerTest extends H2ControllerIntegrationTestBase {
 
   static class DhisConfig {

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AppHubControllerTest.java

@@ -40,12 +40,14 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link AppHubController} using (mocked) REST requests.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class AppHubControllerTest extends H2ControllerIntegrationTestBase {
   @Autowired private DhisConfigurationProvider configuration;
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AttributeControllerTest.java

@@ -36,12 +36,14 @@
 import org.hisp.dhis.test.web.HttpStatus;
 import org.hisp.dhis.test.webapi.PostgresControllerIntegrationTestBase;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link AttributeController}.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class AttributeControllerTest extends PostgresControllerIntegrationTestBase {
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/AuthoritiesControllerTest.java

@@ -35,12 +35,14 @@
 import org.hisp.dhis.jsontree.JsonObject;
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link org.hisp.dhis.webapi.controller.security.AuthoritiesController}.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class AuthoritiesControllerTest extends H2ControllerIntegrationTestBase {
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/BulkPatchSharingControllerTest.java

@@ -43,10 +43,12 @@
 import org.hisp.dhis.user.sharing.Sharing;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author [email protected]
  */
+@Transactional
 class BulkPatchSharingControllerTest extends H2ControllerIntegrationTestBase {
 
   @Autowired private ObjectMapper jsonMapper;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/CategoryComboModificationControllerTest.java

@@ -38,7 +38,9 @@
 import org.hisp.dhis.test.webapi.json.domain.JsonCategoryOptionCombo;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 class CategoryComboModificationControllerTest extends H2ControllerIntegrationTestBase {
 
   String testCatCombo;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/ChangeLogControllerTest.java

@@ -50,7 +50,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 class ChangeLogControllerTest extends H2ControllerIntegrationTestBase {
 
   @Autowired private IdentifiableObjectManager manager;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationControllerTest.java

@@ -43,12 +43,14 @@
 import org.hisp.dhis.test.webapi.json.domain.JsonImportSummary;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link CompleteDataSetRegistrationController} using (mocked) REST requests.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class CompleteDataSetRegistrationControllerTest extends H2ControllerIntegrationTestBase {
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/CrudControllerIntegrationTest.java

@@ -48,8 +48,10 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
+@Transactional
 class CrudControllerIntegrationTest extends PostgresControllerIntegrationTestBase {
 
   @Autowired private UserSettingService userSettingService;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/CrudControllerPagingTest.java

@@ -39,7 +39,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 class CrudControllerPagingTest extends H2ControllerIntegrationTestBase {
   @Autowired private OrganisationUnitService ouService;
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/CurrentUserUtilTest.java

@@ -37,10 +37,12 @@
 import org.hisp.dhis.user.CurrentUserUtil;
 import org.hisp.dhis.user.UserDetails;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author david mackessy
  */
+@Transactional
 class CurrentUserUtilTest extends H2ControllerIntegrationTestBase {
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/DashboardControllerTest.java

@@ -46,7 +46,9 @@
 import org.hisp.dhis.visualization.Visualization;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
+@Transactional
 class DashboardControllerTest extends PostgresControllerIntegrationTestBase {
   @Autowired private AclService aclService;
 

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/DataApprovalControllerTest.java

@@ -43,12 +43,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link DataApprovalController} using (mocked) REST requests.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class DataApprovalControllerTest extends H2ControllerIntegrationTestBase {
 
   private String ouId;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/DataSetControllerTest.java

@@ -40,12 +40,14 @@
 import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Tests the {@link DataSetController} using (mocked) REST requests.
  *
  * @author Jan Bernitt
  */
+@Transactional
 class DataSetControllerTest extends H2ControllerIntegrationTestBase {
 
   private String dsId;

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/DataSetMetadataControllerTest.java

@@ -40,10 +40,12 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author david mackessy
  */
+@Transactional
 class DataSetMetadataControllerTest extends PostgresControllerIntegrationTestBase {
 
   @ParameterizedTest