Skip to content

Commit 924467e

Browse files
committed
DATAES-211 -clean up
1 parent 8963123 commit 924467e

File tree

8 files changed

+6
-142
lines changed

8 files changed

+6
-142
lines changed

src/test/java/org/springframework/data/elasticsearch/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static NodeClient getNodeClient() {
3131
return (NodeClient) nodeBuilder().settings(Settings.builder()
3232
.put("http.enabled", "false")
3333
.put("path.data", "target/elasticsearchTestData")
34-
.put("path.home", "test-home-dir"))
34+
.put("path.home", "target/test-home-dir"))
3535
.clusterName(UUID.randomUUID().toString()).local(true).node()
3636
.client();
3737
}

src/test/java/org/springframework/data/elasticsearch/core/facet/LogEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Document(indexName = "test-log-index", type = "test-log-type", shards = 1, replicas = 0, refreshInterval = "-1")
3636
public class LogEntity {
3737

38-
private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
38+
private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
3939

4040
@Id
4141
private String id;
@@ -47,7 +47,7 @@ public class LogEntity {
4747
@Field(type = Ip)
4848
private String ip;
4949

50-
@Field(type = Date, format = DateFormat.basic_date_time)
50+
@Field(type = Date)
5151
private Date date;
5252

5353
private LogEntity() {

src/test/resources/infrastructure.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
77

88
<elasticsearch:node-client id="client" local="true" cluster-name="#{T(java.util.UUID).randomUUID().toString()}"
9-
http-enabled="false" path-data="target/elasticsearchTestData" path-home="test-home-dir"
9+
http-enabled="false" path-data="target/elasticsearchTestData" path-home="target/test-home-dir"
1010
path-configuration="node-client-configuration.yml"/>
1111

1212
<!--<elasticsearch:transport-client id="client" cluster-name="elasticsearch" cluster-nodes="127.0.0.1:9300" />-->

src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
77

88
<elasticsearch:node-client id="client" local="true"
9-
cluster-name="#{T(java.util.UUID).randomUUID().toString()}" http-enabled="false" path-data="target/elasticsearchTestData"/>
9+
cluster-name="#{T(java.util.UUID).randomUUID().toString()}" http-enabled="false"
10+
path-data="target/elasticsearchTestData" path-home="target/test-home-dir"/>
1011

1112
<bean name="elasticsearchTemplate"
1213
class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
Binary file not shown.
Binary file not shown.

test-home-dir/modules/lang-groovy/plugin-descriptor.properties

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

test-home-dir/modules/lang-groovy/plugin-security.policy

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

0 commit comments

Comments
 (0)