Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to SI-6.0.3

Browse Source
This commit is contained in:
abilan
2023-02-21 15:04:55 -05:00
parent 3326699377
commit be9eef5b4f
68 changed files with 3376 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/Employee.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.rest.domain;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
/**
* Employee.java: Employee Domain class
*
* @author Vigil Bose
*/
@XmlAccessorType(XmlAccessType.FIELD)
@@ -81,5 +83,3 @@ public class Employee {
this.lname = lname;
}
}

16
intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/EmployeeList.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,19 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.rest.domain;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
/**
* EmployeeList.java: EmployeeList Domain class
*
* @author Vigil Bose
*/
@XmlAccessorType(XmlAccessType.FIELD)
@@ -84,5 +86,3 @@ public class EmployeeList {
this.returnStatusMsg = returnStatusMsg;
}
}

40
intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,11 +16,7 @@
package org.springframework.integration.samples.rest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Base64;
import java.util.HashMap;
@@ -28,11 +24,11 @@ import java.util.Map;
import javax.xml.transform.stream.StreamResult;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
@@ -43,13 +39,11 @@ import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpRequest;
import org.springframework.integration.samples.rest.domain.EmployeeList;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.web.client.HttpMessageConverterExtractor;
import org.springframework.web.client.RequestCallback;
import org.springframework.web.client.RestTemplate;
import com.fasterxml.jackson.databind.ObjectMapper;
import static org.assertj.core.api.Assertions.assertThat;
/**
* RestHttpClientTest.java: Functional Test to test the REST HTTP Path usage. This test requires
@@ -59,8 +53,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author Gary Russell
* @author Artem Bilan
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:META-INF/spring/integration/http-outbound-config.xml" })
@SpringJUnitConfig(locations = "classpath*:META-INF/spring/integration/http-outbound-config.xml")
public class RestHttpClientTest {
@Autowired
@@ -76,24 +69,19 @@ public class RestHttpClientTest {
@Autowired
private ObjectMapper jaxbJacksonObjectMapper;
@Before
@BeforeEach
public void setUp() {
responseExtractor = new HttpMessageConverterExtractor<>(EmployeeList.class, restTemplate
.getMessageConverters());
Map<String, Object> properties = new HashMap<>();
properties.put(javax.xml.bind.Marshaller.JAXB_ENCODING, "UTF-8");
properties.put(javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
properties.put(jakarta.xml.bind.Marshaller.JAXB_ENCODING, "UTF-8");
properties.put(jakarta.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
marshaller.setMarshallerProperties(properties);
}
/**
*
* @throws Exception
*/
@Test
public void testGetEmployeeAsXml() {
Map<String, Object> employeeSearchMap = getEmployeeSearchMap("0");
final String fullUrl = "http://localhost:8080/rest-http/services/employee/{id}/search";
@@ -111,7 +99,7 @@ public class RestHttpClientTest {
marshaller.marshal(employeeList, sr);
logger.info(sr.getWriter().toString());
assertTrue(employeeList.getEmployee().size() > 0);
assertThat(employeeList.getEmployee()).hasSizeGreaterThan(0);
}
private Map<String, Object> getEmployeeSearchMap(String id) {
@@ -134,10 +122,10 @@ public class RestHttpClientTest {
.exchange(fullUrl, HttpMethod.GET, request, EmployeeList.class, employeeSearchMap);
logger.info("Return Status :" + httpResponse.getHeaders().get("X-Return-Status"));
logger.info("Return Status Message :" + httpResponse.getHeaders().get("X-Return-Status-Msg"));
assertEquals(httpResponse.getStatusCode(), HttpStatus.OK);
assertThat(httpResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
ByteArrayOutputStream out = new ByteArrayOutputStream();
jaxbJacksonObjectMapper.writeValue(out, httpResponse.getBody());
logger.info(new String(out.toByteArray()));
logger.info(out.toString());
}
private HttpHeaders getHttpHeadersWithUserCredentials(ClientHttpRequest request) {
@@ -159,5 +147,3 @@ public class RestHttpClientTest {
}
}