You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/06/23 00:49:50 UTC
[cxf] branch 3.3.x-fixes updated (abaf852 -> 326732d)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from abaf852 Recording .gitmergeinfo Changes
new a1a235c CXF-8556: Null AbstractEndpointFactory Properties Interferes with Class-Level PathParam When Creating Proxies with Defined ClientState (#818)
new 326732d Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 +
.../cxf/jaxrs/client/JAXRSClientFactoryBean.java | 2 +-
.../client/spring/JAXRSClientFactoryBeanTest.java | 16 +++++
.../org/apache/cxf/jaxrs/client/spring/clients.xml | 5 ++
.../org/apache/cxf/systest/jaxrs/BookServer.java | 2 +-
.../{AtomBookStore3.java => BookStoreRegex.java} | 21 +++---
.../systest/jaxrs/JAXRSClientServerBookTest.java | 79 ++++++++++------------
7 files changed, 72 insertions(+), 55 deletions(-)
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/{AtomBookStore3.java => BookStoreRegex.java} (74%)
[cxf] 01/02: CXF-8556: Null AbstractEndpointFactory Properties
Interferes with Class-Level PathParam When Creating Proxies with Defined
ClientState (#818)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a1a235ca3be1c04d83ff5a756b61bbc9d0e5d895
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 22 17:53:37 2021 -0400
CXF-8556: Null AbstractEndpointFactory Properties Interferes with Class-Level PathParam When Creating Proxies with Defined ClientState (#818)
(cherry picked from commit 4b714edc4805395974da2ff9c683b61ec9b23db9)
---
.../cxf/jaxrs/client/JAXRSClientFactoryBean.java | 2 +-
.../client/spring/JAXRSClientFactoryBeanTest.java | 16 +++++
.../org/apache/cxf/jaxrs/client/spring/clients.xml | 5 ++
.../org/apache/cxf/systest/jaxrs/BookServer.java | 2 +-
.../apache/cxf/systest/jaxrs/BookStoreRegex.java | 36 ++++++++++
.../systest/jaxrs/JAXRSClientServerBookTest.java | 79 ++++++++++------------
6 files changed, 96 insertions(+), 44 deletions(-)
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
index 5783e2b..747bdac 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
@@ -344,7 +344,7 @@ public class JAXRSClientFactoryBean extends AbstractJAXRSFactoryBean {
inheritHeaders, getProperties(), varValues);
} else {
return new ClientProxyImpl(actualState, proxyLoader, cri, isRoot,
- inheritHeaders, getProperties(), varValues);
+ inheritHeaders, varValues);
}
}
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
index fee3c2b..ecfff4c 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanTest.java
@@ -94,4 +94,20 @@ public class JAXRSClientFactoryBeanTest {
endsWith("?list=1&list=2"));
}
}
+
+ @Test
+ public void testClientPropertiesWithState() throws Exception {
+ try (ClassPathXmlApplicationContext ctx =
+ new ClassPathXmlApplicationContext(new String[] {"/org/apache/cxf/jaxrs/client/spring/clients.xml"})) {
+ Client bean = (Client) ctx.getBean("client3");
+ assertNotNull(bean);
+ assertThat(bean.query("list", "1").query("list", "2").getCurrentURI().toString(),
+ endsWith("?list=1,2"));
+
+ bean = (Client) ctx.getBean("client1");
+ assertNotNull(bean);
+ assertThat(bean.query("list", "1").query("list", "2").getCurrentURI().toString(),
+ endsWith("?list=1&list=2"));
+ }
+ }
}
\ No newline at end of file
diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
index 6e5e564..320de2e 100644
--- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
+++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/spring/clients.xml
@@ -54,4 +54,9 @@
<entry key="expand.query.value.as.collection" value="true" />
</jaxrs:properties>
</jaxrs:client>
+ <jaxrs:client id="client3" serviceClass="org.apache.cxf.jaxrs.resources.BookStore" address="http://localhost:9000/foo" threadSafe="true">
+ <jaxrs:properties>
+ <entry key="expand.query.value.as.collection" value="true" />
+ </jaxrs:properties>
+ </jaxrs:client>
</beans>
\ No newline at end of file
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
index 47ba4c3..40bd38c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
@@ -97,7 +97,7 @@ public class BookServer extends AbstractBusTestServerBase {
setBus(bus);
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setBus(bus);
- sf.setResourceClasses(BookStore.class, SimpleBookStore.class, BookStorePerRequest.class);
+ sf.setResourceClasses(BookStore.class, SimpleBookStore.class, BookStorePerRequest.class, BookStoreRegex.class);
List<Object> providers = new ArrayList<>();
//default lifecycle is per-request, change it to singleton
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreRegex.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreRegex.java
new file mode 100644
index 0000000..f4ab5e3
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreRegex.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+@Path("/regex/{type:book|store}")
+public class BookStoreRegex {
+ @Context private UriInfo uriInfo;
+
+ @Path("/{id}")
+ @GET
+ public Book getBook(@PathParam("id") long id) {
+ return new Book(uriInfo.getPathParameters().getFirst("type"), id);
+ }
+}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index 9564f9c..f4ccdd0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -258,7 +258,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
}
}
-
@Test
public void testGetBookRelativeUriAutoRedirect() throws Exception {
String address = "http://localhost:" + PORT + "/bookstore/redirect/relative?loop=false";
@@ -310,6 +309,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
Response r = wc.form(new Form());
assertEquals("empty form", r.readEntity(String.class));
}
+
@Test
public void testEchoForm() throws Exception {
String address = "http://localhost:" + PORT + "/bookstore/form";
@@ -369,7 +369,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals("OK", r.getHeaderString("customresponse"));
}
-
@Test
public void testGetCustomBookText() {
String address = "http://localhost:" + PORT + "/bookstore/customtext";
@@ -379,7 +378,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals("Good book", name);
assertEquals("text/custom;charset=us-ascii", r.getMediaType().toString());
assertEquals("CustomValue", r.getHeaderString("CustomHeader"));
-
}
@Test
@@ -457,7 +455,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
}
private void doTestGetChapterFromSelectedBook(String address) {
-
WebClient wc = WebClient.create(address);
wc.accept("application/xml");
Chapter chapter = wc.get(Chapter.class);
@@ -506,8 +503,8 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
Book book = store.getBeanParamBook(bean);
assertEquals(123L, book.getId());
-
}
+
@Test
public void testProxyBeanParam2() throws Exception {
BookStore store = JAXRSClientFactory.create("http://localhost:" + PORT, BookStore.class);
@@ -518,7 +515,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
nested.setId4(123);
Book book = store.getTwoBeanParamsBook(bean, nested);
assertEquals(123L, book.getId());
-
}
@Test
@@ -559,7 +555,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetBookWithCustomHeader() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/books/123";
WebClient wc = WebClient.create(endpointAddress);
@@ -585,7 +580,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetBookWithNameInQuery() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/name-in-query";
WebClient wc = WebClient.create(endpointAddress);
@@ -597,7 +591,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetBookAsObject() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/object";
WebClient wc = WebClient.create(endpointAddress);
@@ -621,7 +614,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetBookWithColonMarks() throws Exception {
-
// URLEncoder will turn ":" into "%3A" but ':' is actually
// not disallowed in the path components
String endpointAddressUrlEncoded =
@@ -640,7 +632,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostAnd401WithText() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/post401";
WebClient wc = WebClient.create(endpointAddress);
@@ -654,7 +645,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testCapturedServerInFault() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/infault";
WebClient wc = WebClient.create(endpointAddress);
@@ -664,7 +654,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testCapturedServerOutFault() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/outfault";
WebClient wc = WebClient.create(endpointAddress);
@@ -674,7 +663,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetCollectionOfBooks() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections";
WebClient wc = WebClient.create(endpointAddress);
@@ -687,7 +675,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostCollectionGetBooksWebClient() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections3";
WebClient wc = WebClient.create(endpointAddress);
@@ -705,7 +692,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostCollectionGenericEntityWebClient() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections3";
WebClient wc = WebClient.create(endpointAddress);
@@ -727,7 +713,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostGetCollectionGenericEntityAndType() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections";
WebClient wc = WebClient.create(endpointAddress);
@@ -760,7 +745,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostCollectionOfBooksWebClient() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collections";
WebClient wc = WebClient.create(endpointAddress);
@@ -785,7 +769,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostNullGetEmptyCollectionProxy() throws Exception {
-
String endpointAddress = "http://localhost:" + PORT;
BookStore bs = JAXRSClientFactory.create(endpointAddress, BookStore.class);
List<Book> books = bs.postBookGetCollection(null);
@@ -796,7 +779,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testPostObjectGetCollection() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/collectionBook";
WebClient wc = WebClient.create(endpointAddress);
@@ -812,7 +794,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testCaching() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/books/response/123";
@@ -853,7 +834,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testCachingExpires() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/books/response2/123";
@@ -896,7 +876,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testCachingExpiresUsingETag() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/books/response3/123";
@@ -1032,7 +1011,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
} catch (BookNotFoundFault ex) {
assertEquals("notFound", ex.getMessage());
}
-
}
@Test
@@ -1116,7 +1094,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertTrue("Did not contain dummy2", hasDummy2);
}
-
@Test
public void testOnewayProxy() throws Exception {
BookStore proxy = JAXRSClientFactory.create("http://localhost:" + PORT, BookStore.class);
@@ -1419,7 +1396,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
Book book = wc.get(Book.class);
assertNotNull(book);
assertEquals(123L, book.getId());
-
}
@Test
@@ -1584,7 +1560,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals(3, arr[2], 0.0);
}
-
@Test
public void testGetStringList() throws Exception {
String address = "http://localhost:" + PORT;
@@ -1609,6 +1584,40 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
}
@Test
+ public void testBookWithRegexThreadSafe() throws Exception {
+ JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
+ bean.setServiceClass(BookStoreRegex.class);
+ bean.setAddress("http://localhost:" + PORT);
+ bean.setProperties(Collections.<String, Object>singletonMap("url.encode.client.parameters", Boolean.TRUE));
+ bean.setThreadSafe(true);
+
+ final String[] templates = new String [] {"book", "store"};
+ for (String template: templates) {
+ BookStoreRegex store = bean.create(BookStoreRegex.class, template);
+ Book book = store.getBook(123);
+ assertEquals(123L, book.getId());
+ assertEquals(template, book.getName());
+ }
+ }
+
+ @Test
+ public void testBookWithRegexNonThreadSafe() throws Exception {
+ JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
+ bean.setServiceClass(BookStoreRegex.class);
+ bean.setAddress("http://localhost:" + PORT);
+ bean.setProperties(Collections.<String, Object>singletonMap("url.encode.client.parameters", Boolean.TRUE));
+ bean.setThreadSafe(false);
+
+ final String[] templates = new String [] {"book", "store"};
+ for (String template: templates) {
+ BookStoreRegex store = bean.create(BookStoreRegex.class, template);
+ Book book = store.getBook(123);
+ assertEquals(123L, book.getId());
+ assertEquals(template, book.getName());
+ }
+ }
+
+ @Test
public void testGetBookByEncodedQuery() throws Exception {
getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/bookquery?"
+ "urlid=http%3A%2F%2Ftest.com%2Frss%2F123",
@@ -1662,7 +1671,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertEquals("text/custom+plain", r.getMediaType().toString());
assertEquals("CustomValue", r.getHeaderString("CustomHeader"));
assertEquals("Response is not available", r.readEntity(String.class));
-
}
@Test
@@ -1744,7 +1752,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testNoMessageReaderFound() throws Exception {
-
String endpointAddress =
"http://localhost:" + PORT + "/bookstore/binarybooks";
@@ -1965,7 +1972,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
WebClient client = WebClient.create(address);
Book b = client.query("_s", "name==CXF*;id=ge=123;id=lt=124").get(Book.class);
assertEquals(b.getId(), 123L);
-
}
@Test
@@ -2111,7 +2117,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
assertTrue(response.endsWith("}"));
assertTrue(response.contains("\"Book\":{"));
assertNotEquals(1, response.indexOf("\"Book\":{"));
-
}
@Test
@@ -2149,7 +2154,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/books/123",
"resources/expected_get_book123.txt",
"*/*", "application/xml", 200);
-
}
@Test
@@ -2402,7 +2406,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetChapter() throws Exception {
-
getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/booksubresource/123/chapters/1",
"resources/expected_get_chapter1.txt",
"application/xml", "application/xml;charset=ISO-8859-1", 200);
@@ -2450,7 +2453,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetChapterEncodingDefault() throws Exception {
-
getAndCompareAsStrings("http://localhost:"
+ PORT + "/bookstore/booksubresource/123/chapters/badencoding/1",
"resources/expected_get_chapter1_utf.txt",
@@ -2459,7 +2461,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
@Test
public void testGetChapterAcceptEncoding() throws Exception {
-
getAndCompareAsStrings("http://localhost:"
+ PORT + "/bookstore/booksubresource/123/chapters/acceptencoding/1",
"resources/expected_get_chapter1.txt",
@@ -2668,7 +2669,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/cd/123",
"resources/expected_get_cdjson.txt",
"application/json", "application/json", 200);
-
}
@Test
@@ -2930,7 +2930,6 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
}
}
-
private ReaderInterceptor getReaderInterceptor() {
return readerInterceptorContext -> {
InputStream is = new BufferedInputStream(readerInterceptorContext.getInputStream());
@@ -2939,7 +2938,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
};
}
- private void getAndCompareAsStrings(String address, String resourcePath, String acceptType,
+ private void getAndCompareAsStrings(String address, String resourcePath, String acceptType,
String expectedContentType, int status) throws Exception {
String expected = getStringFromInputStream(
getClass().getResourceAsStream(resourcePath));
@@ -2990,11 +2989,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
return str;
}
-
-
private String getStringFromInputStream(InputStream in) throws Exception {
return IOUtils.toString(in);
}
-
-
}
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 326732d24a86f1810a8d7196d1d9b07cb8ae4e91
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 22 20:47:25 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6af5e7c..49657d8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -656,6 +656,7 @@ B f330a85c8dd3ba07913badeb72f27dd41971973d
B f342fba01d88d60e9f7419c7811bd86074b249a8
B f3c4ac43c6043b8a2eb9682c7de3fba74a531c69
B f3cee43a917bfa767757b7c7d0e9cf2afa5fb07f
+B f48870559bc15762c8392ead4a5ed4832fbc6d9c
B f4f227be9a1c4f31817a62fad7fff382d3089621
B f54062eb331fcf35d9f3a840f532417fccbb2673
B f54f4b406ec6ef5eb66c72e258a50924c851f737
@@ -735,6 +736,7 @@ M 1ceb6d0928a62d8c6b07fad0db25e92d2d4b273d
M 1d055e6c5c0783c4c7a28ff36849efa5d010fa4c
M 1e3817e3f7d51d093bff81d2520fb7cef82f0df8
M 1ea18781d709ce913bcb619a65a2b6a7c7c1ef26
+M 208d6ac4f01ba2a9982e6fd9306bee7e2bad8e38
M 209407e09d8b1466d1c524184690915c1aa1a3ea
M 20b85e83bd03a9d8c6fac32e1fbf3eb35e52d22e
M 2244024ba6d438f44adffd56b1dc8e02cb45cf71