group and cleanup (#3027)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup

* group and cleanup

logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.mdc.log4j;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import com.baeldung.mdc.TransactionFactory;
+import com.baeldung.mdc.Transfer;
+
+public class DemoIntegrationTest {
+
+    @Test
+    public void main() throws InterruptedException {
+        ExecutorService executor = Executors.newFixedThreadPool(3);
+        TransactionFactory transactionFactory = new TransactionFactory();
+        for (int i = 0; i < 10; i++) {
+            Transfer tx = transactionFactory.newInstance();
+            Runnable task = new Log4JRunnable(tx);
+            executor.submit(task);
+        }
+        executor.shutdown();
+        executor.awaitTermination(60, TimeUnit.SECONDS);
+    }
+}

logging-modules/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.mdc.log4j2;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+import org.junit.Test;
+
+import com.baeldung.mdc.TransactionFactory;
+import com.baeldung.mdc.Transfer;
+import com.baeldung.mdc.log4j.Log4JRunnable;
+import com.baeldung.mdc.log4j2.Log4J2Runnable;
+import com.baeldung.mdc.slf4j.Slf4jRunnable;
+
+public class DemoIntegrationTest {
+
+    @Test
+    public void main() throws InterruptedException {
+        ExecutorService executor = Executors.newFixedThreadPool(3);
+        TransactionFactory transactionFactory = new TransactionFactory();
+        for (int i = 0; i < 10; i++) {
+            Transfer tx = transactionFactory.newInstance();
+            Runnable task = new Log4J2Runnable(tx);
+            executor.submit(task);
+        }
+        executor.shutdown();
+        executor.awaitTermination(60, TimeUnit.SECONDS);
+    }
+}

logging-modules/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.mdc.slf4j;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+import org.junit.Test;
+
+import com.baeldung.mdc.TransactionFactory;
+import com.baeldung.mdc.Transfer;
+import com.baeldung.mdc.log4j.Log4JRunnable;
+import com.baeldung.mdc.log4j2.Log4J2Runnable;
+import com.baeldung.mdc.slf4j.Slf4jRunnable;
+
+public class DemoIntegrationTest {
+
+    @Test
+    public void main() throws InterruptedException {
+        ExecutorService executor = Executors.newFixedThreadPool(3);
+        TransactionFactory transactionFactory = new TransactionFactory();
+        for (int i = 0; i < 10; i++) {
+            Transfer tx = transactionFactory.newInstance();
+            Runnable task = new Slf4jRunnable(tx);
+            executor.submit(task);
+        }
+        executor.shutdown();
+        executor.awaitTermination(60, TimeUnit.SECONDS);
+    }
+}

logging-modules/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java

@@ -0,0 +1,61 @@
+package com.baeldung.ndc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import com.baeldung.config.AppConfiguration;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfiguration.class)
+@WebAppConfiguration
+public class NDCLogIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    private Investment investment;
+
+    @Before
+    public void setUp() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+
+        investment = new Investment();
+        investment.setTransactionId("123");
+        investment.setOwner("Mark");
+        investment.setAmount(1000L);
+    }
+
+    @Test
+    public void givenLog4jLogger_whenNDCAdded_thenResponseOkAndNDCInLog() throws Exception {
+        mockMvc.perform(post("/ndc/log4j", investment).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(investment))).andExpect(status().is2xxSuccessful());
+
+    }
+
+    @Test
+    public void givenLog4j2Logger_whenNDCAdded_thenResponseOkAndNDCInLog() throws Exception {
+        mockMvc.perform(post("/ndc/log4j2", investment).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(investment))).andExpect(status().is2xxSuccessful());
+
+    }
+
+    @Test
+    public void givenJBossLoggerBridge_whenNDCAdded_thenResponseOkAndNDCInLog() throws Exception {
+        mockMvc.perform(post("/ndc/jboss-logging", investment).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(investment))).andExpect(status().is2xxSuccessful());
+
+    }
+
+}