Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 0e02d5b

Browse files
committed
Update clients. Update Spring dep mgmt to 1.1.7 and Vaadin dep to 24.6.0. Chat requests are available from /chat and /stream/chat.
1 parent 623bf45 commit 0e02d5b

6 files changed

+20
-19
lines changed

build.gradle

+14-13
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ repositories {
2222

2323
ext {
2424
set('springCloudVersion', "2024.0.0")
25-
set('vaadinVersion', "24.5.8")
25+
set('vaadinVersion', "24.6.0")
2626
}
2727

2828
dependencies {
2929
implementation 'org.springframework.boot:spring-boot-starter-actuator'
30-
implementation 'org.springframework.boot:spring-boot-starter-web'
30+
implementation 'org.springframework.boot:spring-boot-starter-webflux'
3131
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
3232
implementation 'org.apache.commons:commons-collections4:4.4'
33+
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
3334
implementation 'io.github.openfeign:feign-hc5:13.5'
3435
implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:4.2.1'
3536
implementation 'com.vaadin:vaadin-spring-boot-starter'
@@ -78,17 +79,17 @@ kubernetes {
7879
}
7980
}
8081

81-
task setVersion {
82-
doLast {
83-
def newVersion = project.hasProperty('newVersion') ? project.newVersion : version
84-
ant.propertyfile(file: "gradle.properties") {
85-
entry(key: "version", value: newVersion)
86-
}
87-
}
82+
tasks.register('setVersion') {
83+
doLast {
84+
def newVersion = project.hasProperty('newVersion') ? project.newVersion : version
85+
ant.propertyfile(file: "gradle.properties") {
86+
entry(key: "version", value: newVersion)
87+
}
88+
}
8889
}
8990

90-
task printArtifactPath {
91-
doLast {
92-
println bootJar.archiveFile.get().asFile.absolutePath
93-
}
91+
tasks.register('printArtifactPath') {
92+
doLast {
93+
println bootJar.archiveFile.get().asFile.absolutePath
94+
}
9495
}

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
org.gradle.jvmargs=-Xmx4096m
12
version=0.0.1-SNAPSHOT

src/main/java/org/cftoolsuite/RobertUiApplication.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.cftoolsuite;
22

3+
import com.vaadin.flow.component.page.Push;
34
import org.springframework.boot.SpringApplication;
45
import org.springframework.boot.autoconfigure.SpringBootApplication;
56
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
@@ -11,6 +12,7 @@
1112
import com.vaadin.flow.theme.lumo.Lumo;
1213
import reactivefeign.spring.config.EnableReactiveFeignClients;
1314

15+
@Push
1416
@SpringBootApplication
1517
@EnableFeignClients
1618
@EnableReactiveFeignClients

src/main/java/org/cftoolsuite/client/RefactorClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public interface RefactorClient {
2222
@PostMapping(value = "/ingest")
2323
ResponseEntity<Void> ingest(@RequestBody IngestRequest request);
2424

25-
@PostMapping("/api/chat")
25+
@PostMapping("/chat")
2626
public ResponseEntity<String> chat(@RequestBody Inquiry inquiry);
2727

2828
@PostMapping(value = "/refactor")

src/main/java/org/cftoolsuite/client/RefactorStreamingClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@ReactiveFeignClient(name="refactor-streaming-service", url="${refactor.service.url}")
1010
public interface RefactorStreamingClient {
1111

12-
@PostMapping("/api/stream/chat")
12+
@PostMapping("/stream/chat")
1313
public Flux<String> streamResponseToQuestion(@RequestBody Inquiry inquiry);
1414
}
1515

src/main/java/org/cftoolsuite/config/RobertCfEnvPostProcessor.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ public boolean accept(CfService service) {
1818

1919
@Override
2020
public void process(CfCredentials cfCredentials, Map<String, Object> properties) {
21-
Map<String, Object> allCredentials = cfCredentials.getMap();
22-
for (Map.Entry<String, Object> entry : allCredentials.entrySet()) {
23-
properties.put(entry.getKey(), entry.getValue());
24-
}
21+
properties.putAll(cfCredentials.getMap());
2522
}
2623

2724
@Override

0 commit comments

Comments
 (0)