Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '21'
java-version: '25'
distribution: 'liberica'
cache: maven

Expand Down
20 changes: 2 additions & 18 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

# Later may be supported by
jdk:
- openjdk11
- openjdk25
4 changes: 4 additions & 0 deletions lombok.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Fixes compile time warning
# Spring Boot 4 requires Jackson 3
# See https://projectlombok.org/features/experimental/Jacksonized
lombok.jacksonized.jacksonVersion += 3
50 changes: 43 additions & 7 deletions mvnw

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 48 additions & 8 deletions mvnw.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 17 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<groupId>org.spacious-team</groupId>
<artifactId>broker-report-parser-api</artifactId>
<version>2025.1</version>
<version>2026.1</version>
<packaging>jar</packaging>

<name>Broker Report Parser API</name>
Expand All @@ -43,11 +43,11 @@
</scm>

<properties>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<lombok.version>1.18.38</lombok.version>
<checkerframework.version>3.49.1</checkerframework.version>
<lombok.version>1.18.46</lombok.version>
<checkerframework.version>4.2.0</checkerframework.version>
</properties>

<repositories>
Expand All @@ -69,7 +69,7 @@
<dependency>
<groupId>com.github.spacious-team</groupId>
<artifactId>table-wrapper-api</artifactId>
<version>2025.1</version>
<version>2026.1</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand All @@ -85,15 +85,15 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.18.3</version>
<version>3.2.0</version> <!-- Spring Boot 4 requires Jackson 3 -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.30</version>
<artifactId>swagger-annotations-jakarta</artifactId>
<version>2.2.52</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -105,19 +105,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.12.2</version>
<version>6.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.17.0</version>
<version>5.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.19.3</version>
<version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -127,15 +127,15 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.3</version> <!-- JUnit 5 requirement -->
<version>3.5.6</version> <!-- JUnit 5 requirement -->
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<configuration>
<fork>true</fork> <!-- Must fork or else JVM arguments are ignored. -->
<showDeprecation>true</showDeprecation>
Expand Down Expand Up @@ -168,6 +168,7 @@
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
Expand All @@ -178,7 +179,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.13</version>
<version>0.8.15</version>
<executions>
<execution>
<id>prepare-agent</id>
Expand All @@ -198,7 +199,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@
@Jacksonized
@Builder(toBuilder = true)
@EqualsAndHashCode(cacheStrategy = LAZY)
@Schema(name = "Счет")
public class Portfolio {
@Schema(name = "Account")
public class Account {

@Schema(description = "Номер счета в системе учета брокера", example = "10200I", requiredMode = REQUIRED)
@Schema(description = "Account number in the broker's accounting system", example = "10200I", requiredMode = REQUIRED)
private final @NotEmpty String id;

@Schema(description = "Признак активного счета: если false то счет исключается из аналитического расчета",
requiredMode = REQUIRED)
@Schema(description = "Active account flag: if false, the account is archived", requiredMode = REQUIRED)
@Builder.Default
private final boolean enabled = true;
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,26 @@
@Builder(toBuilder = true)
@EqualsAndHashCode(cacheStrategy = LAZY)
@JsonInclude(JsonInclude.Include.NON_NULL)
@Schema(name = "Остаток денежных средств")
public class PortfolioCash {
@Schema(name = "AccountCash")
public class AccountCash {
// autoincrement
@Schema(description = "Внутренний идентификатор", example = "123", nullable = true)
@Schema(description = "Record ID", example = "123", nullable = true)
private final @Nullable Integer id;

@Schema(description = "Номер счета в системе учета брокера", example = "10200I", requiredMode = REQUIRED)
private final @NotEmpty String portfolio;
@Schema(description = "Account number in the broker's accounting system", example = "10200I", requiredMode = REQUIRED)
private final @NotEmpty String account;

@Schema(description = "Значение актуально на дату", example = "2021-01-23T12:00:00+03:00", requiredMode = REQUIRED)
@Schema(description = "Date and time", example = "2021-01-23T12:00:00+03:00", requiredMode = REQUIRED)
private final Instant timestamp;

@Schema(description = "Рынок", example = "Фондовый", requiredMode = REQUIRED)
@Schema(description = "Market", example = "Stock market", requiredMode = REQUIRED)
private final String market;

@EqualsAndHashCode.Exclude
@Schema(description = "Остаток денежных средств", example = "102.30", requiredMode = REQUIRED)
@Schema(description = "Cash balance", example = "102.30", requiredMode = REQUIRED)
private final BigDecimal value;

@Schema(description = "Валюта", example = "RUB", requiredMode = REQUIRED)
@Schema(description = "Currency", example = "RUB", requiredMode = REQUIRED)
private final @NotEmpty String currency;

@EqualsAndHashCode.Include
Expand Down
Loading
Loading