Skip to content

Commit cbd99d5

Browse files
author
Alain BOUDARD
committed
fix: mfe configuration name
1 parent 490fc78 commit cbd99d5

File tree

6 files changed

+42
-35
lines changed

6 files changed

+42
-35
lines changed

application/ng-shell/src/app/decl.d.ts

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

application/ng-shell/webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = withModuleFederationPlugin({
99
"@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
1010
"@angular/router": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
1111
"@ngrx/store": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
12+
"core": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
1213
})
1314

1415
});

library/mfe1/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = withModuleFederationPlugin({
55
name: 'mfe1',
66

77
exposes: {
8-
'./Module': './src/app/orders/orders.module.ts',
8+
'./Orders': './src/app/orders/orders.module.ts',
99
},
1010

1111
// Explicitly share packages:
@@ -15,6 +15,7 @@ module.exports = withModuleFederationPlugin({
1515
"@angular/common/http": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
1616
"@angular/router": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
1717
"@ngrx/store": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
18+
"core": { singleton: true, strictVersion: true, requiredVersion: 'auto' },
1819
}),
1920

2021
});
Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.cit.mfe1.controllers;
22

3-
import java.util.ArrayList;
43
import java.util.List;
54

65
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,36 +20,8 @@ public String index() {
2120
}
2221

2322
@GetMapping("/api/orders")
24-
public List<Order> orders() {
25-
ArrayList<Order> list = new ArrayList<Order>();
26-
list.add(new Order("1", "Order 1", "Order 1 description"));
27-
list.add(new Order("2", "Order 2", "Order 2 description"));
28-
29-
return list;
30-
}
31-
32-
public static class Order {
33-
private String id;
34-
private String name;
35-
private String description;
36-
37-
public Order(String id, String name, String description) {
38-
this.id = id;
39-
this.name = name;
40-
this.description = description;
41-
}
42-
43-
public String getId() {
44-
return id;
45-
}
46-
47-
public String getName() {
48-
return name;
49-
}
50-
51-
public String getDescription() {
52-
return description;
53-
}
23+
public List<Mfe1Service.Order> orders() {
24+
return mfe1Service.getOrders();
5425
}
5526

5627
}

library/src/main/java/com/cit/mfe1/service/Mfe1Service.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.cit.mfe1.service;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import org.springframework.boot.context.properties.EnableConfigurationProperties;
47
import org.springframework.stereotype.Service;
58

9+
import com.cit.mfe1.controllers.Mfe1Controller;
10+
611
@Service
712
@EnableConfigurationProperties(ServiceProperties.class)
813
public class Mfe1Service {
@@ -16,4 +21,35 @@ public Mfe1Service(ServiceProperties serviceProperties) {
1621
public String message() {
1722
return this.serviceProperties.getMessage();
1823
}
24+
25+
public List<Order> getOrders() {
26+
ArrayList<Order> list = new ArrayList<Order>();
27+
list.add(new Order("1", "Order 1", "Order 1 description"));
28+
list.add(new Order("2", "Order 2", "Order 2 description"));
29+
return list;
30+
}
31+
32+
public static class Order {
33+
private String id;
34+
private String name;
35+
private String description;
36+
37+
public Order(String id, String name, String description) {
38+
this.id = id;
39+
this.name = name;
40+
this.description = description;
41+
}
42+
43+
public String getId() {
44+
return id;
45+
}
46+
47+
public String getName() {
48+
return name;
49+
}
50+
51+
public String getDescription() {
52+
return description;
53+
}
54+
}
1955
}

library/src/main/resources/mfe1.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mf.manifest = module
22
mf.manifest.remoteEntry = http://localhost:8080/ng-shell/mfe1/remoteEntry.js
3-
mf.manifest.exposedModule = ./Module
3+
mf.manifest.exposedModule = ./Orders
44
mf.manifest.displayName = Orders
55
mf.manifest.routePath = orders
66
mf.manifest.ngModuleName = OrdersModule

0 commit comments

Comments
 (0)