Skip to content

Commit 8e4d54f

Browse files
Update dependency io.micronaut.platform:micronaut-platform to v4.8.2 (#100)
* Update dependency io.micronaut.platform:micronaut-platform to v4.8.2
1 parent dcdd49b commit 8e4d54f

File tree

8 files changed

+21
-16
lines changed

8 files changed

+21
-16
lines changed

bpmn-process/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks.compileJava {
77
}
88

99
dependencies {
10-
annotationProcessor(mn.micronaut.json.schema.processor)
10+
//annotationProcessor(mn.micronaut.json.schema.processor)
1111
annotationProcessor(mn.lombok)
1212

1313
implementation(libs.lang)

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/importer/ExtractionMapping.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import com.jongsoft.finance.ProcessVariable;
44
import io.micronaut.serde.annotation.Serdeable;
55
import lombok.EqualsAndHashCode;
6-
import lombok.Getter;
76

87
import java.io.Serializable;
98

109
/**
1110
* Represents a mapping between an account name and an account ID.
1211
*/
13-
@Getter
1412
@Serdeable
1513
@EqualsAndHashCode(of = {"name"})
1614
public class ExtractionMapping implements ProcessVariable, Serializable {
@@ -22,4 +20,12 @@ public ExtractionMapping(String name, Long accountId) {
2220
this.name = name;
2321
this.accountId = accountId;
2422
}
23+
24+
public String getName() {
25+
return name;
26+
}
27+
28+
public Long getAccountId() {
29+
return accountId;
30+
}
2531
}

fintrack-api/src/main/resources/application.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ micronaut:
2626
get-allowed: true
2727
router:
2828
static-resources:
29-
favicon:
30-
paths: classpath:/assets/favicon.ico
31-
mapping: /favicon.ico
3229
docs:
3330
paths: classpath:/docs
3431
mapping: /openapi/**
@@ -88,4 +85,4 @@ otel:
8885
exporter: otlp
8986
instrumentation:
9087
jdbc:
91-
enabled: true
88+
enabled: true

fintrack-api/src/main/resources/public/.git-keep

Whitespace-only changes.

fintrack-api/src/test/java/com/jongsoft/finance/rest/contract/ContractResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ void warnExpiry(RequestSpecification spec) {
345345
final Contract contract = Mockito.mock(Contract.class);
346346

347347
when(contractProvider.lookup(1L)).thenReturn(Control.Option(contract));
348-
when(contract.getCompany()).thenReturn(Account.builder().user(ACTIVE_USER_IDENTIFIER).build());
348+
when(contract.getCompany()).thenReturn(Account.builder().id(1L).user(ACTIVE_USER_IDENTIFIER).build());
349349

350350
// @formatter:off
351351
spec
@@ -364,7 +364,7 @@ void attachment(RequestSpecification spec) {
364364
final Contract contract = Mockito.mock(Contract.class);
365365

366366
when(contractProvider.lookup(1L)).thenReturn(Control.Option(contract));
367-
when(contract.getCompany()).thenReturn(Account.builder().user(ACTIVE_USER_IDENTIFIER).build());
367+
when(contract.getCompany()).thenReturn(Account.builder().id(1L).user(ACTIVE_USER_IDENTIFIER).build());
368368

369369
// @formatter:off
370370
spec

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
micronautVersion=4.7.6
1+
micronautVersion=4.8.2
22
version=3.3.0-SNAPSHOT

learning/learning-module-rules/src/main/java/com/jongsoft/finance/rule/locator/AccountLocator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
import com.jongsoft.finance.core.RuleColumn;
44
import com.jongsoft.finance.providers.AccountProvider;
5-
import jakarta.inject.Inject;
65
import jakarta.inject.Singleton;
7-
import lombok.RequiredArgsConstructor;
86

97
import java.util.List;
108

119
@Singleton
12-
@RequiredArgsConstructor(onConstructor_ = @Inject)
1310
public class AccountLocator implements ChangeLocator {
1411

1512
private static final List<RuleColumn> SUPPORTED = List.of(
@@ -20,6 +17,10 @@ public class AccountLocator implements ChangeLocator {
2017

2118
private final AccountProvider accountProvider;
2219

20+
public AccountLocator(AccountProvider accountProvider) {
21+
this.accountProvider = accountProvider;
22+
}
23+
2324
@Override
2425
public Object locate(RuleColumn column, String change) {
2526
return accountProvider.lookup(Long.parseLong(change)).get();

learning/learning-module-rules/src/main/java/com/jongsoft/finance/rule/locator/RelationLocator.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
import com.jongsoft.finance.domain.user.Category;
77
import com.jongsoft.finance.providers.DataProvider;
88
import io.micronaut.context.ApplicationContext;
9-
import jakarta.inject.Inject;
109
import jakarta.inject.Singleton;
11-
import lombok.RequiredArgsConstructor;
1210

1311
import java.util.List;
1412

1513
@Singleton
16-
@RequiredArgsConstructor(onConstructor_ = @Inject)
1714
public class RelationLocator implements ChangeLocator {
1815

1916
private final static List<RuleColumn> SUPPORTED_COLUMNS = List.of(
@@ -23,6 +20,10 @@ public class RelationLocator implements ChangeLocator {
2320

2421
private final ApplicationContext applicationContext;
2522

23+
public RelationLocator(ApplicationContext applicationContext) {
24+
this.applicationContext = applicationContext;
25+
}
26+
2627
@Override
2728
public Object locate(RuleColumn column, String change) {
2829
Class<?> genericType = switch (column) {

0 commit comments

Comments
 (0)