Skip to content

fix example tests #2610

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
predic8 merged 5 commits into from
Jan 13, 2026
Merged

fix example tests #2610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0131555
set registry on router before initing
rrayst Jan 13, 2026
0da963e
use undeletable fruit for demo
rrayst Jan 13, 2026
eab7394
use undeletable fruit for demo
rrayst Jan 13, 2026
f9410d1
removed unused import
rrayst Jan 13, 2026
5ca13a6
use undeletable fruit for demo
rrayst Jan 13, 2026
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
1 change: 1 addition & 0 deletions core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ private static Router initRouterByYAML(String location) throws Exception {

GrammarAutoGenerated grammar = new GrammarAutoGenerated();
BeanRegistryImplementation reg = new BeanRegistryImplementation(grammar);
router.setRegistry(reg);
reg.register("router", router);

getConfigDefinition(reg.parseYamlBeanDefinitions(router.getResolverMap().resolve(location), grammar))
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/com/predic8/membrane/core/kubernetes/KubernetesWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.predic8.membrane.annot.beanregistry.AsyncBeanCollector;
import com.predic8.membrane.annot.beanregistry.BeanCollector;
import com.predic8.membrane.annot.beanregistry.BeanDefinition;
import com.predic8.membrane.annot.beanregistry.BeanRegistryImplementation;
import com.predic8.membrane.annot.yaml.*;
import com.predic8.membrane.core.config.spring.*;
import com.predic8.membrane.core.interceptor.kubernetes.*;
Expand Down Expand Up @@ -47,9 +46,9 @@ public class KubernetesWatcher {
public KubernetesWatcher(DefaultRouter router) {
this.router = router;
this.grammar = new GrammarAutoGenerated();
var br = new BeanRegistryImplementation(grammar);
var br = router.getRegistry();
br.register("router", router);
this.beanRegistry = new AsyncBeanCollector(br);
this.beanRegistry = new AsyncBeanCollector((BeanCollector) br);
}

public void start() {
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/com/predic8/membrane/tutorials/advanced/PathParameterRoutingTutorialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ void pathParameterRouting() {
// @formatter:off
given()
.when()
.get("http://localhost:2000/fruits/7")
.get("http://localhost:2000/fruits/12")
.then()
.statusCode(200)
.body("id", equalTo(7))
.body("id", equalTo(12))
.body("name", notNullValue())
.body("modified_at", notNullValue());
// @formatter:on
Expand Down
8 changes: 4 additions & 4 deletions ...tion/src/test/java/com/predic8/membrane/tutorials/advanced/PathRewritingTutorialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ void consoleLogs() {
// @formatter:off
given()
.when()
.get("http://localhost:2000/fruits/7")
.get("http://localhost:2000/fruits/12")
.then()
.statusCode(200)
.body("id", equalTo(7))
.body("id", equalTo(12))
.body("name", notNullValue())
.body("modified_at", notNullValue());
// @formatter:on
Expand All @@ -57,8 +57,8 @@ void consoleLogs() {
String console = out.toString();
System.out.println(console);
assertTrue(console.contains("INFO LogInterceptor"));
assertTrue(console.contains("Requested /fruits/7"));
assertTrue(console.contains("Rewritten /shop/v2/products/7"));
assertTrue(console.contains("Requested /fruits/12"));
assertTrue(console.contains("Rewritten /shop/v2/products/12"));
}
}
}
2 changes: 1 addition & 1 deletion distribution/tutorials/advanced/20-Path-Parameter-Routing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Try:
#
# curl http://localhost:2000/fruits/7
# curl http://localhost:2000/fruits/12

api:
port: 2000
Expand Down
2 changes: 1 addition & 1 deletion distribution/tutorials/advanced/30-Path-Rewriting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Try:
#
# curl http://localhost:2000/fruits/7
# curl http://localhost:2000/fruits/12
#
# Observe the log output.

Expand Down
Loading