Skip to content

Commit 13c7232

Browse files
gortazargortazar
committed
Fix paging errors in PostController in ejem1-jmeter
1 parent d2ff871 commit 13c7232

6 files changed

Lines changed: 20 additions & 16 deletions

File tree

‎parte_5/ejem1-jmeter/PostController.java‎

Whitespace-only changes.

parte_5/ejem1-jmeter/docker-compose-1.yml renamed to parte_5/ejem1-jmeter/docker-compose.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ services:
1616
resources:
1717
limits:
1818
cpus: '1.0'
19-
memory: 512m
19+
memory: 1G
2020

21+
# Topología sin caché. App ejem1
2122
# spring-app:
2223
# build: ./ejem-1
2324
# environment:
@@ -35,6 +36,7 @@ services:
3536
# cpus: '1.0'
3637
# memory: 512m
3738

39+
# Topología Caché en memoria. App ejem2-cache-spring
3840
# spring-app:
3941
# build: ./ejem-2-cache
4042
# environment:
@@ -52,6 +54,7 @@ services:
5254
# cpus: '1.0'
5355
# memory: 512m
5456

57+
# Topología balanceador de carga y caché en memoria. App ejem2-cache-redis
5558
# spring-app:
5659
# build: ./ejem-2-cache
5760
# environment:
@@ -68,6 +71,7 @@ services:
6871
# cpus: '1.0'
6972
# memory: 512m
7073

74+
# Topología balanceador de carga y caché en Redis. App ejem2-cache-redis
7175
spring-app:
7276
build: ./ejem-2-cache-redis
7377
environment:
@@ -80,7 +84,7 @@ services:
8084
mysql-db:
8185
condition: service_healthy
8286
deploy:
83-
replicas: 3 # Con LB
87+
replicas: 1 # Con LB
8488
resources:
8589
limits:
8690
cpus: '1.0'

‎parte_5/ejem1-jmeter/ejem-1/src/main/java/es/codeurjc/board/controller/PostController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.data.domain.Page;
1212
import org.springframework.data.domain.PageRequest;
13+
import org.springframework.data.domain.Pageable;
1314
import org.springframework.http.ResponseEntity;
1415
import org.springframework.web.bind.annotation.DeleteMapping;
1516
import org.springframework.web.bind.annotation.GetMapping;
@@ -50,12 +51,11 @@ public void init() {
5051
}
5152

5253
@GetMapping("/")
53-
public Page<Post> getPosts(@RequestParam(required = false) PageRequest pageRequest) {
54+
public Page<Post> getPosts(@RequestParam(required = false) Pageable pageRequest) {
5455
if(pageRequest == null) {
55-
pageRequest = PageRequest.of(0, 10);
56+
pageRequest = PageRequest.of(0, 100);
5657
}
5758
return posts.findAll(pageRequest);
58-
//return posts.findAll();
5959
}
6060

6161
@GetMapping("/{id}")

‎parte_5/ejem1-jmeter/ejem-2-cache-redis/src/main/java/es/codeurjc/board/controller/PostController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.springframework.cache.annotation.Cacheable;
1313
import org.springframework.data.domain.Page;
1414
import org.springframework.data.domain.PageRequest;
15+
import org.springframework.data.domain.Pageable;
1516
import org.springframework.http.ResponseEntity;
1617
import org.springframework.web.bind.annotation.DeleteMapping;
1718
import org.springframework.web.bind.annotation.GetMapping;
@@ -53,12 +54,11 @@ public void init() {
5354

5455
@GetMapping("/")
5556
@Cacheable("posts")
56-
public Page<Post> getPosts(@RequestParam(required = false) PageRequest pageRequest) {
57+
public Page<Post> getPosts(@RequestParam(required = false) Pageable pageRequest) {
5758
if(pageRequest == null) {
5859
pageRequest = PageRequest.of(0, 10);
5960
}
6061
return posts.findAll(pageRequest);
61-
//return posts.findAll();
6262
}
6363

6464
@GetMapping("/{id}")

‎parte_5/ejem1-jmeter/ejem-2-cache/src/main/java/es/codeurjc/board/controller/PostController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.springframework.cache.annotation.Cacheable;
1313
import org.springframework.data.domain.Page;
1414
import org.springframework.data.domain.PageRequest;
15+
import org.springframework.data.domain.Pageable;
1516
import org.springframework.http.ResponseEntity;
1617
import org.springframework.web.bind.annotation.DeleteMapping;
1718
import org.springframework.web.bind.annotation.GetMapping;
@@ -53,12 +54,11 @@ public void init() {
5354

5455
@GetMapping("/")
5556
@Cacheable("posts")
56-
public Page<Post> getPosts(@RequestParam(required = false) PageRequest pageRequest) {
57+
public Page<Post> getPosts(@RequestParam(required = false) Pageable pageRequest) {
5758
if(pageRequest == null) {
58-
pageRequest = PageRequest.of(0, 10);
59+
pageRequest = PageRequest.of(0, 100);
5960
}
6061
return posts.findAll(pageRequest);
61-
//return posts.findAll();
6262
}
6363

6464
@GetMapping("/{id}")

‎parte_5/ejem1-jmeter/test_plan.jmx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<stringProp name="LoopController.loops">20</stringProp>
3131
</LoopController>
3232
<hashTree>
33-
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="GET /posts">
33+
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="GET /posts?page=1&amp;size=100">
3434
<stringProp name="HTTPSampler.domain">localhost</stringProp>
35-
<stringProp name="HTTPSampler.port">80</stringProp>
35+
<stringProp name="HTTPSampler.port">8090</stringProp>
3636
<stringProp name="HTTPSampler.path">/posts/</stringProp>
3737
<stringProp name="HTTPSampler.method">GET</stringProp>
3838
<boolProp name="HTTPSampler.postBodyRaw">false</boolProp>
@@ -41,7 +41,7 @@
4141
</elementProp>
4242
</HTTPSamplerProxy>
4343
<hashTree>
44-
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="JSON Header">
44+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="JSON Header" enabled="true">
4545
<collectionProp name="HeaderManager.headers">
4646
<elementProp name="" elementType="Header">
4747
<stringProp name="Header.name">Accept</stringProp>
@@ -54,7 +54,7 @@
5454
</hashTree>
5555
<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="POST /posts">
5656
<stringProp name="HTTPSampler.domain">localhost</stringProp>
57-
<stringProp name="HTTPSampler.port">80</stringProp>
57+
<stringProp name="HTTPSampler.port">8090</stringProp>
5858
<stringProp name="HTTPSampler.path">/posts/</stringProp>
5959
<stringProp name="HTTPSampler.method">POST</stringProp>
6060
<boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
@@ -74,7 +74,7 @@
7474
</elementProp>
7575
</HTTPSamplerProxy>
7676
<hashTree>
77-
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="JSON Header">
77+
<HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="JSON Header" enabled="true">
7878
<collectionProp name="HeaderManager.headers">
7979
<elementProp name="" elementType="Header">
8080
<stringProp name="Header.name">Content-Type</stringProp>
@@ -158,7 +158,7 @@
158158
<stringProp name="filename"></stringProp>
159159
</ResultCollector>
160160
<hashTree/>
161-
<ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph">
161+
<ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph" enabled="true">
162162
<boolProp name="ResultCollector.error_logging">false</boolProp>
163163
<objProp>
164164
<name>saveConfig</name>

0 commit comments

Comments
 (0)