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

INT-3789: Upgrade to SF 4.2 and other fixes

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3789

* Hazelcast -> `3.5.1`
* ActiveMq -> `5.11.1`
* Boon -> `0.33`
* Spring Security -> `4.0.2`
* Kryo -> `3.0.3`
* Fix missed polishing for the `Log4jLevelAdjuster` according required generics:
https://build.spring.io/browse/INT-MJATS41-348
* Fix `ImapIdelIntegrationTests` sporadic failure
* Fix `Kryo` Codec stuff according to the changes in the latest Kryo version
This commit is contained in:
Artem Bilan
2015-07-31 10:22:18 -04:00
parent 88be3dd325
commit 4cca684f36
6 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/PojoCodec.java
View File

@@ -19,6 +19,8 @@ package org.springframework.integration.codec.kryo;
import java.util.Collections;
import java.util.List;
import org.objenesis.strategy.StdInstantiatorStrategy;
import org.springframework.util.CollectionUtils;
import com.esotericsoftware.kryo.Kryo;
@@ -31,6 +33,7 @@ import com.esotericsoftware.kryo.io.Output;
* {@link KryoRegistrar}s.
*
* @author David Turanski
* @author Artem Bilan
* @since 4.2
*/
public class PojoCodec extends AbstractKryoCodec {
@@ -96,6 +99,7 @@ public class PojoCodec extends AbstractKryoCodec {
@Override
protected void configureKryoInstance(Kryo kryo) {
kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new StdInstantiatorStrategy()));
if (this.kryoRegistrar != null) {
this.kryoRegistrar.registerTypes(kryo);
}

23
spring-integration-core/src/test/java/org/springframework/integration/codec/CompositeCodecTests.java → spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/CompositeCodecTests.java
View File

@@ -1,20 +1,20 @@
/*
* Copyright 2015 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.
* You may obtain a copy of the License at
* Licensed 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
* 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.
* 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.springframework.integration.codec;
package org.springframework.integration.codec.kryo;
import static org.junit.Assert.assertEquals;
@@ -25,7 +25,8 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.integration.codec.kryo.PojoCodec;
import org.springframework.integration.codec.Codec;
import org.springframework.integration.codec.CompositeCodec;
/**
* @author David Turanski