Skip to content

Dependency cleanup and minor updates. #1829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2021
Merged

Dependency cleanup and minor updates. #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
<url>https://github.com/spring-projects/spring-data-elasticsearch</url>

<properties>
<commonslang>2.6</commonslang>
<elasticsearch>7.12.1</elasticsearch>
<log4j>2.13.3</log4j>
<netty>4.1.52.Final</netty>
<log4j>2.14.1</log4j>
<netty>4.1.65.Final</netty>
<springdata.commons>2.6.0-SNAPSHOT</springdata.commons>
<testcontainers>1.15.3</testcontainers>
<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
Expand Down Expand Up @@ -132,22 +131,6 @@
<scope>test</scope>
</dependency>

<!-- APACHE -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commonslang}</version>
<scope>test</scope>
</dependency>

<!-- JODA Time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime}</version>
<optional>true</optional>
</dependency>

<!-- Elasticsearch -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
Expand Down
50 changes: 0 additions & 50 deletions src/main/java/org/springframework/data/elasticsearch/core/convert/DateTimeConverters.java
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ...springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,18 @@
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;

import org.springframework.context.annotation.Bean;
import reactor.core.publisher.Mono;

import java.util.Collection;
import java.util.Collections;

import org.apache.commons.lang.ClassUtils;
import org.elasticsearch.Version;
import org.elasticsearch.action.main.MainResponse;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.cluster.ClusterName;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.data.elasticsearch.annotations.Document;
Expand All @@ -52,7 +51,7 @@ public class ElasticsearchConfigurationSupportUnitTests {
public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {

ElasticsearchConfigurationSupport configuration = new StubConfig();
assertThat(configuration.getMappingBasePackages()).contains(ClassUtils.getPackageName(StubConfig.class));
assertThat(configuration.getMappingBasePackages()).contains(StubConfig.class.getPackage().getName());
assertThat(configuration.getInitialEntitySet()).contains(Entity.class);
}

Expand Down
49 changes: 0 additions & 49 deletions ...est/java/org/springframework/data/elasticsearch/core/convert/DateTimeConvertersTests.java
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/test/java/org/springframework/data/elasticsearch/utils/IndexBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@

import java.lang.reflect.Field;

import org.apache.commons.lang.ArrayUtils;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.core.query.IndexQuery;

/**
* Created by akonczak on 02/12/2015.
*
* @author Peter-Josef Meisch
*/
public class IndexBuilder {

public static IndexQuery buildIndex(Object object) {
for (Field f : object.getClass().getDeclaredFields()) {
if (ArrayUtils.isNotEmpty(f.getAnnotationsByType(org.springframework.data.annotation.Id.class))) {

if (AnnotationUtils.findAnnotation(f, Id.class) != null) {
try {
f.setAccessible(true);
IndexQuery indexQuery = new IndexQuery();
Expand Down