Skip to content

Commit 2aaa8db

Browse files
committed
Migrate imports order to other Spring projects style
1 parent fdc7e4d commit 2aaa8db

File tree

253 files changed

+2428
-2027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+2428
-2027
lines changed

eclipse-code-formatter.xml

Lines changed: 0 additions & 313 deletions
This file was deleted.

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJackson2MessageConverter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2024 the original author or authors.
2+
* Copyright 2018-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
2323
import java.nio.charset.StandardCharsets;
2424
import java.util.Optional;
2525

26+
import com.fasterxml.jackson.databind.JavaType;
27+
import com.fasterxml.jackson.databind.ObjectMapper;
2628
import org.apache.commons.logging.Log;
2729
import org.apache.commons.logging.LogFactory;
2830

@@ -36,9 +38,6 @@
3638
import org.springframework.util.MimeType;
3739
import org.springframework.util.MimeTypeUtils;
3840

39-
import com.fasterxml.jackson.databind.JavaType;
40-
import com.fasterxml.jackson.databind.ObjectMapper;
41-
4241
/**
4342
* Abstract Jackson2 message converter.
4443
*

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJavaTypeMapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,14 +20,14 @@
2020
import java.util.HashMap;
2121
import java.util.Map;
2222

23+
import com.fasterxml.jackson.databind.JavaType;
24+
import com.fasterxml.jackson.databind.type.TypeFactory;
25+
2326
import org.springframework.amqp.core.MessageProperties;
2427
import org.springframework.beans.factory.BeanClassLoaderAware;
2528
import org.springframework.lang.Nullable;
2629
import org.springframework.util.ClassUtils;
2730

28-
import com.fasterxml.jackson.databind.JavaType;
29-
import com.fasterxml.jackson.databind.type.TypeFactory;
30-
3131
/**
3232
* Abstract type mapper.
3333
*

spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultJackson2JavaTypeMapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,14 +21,14 @@
2121
import java.util.List;
2222
import java.util.Set;
2323

24+
import com.fasterxml.jackson.databind.JavaType;
25+
import com.fasterxml.jackson.databind.type.TypeFactory;
26+
2427
import org.springframework.amqp.core.MessageProperties;
2528
import org.springframework.lang.Nullable;
2629
import org.springframework.util.Assert;
2730
import org.springframework.util.ClassUtils;
2831

29-
import com.fasterxml.jackson.databind.JavaType;
30-
import com.fasterxml.jackson.databind.type.TypeFactory;
31-
3232
/**
3333
* Jackson 2 type mapper.
3434
* @author Mark Pollack

spring-amqp/src/main/java/org/springframework/amqp/support/converter/Jackson2JavaTypeMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
1616

1717
package org.springframework.amqp.support.converter;
1818

19+
import com.fasterxml.jackson.databind.JavaType;
20+
1921
import org.springframework.amqp.core.MessageProperties;
2022
import org.springframework.lang.Nullable;
2123

22-
import com.fasterxml.jackson.databind.JavaType;
23-
2424
/**
2525
* Strategy for setting metadata on messages such that one can create the class that needs
2626
* to be instantiated when receiving a message.

spring-amqp/src/main/java/org/springframework/amqp/support/converter/Jackson2JsonMessageConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
1616

1717
package org.springframework.amqp.support.converter;
1818

19-
import org.springframework.amqp.core.MessageProperties;
20-
import org.springframework.util.MimeTypeUtils;
21-
2219
import com.fasterxml.jackson.databind.DeserializationFeature;
2320
import com.fasterxml.jackson.databind.ObjectMapper;
2421

22+
import org.springframework.amqp.core.MessageProperties;
23+
import org.springframework.util.MimeTypeUtils;
24+
2525
/**
2626
* JSON converter that uses the Jackson 2 Json library.
2727
*

spring-amqp/src/main/java/org/springframework/amqp/support/converter/Jackson2XmlMessageConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2019 the original author or authors.
2+
* Copyright 2018-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
1616

1717
package org.springframework.amqp.support.converter;
1818

19-
import org.springframework.amqp.core.MessageProperties;
20-
import org.springframework.util.MimeTypeUtils;
21-
2219
import com.fasterxml.jackson.databind.DeserializationFeature;
2320
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
2421

22+
import org.springframework.amqp.core.MessageProperties;
23+
import org.springframework.util.MimeTypeUtils;
24+
2525
/**
2626
* XML converter that uses the Jackson 2 Xml library.
2727
*

spring-amqp/src/main/java/org/springframework/amqp/support/converter/JacksonUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 the original author or authors.
2+
* Copyright 2023-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
1616

1717
package org.springframework.amqp.support.converter;
1818

19-
import org.springframework.util.ClassUtils;
20-
2119
import com.fasterxml.jackson.databind.DeserializationFeature;
2220
import com.fasterxml.jackson.databind.MapperFeature;
2321
import com.fasterxml.jackson.databind.ObjectMapper;
2422
import com.fasterxml.jackson.databind.json.JsonMapper;
2523

24+
import org.springframework.util.ClassUtils;
25+
2626

2727
/**
2828
* The utilities for Jackson {@link ObjectMapper} instances.

spring-amqp/src/main/java/org/springframework/amqp/support/converter/ProjectingMessageConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 the original author or authors.
2+
* Copyright 2019-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
1919
import java.io.ByteArrayInputStream;
2020
import java.lang.reflect.Type;
2121

22+
import com.fasterxml.jackson.databind.ObjectMapper;
23+
import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
24+
2225
import org.springframework.amqp.core.Message;
2326
import org.springframework.core.ResolvableType;
2427
import org.springframework.data.projection.MethodInterceptorFactory;
@@ -27,9 +30,6 @@
2730
import org.springframework.data.web.JsonProjectingMethodInterceptorFactory;
2831
import org.springframework.util.Assert;
2932

30-
import com.fasterxml.jackson.databind.ObjectMapper;
31-
import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
32-
3333
/**
3434
* Uses a Spring Data {@link ProjectionFactory} to bind incoming messages to projection
3535
* interfaces.

spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.amqp.core;
1818

19-
import static org.assertj.core.api.Assertions.assertThat;
20-
2119
import org.junit.jupiter.api.Test;
2220

21+
import static org.assertj.core.api.Assertions.assertThat;
22+
2323
/**
2424
* @author Mark Pollack
2525
* @author Mark Fisher

0 commit comments

Comments
 (0)