Skip to content

Commit 5813185

Browse files
committed
elasticsearch service
1 parent 9f83bb5 commit 5813185

File tree

6 files changed

+44
-6
lines changed

6 files changed

+44
-6
lines changed

auth/angular-ecommerce-auth.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
auth:
2+
- name: user1
3+
loginEndpointAuth:
4+
payloadRaw: "{\"username\": \"user1\", \"password\": \"12345678\"}"
5+
- name: user2
6+
loginEndpointAuth:
7+
payloadRaw: "{\"username\": \"user2\", \"password\": \"12345678\"}"
8+
9+
authTemplate:
10+
loginEndpointAuth:
11+
endpoint: /api/auth/login
12+
verb: POST
13+
contentType: application/json
14+
token:
15+
extractFromField: /accessToken
16+
httpHeaderName: Authorization
17+
headerPrefix: "Bearer "

jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,26 @@
1111

1212
import java.net.InetAddress;
1313
import java.net.UnknownHostException;
14+
import org.springframework.beans.factory.annotation.Value;
1415

1516
@Configuration
1617
@EnableElasticsearchRepositories
1718
public class ElasticSearchConfig {
19+
// MODIFIED
20+
@Value("${spring.data.elasticsearch.host}")
21+
private String host;
22+
23+
// MODIFIED
24+
@Value("${spring.data.elasticsearch.port}")
25+
private int port;
1826

1927
@Bean
2028
public Client client() {
2129
System.setProperty("es.set.netty.runtime.available.processors", "false");
2230
try {
2331
return new PreBuiltTransportClient(Settings.EMPTY)
24-
.addTransportAddress(new TransportAddress(InetAddress.getByName("localhost"), 9300));
25-
32+
// MODIFIED
33+
.addTransportAddress(new TransportAddress(InetAddress.getByName(host), port));
2634
} catch (UnknownHostException e) {
2735
throw new SpringStoreException("An error occured when configuring Elastic Search");
2836
}

jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,13 @@ spring.redis.port=6379
2020
spring.data.elasticsearch.repositories.enabled=true
2121
spring.data.elasticsearch.cluster-name=elasticsearch
2222
spring.data.elasticsearch.cluster-nodes=localhost:9300
23+
# MODIFIED
24+
spring.data.elasticsearch.host=localhost
25+
spring.data.elasticsearch.port=9300
26+
spring.elasticsearch.rest.uris=http://localhost:9200
27+
management.endpoint.health.show-details=always
28+
management.endpoints.web.exposure.include=health,info
29+
# MODIFIED
30+
2331
##########################################################################
2432
account.verification.url=http://localhost:8080/api/auth/accountVerification

jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ public String startSut() {
115115
"--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT),
116116
"--spring.data.elasticsearch.cluster-name=elasticsearch",
117117
"--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT),
118-
"--spring.cache.type=NONE"
118+
"--spring.elasticsearch.rest.uris=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(HTTP_PORT),
119+
"--spring.cache.type=NONE",
120+
"--spring.data.elasticsearch.host=" + elasticsearchContainer.getContainerIpAddress(),
121+
"--spring.data.elasticsearch.port=" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT)
119122
});
120123

121124
return "http://localhost:" + getSutPort();

jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,11 @@ public String[] getInputParameters() {
138138
"--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT),
139139
"--spring.data.elasticsearch.cluster-name=elasticsearch",
140140
"--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT),
141-
"--spring.cache.type=NONE"
142-
};
141+
"--spring.elasticsearch.rest.uris=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(HTTP_PORT),
142+
"--spring.cache.type=NONE",
143+
"--spring.data.elasticsearch.host=" + elasticsearchContainer.getContainerIpAddress(),
144+
"--spring.data.elasticsearch.port=" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT)
145+
};
143146
}
144147

145148
public String[] getJVMParameters() {
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#!/bin/bash
2-
# Import from fixtures
32

43
mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray

0 commit comments

Comments
 (0)