修改泛型+unitTest

Author: MentosL

arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/convert/impl/ApplicationJsonBodyConvert.java

@@ -4,11 +4,9 @@
 import io.arex.inst.httpservlet.adapter.ServletAdapter;
 import io.arex.inst.httpservlet.convert.BodyConverters;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Base64;
 
-public class ApplicationJsonBodyConvert implements BodyConverters<HttpServletRequest, HttpServletResponse> {
+public class ApplicationJsonBodyConvert<HttpServletRequest, HttpServletResponse> implements BodyConverters<HttpServletRequest, HttpServletResponse> {
 
     private static final String CONTENT_TYPE = "application/json";
 

arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/convert/impl/ApplicationXmlBodyConvert.java

@@ -1,18 +1,21 @@
 package io.arex.inst.httpservlet.convert.impl;
 
+import io.arex.agent.bootstrap.util.StringUtil;
 import io.arex.inst.httpservlet.adapter.ServletAdapter;
 import io.arex.inst.httpservlet.convert.BodyConverters;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-public class ApplicationXmlBodyConvert implements BodyConverters<HttpServletRequest, HttpServletResponse> {
+public class ApplicationXmlBodyConvert<HttpServletRequest, HttpServletResponse> implements BodyConverters<HttpServletRequest, HttpServletResponse> {
 
     private static final String CONTENT_TYPE = "application/xml";
 
     @Override
     public boolean match(HttpServletRequest httpServletRequest, ServletAdapter adapter) {
-        return false;
+        if (httpServletRequest == null || adapter == null) {
+            return false;
+        }
+        String contentType = adapter.getContentType(httpServletRequest);
+        return StringUtil.isNotEmpty(contentType) && contentType.contains(CONTENT_TYPE);
     }
 
     @Override

arex-instrumentation/servlet/arex-httpservlet/src/test/java/io/arex/inst/httpservlet/convert/BodyConvertFactoryTest.java

@@ -0,0 +1,28 @@
+package io.arex.inst.httpservlet.convert;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class BodyConvertFactoryTest {
+
+
+    static BodyConvertFactory bodyConvertFactory = null;
+    @BeforeEach
+    void setUp() {
+        bodyConvertFactory = new BodyConvertFactory();
+
+    }
+
+    @AfterEach
+    void tearDown() {
+    }
+
+    @Test
+    void getAll(){
+        assertTrue(BodyConvertFactory.getAllList()!=null && BodyConvertFactory.getAllList().size() >0);
+    }
+
+}

arex-instrumentation/servlet/arex-httpservlet/src/test/java/io/arex/inst/httpservlet/convert/impl/ApplicationJsonBodyConvertTest.java

@@ -0,0 +1,54 @@
+package io.arex.inst.httpservlet.convert.impl;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
+
+
+import io.arex.inst.httpservlet.adapter.impl.ServletAdapterImplV3;
+import io.arex.inst.httpservlet.adapter.impl.ServletAdapterImplV5;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+
+import javax.servlet.http.HttpServletRequest;
+
+public class ApplicationJsonBodyConvertTest {
+
+    HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class);
+    ServletAdapterImplV3 instance3 = ServletAdapterImplV3.getInstance();
+    ServletAdapterImplV5 instance5 = ServletAdapterImplV5.getInstance();
+    jakarta.servlet.http.HttpServletRequest mockRequest5 = Mockito.mock(jakarta.servlet.http.HttpServletRequest.class);
+
+
+    static ApplicationJsonBodyConvert applicationJsonBodyConvert = null;
+
+
+
+    @BeforeEach
+    void setUp() {
+        applicationJsonBodyConvert = new ApplicationJsonBodyConvert();
+
+    }
+
+    @AfterEach
+    void tearDown() {
+    }
+
+    @Test
+    void match() {
+        when(mockRequest.getContentType()).thenReturn("application/json");
+        when(mockRequest5.getContentType()).thenReturn("application/json");
+        assertEquals(true, applicationJsonBodyConvert.match(mockRequest,instance3));
+        assertEquals(true, applicationJsonBodyConvert.match(mockRequest5,instance5));
+
+    }
+
+    @Test
+    void getBody() {
+        assertEquals(0, applicationJsonBodyConvert.getBody(instance3.wrapRequest(mockRequest),instance3).length());
+        assertEquals(0, applicationJsonBodyConvert.getBody(instance5.wrapRequest(mockRequest5),instance5).length());
+    }
+
+}

arex-instrumentation/servlet/arex-httpservlet/src/test/java/io/arex/inst/httpservlet/convert/impl/ApplicationXmlBodyConvertTest.java

@@ -0,0 +1,52 @@
+package io.arex.inst.httpservlet.convert.impl;
+
+import io.arex.inst.httpservlet.adapter.impl.ServletAdapterImplV3;
+import io.arex.inst.httpservlet.adapter.impl.ServletAdapterImplV5;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+
+public class ApplicationXmlBodyConvertTest {
+
+    HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class);
+    ServletAdapterImplV3 instance3 = ServletAdapterImplV3.getInstance();
+    ServletAdapterImplV5 instance5 = ServletAdapterImplV5.getInstance();
+    jakarta.servlet.http.HttpServletRequest mockRequest5 = Mockito.mock(jakarta.servlet.http.HttpServletRequest.class);
+
+
+    static ApplicationXmlBodyConvert applicationXmlBodyConvert = null;
+
+
+
+    @BeforeEach
+    void setUp() {
+        applicationXmlBodyConvert = new ApplicationXmlBodyConvert();
+
+    }
+
+    @AfterEach
+    void tearDown() {
+    }
+
+    @Test
+    void match() {
+        when(mockRequest.getContentType()).thenReturn("application/xml");
+        when(mockRequest5.getContentType()).thenReturn("application/xml");
+        assertEquals(true, applicationXmlBodyConvert.match(mockRequest,instance3));
+        assertEquals(true, applicationXmlBodyConvert.match(mockRequest5,instance5));
+
+    }
+
+    @Test
+    void getBody() {
+        assertNull(applicationXmlBodyConvert.getBody(instance3.wrapRequest(mockRequest),instance3));
+        assertNull(applicationXmlBodyConvert.getBody(instance5.wrapRequest(mockRequest5),instance5));
+    }
+}

arex-instrumentation/servlet/arex-httpservlet/src/test/resources/META-INF.services/io.arex.inst.httpservlet.convert.BodyConverters

@@ -0,0 +1,2 @@
+io.arex.inst.httpservlet.convert.impl.ApplicationJsonBodyConvert
+io.arex.inst.httpservlet.convert.impl.ApplicationXmlBodyConvert