From bc30b3f93218c0bc858f4c2a6df363c440e5d9d0 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 16:14:07 +0000 Subject: [PATCH 1/2] feat: COBOL-to-Java Spring Boot migration (5 phases) Phase 1: Spring Boot 3.2.4 project with Gradle, Java 17+ Phase 2: JPA entity, repository, DB migration for Account CRUD Phase 3: AccountService, StringUtils, NumericUtils, FileMergeService, SubProgramService Phase 4: JSON (Jackson), XML (JAXB), Report generation services Phase 5: CLI menu, CommandLineArgs, REST API controller - 41 tests passing (unit + integration) - H2 in-memory DB for tests, PostgreSQL for production - Comprehensive README.md and MIGRATION_NOTES.md - All Java classes include Javadoc referencing original COBOL sources - No COBOL files modified or deleted Co-Authored-By: Jerry Oliphant --- java-migration/.gitignore | 13 + java-migration/MIGRATION_NOTES.md | 162 ++++++++++++ java-migration/README.md | 142 ++++++++++ java-migration/build.gradle | 40 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + java-migration/gradlew | 249 ++++++++++++++++++ java-migration/gradlew.bat | 92 +++++++ java-migration/settings.gradle | 1 + .../CobolMigrationApplication.java | 18 ++ .../com/cobolmigration/cli/AccountCli.java | 179 +++++++++++++ .../cli/CommandLineArgsRunner.java | 62 +++++ .../controller/AccountController.java | 128 +++++++++ .../com/cobolmigration/dto/RecordDto.java | 78 ++++++ .../com/cobolmigration/dto/RecordXmlDto.java | 82 ++++++ .../com/cobolmigration/model/Account.java | 146 ++++++++++ .../cobolmigration/model/CustomerRecord.java | 112 ++++++++ .../cobolmigration/model/StudentRecord.java | 91 +++++++ .../repository/AccountRepository.java | 51 ++++ .../service/AccountService.java | 126 +++++++++ .../service/FileMergeService.java | 96 +++++++ .../cobolmigration/service/JsonService.java | 76 ++++++ .../cobolmigration/service/ReportService.java | 109 ++++++++ .../service/SubProgramService.java | 175 ++++++++++++ .../cobolmigration/service/XmlService.java | 84 ++++++ .../com/cobolmigration/util/NumericUtils.java | 119 +++++++++ .../com/cobolmigration/util/StringUtils.java | 159 +++++++++++ .../src/main/resources/application.properties | 16 ++ .../migration/V1__create_accounts_table.sql | 49 ++++ .../controller/AccountControllerTest.java | 164 ++++++++++++ .../repository/AccountRepositoryTest.java | 105 ++++++++ .../service/AccountServiceTest.java | 119 +++++++++ .../service/FileMergeServiceTest.java | 83 ++++++ .../service/JsonServiceTest.java | 67 +++++ .../service/ReportServiceTest.java | 91 +++++++ .../service/SubProgramServiceTest.java | 86 ++++++ .../service/XmlServiceTest.java | 84 ++++++ .../cobolmigration/util/NumericUtilsTest.java | 80 ++++++ .../cobolmigration/util/StringUtilsTest.java | 172 ++++++++++++ .../resources/application-test.properties | 11 + 40 files changed, 3724 insertions(+) create mode 100644 java-migration/.gitignore create mode 100644 java-migration/MIGRATION_NOTES.md create mode 100644 java-migration/README.md create mode 100644 java-migration/build.gradle create mode 100644 java-migration/gradle/wrapper/gradle-wrapper.jar create mode 100644 java-migration/gradle/wrapper/gradle-wrapper.properties create mode 100755 java-migration/gradlew create mode 100644 java-migration/gradlew.bat create mode 100644 java-migration/settings.gradle create mode 100644 java-migration/src/main/java/com/cobolmigration/CobolMigrationApplication.java create mode 100644 java-migration/src/main/java/com/cobolmigration/cli/AccountCli.java create mode 100644 java-migration/src/main/java/com/cobolmigration/cli/CommandLineArgsRunner.java create mode 100644 java-migration/src/main/java/com/cobolmigration/controller/AccountController.java create mode 100644 java-migration/src/main/java/com/cobolmigration/dto/RecordDto.java create mode 100644 java-migration/src/main/java/com/cobolmigration/dto/RecordXmlDto.java create mode 100644 java-migration/src/main/java/com/cobolmigration/model/Account.java create mode 100644 java-migration/src/main/java/com/cobolmigration/model/CustomerRecord.java create mode 100644 java-migration/src/main/java/com/cobolmigration/model/StudentRecord.java create mode 100644 java-migration/src/main/java/com/cobolmigration/repository/AccountRepository.java create mode 100644 java-migration/src/main/java/com/cobolmigration/service/AccountService.java create mode 100644 java-migration/src/main/java/com/cobolmigration/service/FileMergeService.java create mode 100644 java-migration/src/main/java/com/cobolmigration/service/JsonService.java create mode 100644 java-migration/src/main/java/com/cobolmigration/service/ReportService.java create mode 100644 java-migration/src/main/java/com/cobolmigration/service/SubProgramService.java create mode 100644 java-migration/src/main/java/com/cobolmigration/service/XmlService.java create mode 100644 java-migration/src/main/java/com/cobolmigration/util/NumericUtils.java create mode 100644 java-migration/src/main/java/com/cobolmigration/util/StringUtils.java create mode 100644 java-migration/src/main/resources/application.properties create mode 100644 java-migration/src/main/resources/db/migration/V1__create_accounts_table.sql create mode 100644 java-migration/src/test/java/com/cobolmigration/controller/AccountControllerTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/repository/AccountRepositoryTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/service/AccountServiceTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/service/FileMergeServiceTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/service/JsonServiceTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/service/ReportServiceTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/service/SubProgramServiceTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/service/XmlServiceTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/util/NumericUtilsTest.java create mode 100644 java-migration/src/test/java/com/cobolmigration/util/StringUtilsTest.java create mode 100644 java-migration/src/test/resources/application-test.properties diff --git a/java-migration/.gitignore b/java-migration/.gitignore new file mode 100644 index 0000000..2469533 --- /dev/null +++ b/java-migration/.gitignore @@ -0,0 +1,13 @@ +# Gradle +.gradle/ +build/ + +# IDE +.classpath +.project +.settings/ +.idea/ +*.iml + +# OS +.DS_Store diff --git a/java-migration/MIGRATION_NOTES.md b/java-migration/MIGRATION_NOTES.md new file mode 100644 index 0000000..9010025 --- /dev/null +++ b/java-migration/MIGRATION_NOTES.md @@ -0,0 +1,162 @@ +# Migration Notes: COBOL to Java Spring Boot + +This document records the key translation decisions made during the migration from GnuCOBOL to Java Spring Boot. + +## Data Type Translations + +### COBOL PIC Clauses to Java Types + +| COBOL Type | Example | Java Type | Notes | +|---|---|---|---| +| `PIC X(n)` | `PIC X(8)` | `String` | `.trim()` applied at data boundaries to handle COBOL space-padding | +| `PIC 9(n)` | `PIC 9(5)` | `int` or `long` | Width mapped to appropriate integer type | +| `PIC 9(n) COMP` | `PIC 999 COMP` | `BigDecimal` (via `NumericUtils.fromComp`) | Binary integer storage → BigDecimal for precision | +| `PIC COMP-2` | `ws-total COMP-2` | `BigDecimal` (via `NumericUtils.fromComp2`) | Double-precision float → BigDecimal to avoid FP errors | +| `PIC COMP-3` | Packed decimal | `BigDecimal` (via `NumericUtils.fromComp3`) | BCD packed → BigDecimal with explicit scale | +| `PIC COMP-5` | `PIC S9(4) COMP-5` | `int` | Native binary → primitive int | +| `PIC X` (single char) | `ws-sql-account-is-enabled` | `Character` | Single character fields map to Character wrapper | +| `PIC X(20)` (timestamp) | `ws-sql-account-create-dt` | `LocalDateTime` | COBOL string timestamps → Java temporal types | +| `PIC ZZ9` | Dynamic display | `String` via `NumericUtils.toDynamicDisplay` | Leading zero suppression | +| 88-level conditions | `88 ws-account-enabled VALUE 'Y'` | Boolean methods or Character comparison | Condition names → explicit comparisons | + +### REDEFINES → Inheritance / Conversion Methods + +COBOL `REDEFINES` allows multiple interpretations of the same memory area. In Java: +- **Simple redefines**: Use type conversion methods (e.g., `Integer.parseInt(stringField)`) +- **Complex redefines**: Use separate classes with conversion constructors +- **Union-type redefines**: Use Java records or sealed classes with pattern matching + +Example from `redifines/redefines.cbl`: A COMP-2 field redefining a PIC X field becomes a conversion method that parses the string representation into a BigDecimal. + +## Database Layer Translations + +### Cursor Fetch → JPA Queries + +| COBOL Pattern | Java Equivalent | +|---|---| +| `DECLARE cursor CURSOR FOR SELECT...` | Spring Data JPA method or `@Query` annotation | +| `OPEN cursor` | Implicit (JPA manages connection lifecycle) | +| `FETCH cursor INTO :host-vars` | Return value from repository method | +| `CLOSE cursor` | Implicit (JPA manages connection lifecycle) | +| `CONNECT TO :connection-string` | `application.properties` + Spring auto-configuration | +| `CONNECT RESET` | Implicit (connection pool management) | +| `SQLSTATE` / `SQLCODE` checking | Exception handling (try/catch or `@Transactional`) | + +### Specific Cursor Mappings + +| COBOL Cursor | SQL | Java Method | +|---|---|---| +| `ACCOUNT-ALL-CUR` | `SELECT ... FROM ACCOUNTS ORDER BY ID` | `findAllByOrderByIdAsc()` | +| `ACCOUNT-DISABLED-CUR` | `SELECT ... WHERE IS_ENABLED = 'N' ORDER BY ID` | `findByIsEnabledOrderByIdAsc('N')` | +| `ACCOUNT-QUERY-CUR` | `SELECT ... WHERE FIRST_NAME LIKE :val OR ...` | `searchAccounts(String)` with `@Query` | + +### Variable-Length Strings in SQL + +COBOL uses `PIC S9(4) COMP-5` + `PIC X(50)` pair for variable-length strings in WHERE clauses (sql_example.cbl lines 65-67). In Java, JPA/JDBC handles string length automatically — no special handling needed. + +## Subprogram Call Translations + +### BY CONTENT vs BY REFERENCE + +| COBOL Pattern | Java Equivalent | Semantics | +|---|---|---| +| `CALL "sub" USING BY CONTENT ws-var` | `callByContent(String value)` | Pass immutable copy — caller's variable unchanged | +| `CALL "sub" USING ws-var` (BY REFERENCE) | `callByReference(MutableString ref)` | Pass mutable wrapper — caller's variable can be modified | +| `CANCEL "sub-app"` | `cancel()` | Reset service instance state | + +### Storage Section Mapping + +| COBOL Section | Java Equivalent | Lifetime | +|---|---|---| +| WORKING-STORAGE SECTION | Instance fields | Persists between method calls until `cancel()` | +| LOCAL-STORAGE SECTION | Method-local variables | Fresh on each invocation | +| LINKAGE SECTION | Method parameters | Passed by caller | + +## File Processing Translations + +### SORT/MERGE → Java Collections + +| COBOL Statement | Java Equivalent | +|---|---| +| `MERGE fd ON ASCENDING KEY f-id USING f1 f2 GIVING f-out` | Read both files → `ArrayList.addAll()` → `Collections.sort()` → write output | +| `SORT fd ON DESCENDING KEY f-contract-id USING f-in GIVING f-out` | Read file → `sort(Comparator.reversed())` → write output | +| `SD fd-sorting-file` (sort description) | Not needed — sorting is in-memory | +| File status checking (`ws-fs-status`) | IOException handling | + +### Fixed-Width Records + +COBOL FD records use fixed-width fields defined by PIC clauses. In Java: +- Parsing: `String.substring()` with calculated offsets +- Writing: `String.format()` with width specifiers +- The `CustomerRecord.fromFixedWidth()` and `toString()` methods handle this conversion + +## Serialization Translations + +### JSON GENERATE → Jackson + +| COBOL Feature | Jackson Equivalent | +|---|---| +| `JSON GENERATE ws-output FROM ws-record` | `objectMapper.writeValueAsString(dto)` | +| `NAME OF ws-field IS "jsonName"` | `@JsonProperty("jsonName")` | +| `COUNT IN ws-count` | `json.length()` | +| Suppress blank fields | `@JsonInclude(JsonInclude.Include.NON_EMPTY)` | + +### XML GENERATE → JAXB + +| COBOL Feature | JAXB Equivalent | +|---|---| +| `XML GENERATE ws-output FROM ws-record` | `marshaller.marshal(dto, writer)` | +| `WITH XML-DECLARATION` | `Marshaller.JAXB_FRAGMENT = false` | +| `NAME OF ws-field IS "xmlName"` | `@XmlElement(name = "xmlName")` | +| `TYPE OF ws-field IS ATTRIBUTE` | `@XmlAttribute(name = "attrName")` | +| `SUPPRESS WHEN SPACES` | Set field to `null` in constructor when blank | +| `COUNT IN ws-count` | `xml.length()` | + +## Report Writer Translation + +### RD (Report Description) → ReportService + +| COBOL Feature | Java Equivalent | +|---|---| +| `RD r-report PAGE LIMIT IS 66` | `PAGE_LIMIT = 66` constant | +| `HEADING IS 1` | Header generated at start of each page | +| `FIRST DETAIL 6` | Detail lines start after 5 header lines | +| `LAST DETAIL 42` | `maxDetailsPerPage = 42 - 6 + 1 = 37` | +| `TYPE REPORT HEADING` | `generatePageHeader()` method | +| `TYPE DETAIL LINE PLUS 1` | `formatDetailLine()` method | +| `SOURCE page-counter` | `pageNumber` local variable | +| `INITIATE r-report` | Constructor / method start | +| `GENERATE report-line` | Add formatted line to list | +| `TERMINATE r-report` | Return the complete list | + +## String Operation Translations + +| COBOL Operation | Java Equivalent | Source File | +|---|---|---| +| `FUNCTION TRIM(val)` | `String.trim()` / `StringUtils.trim()` | `trim/trim.cbl` | +| `FUNCTION TRIM(val LEADING)` | `String.stripLeading()` | `trim/trim.cbl` | +| `FUNCTION TRIM(val TRAILING)` | `String.stripTrailing()` | `trim/trim.cbl` | +| `UNSTRING src DELIMITED BY delim INTO dest1 dest2` | `StringUtils.unstring()` / `String.split()` | `unstring/unstring.cbl` | +| `val IS NUMERIC` | `StringUtils.isNumeric()` (regex) | `is_numeric/is_numeric.cbl` | +| `FUNCTION NUMVAL(val)` | `StringUtils.numval()` → `BigDecimal` | `numval_test/numval_test.cbl` | +| `ACCEPT val FROM COMMAND-LINE` | `ApplicationArguments.getSourceArgs()` | `read_command_args/` | +| `INSPECT ... TALLYING ... FOR ALL` | `String.contains()` / stream count | `read_command_args/` | +| `FUNCTION UPPER-CASE(val)` | `String.toUpperCase()` | `sql_example.cbl` | +| `FUNCTION LOWER-CASE(val)` | `String.toLowerCase()` | `read_cmd_line_args.cbl` | +| `FUNCTION STORED-CHAR-LENGTH(val)` | `String.length()` (after trim) | `sql_example.cbl` | + +## Design Decisions + +1. **BigDecimal over primitives**: All financial/numeric-precision fields use `BigDecimal` to prevent floating-point errors that COBOL's packed decimal types naturally avoid. + +2. **`.trim()` at boundaries**: COBOL PIC X fields are right-padded with spaces. We apply `.trim()` when reading from database, files, or user input to normalize data. + +3. **Spring profiles for CLI vs REST**: The `cli` profile activates the interactive Scanner-based menu. The default profile runs only the REST API, providing a modern HTTP interface. + +4. **H2 for testing**: Tests use an in-memory H2 database in PostgreSQL compatibility mode, avoiding the need for a running PostgreSQL instance during CI/CD. + +5. **No ORM for file processing**: The `FileMergeService` uses plain file I/O (`java.nio.file`) rather than JPA, since the COBOL SORT/MERGE operates on sequential files, not database tables. + +6. **Mutable wrapper for by-reference**: Java strings are immutable, so we introduced `SubProgramService.MutableString` to faithfully model COBOL's CALL BY REFERENCE semantics where the called program can modify the caller's variables. + +7. **Null for SUPPRESS WHEN SPACES**: COBOL's `SUPPRESS WHEN SPACES` in XML GENERATE is implemented by setting blank fields to `null` in the DTO constructor, which causes JAXB to omit them from output. diff --git a/java-migration/README.md b/java-migration/README.md new file mode 100644 index 0000000..5d2fb6c --- /dev/null +++ b/java-migration/README.md @@ -0,0 +1,142 @@ +# COBOL-to-Java Spring Boot Migration + +This directory contains the Java Spring Boot equivalent of the COBOL programs in the parent repository. The migration preserves the original business logic while modernizing the technology stack. + +## Technology Stack + +- **Java 17+** +- **Spring Boot 3.2.x** +- **Spring Data JPA** (replaces embedded SQL / ODBC) +- **PostgreSQL** (same database as COBOL version) +- **Jackson** (replaces COBOL JSON GENERATE) +- **JAXB** (replaces COBOL XML GENERATE) +- **JUnit 5 + AssertJ** (testing) +- **H2** (in-memory database for tests) +- **Gradle** (build system) + +## Project Structure + +``` +java-migration/ +├── build.gradle +├── settings.gradle +├── README.md +├── MIGRATION_NOTES.md +├── src/ +│ ├── main/ +│ │ ├── java/com/cobolmigration/ +│ │ │ ├── CobolMigrationApplication.java # Spring Boot entry point +│ │ │ ├── model/ +│ │ │ │ ├── Account.java # JPA entity (sql_example.cbl) +│ │ │ │ ├── CustomerRecord.java # File record (merge_sort_test.cbl) +│ │ │ │ └── StudentRecord.java # Report record (report_test.cbl) +│ │ │ ├── repository/ +│ │ │ │ └── AccountRepository.java # JPA repository (3 COBOL cursors) +│ │ │ ├── service/ +│ │ │ │ ├── AccountService.java # Account CRUD (sql_example.cbl) +│ │ │ │ ├── FileMergeService.java # SORT/MERGE (merge_sort_test.cbl) +│ │ │ │ ├── SubProgramService.java # CALL patterns (sub_program/) +│ │ │ │ ├── JsonService.java # JSON gen (json_generate.cbl) +│ │ │ │ ├── XmlService.java # XML gen (xml_generate.cbl) +│ │ │ │ └── ReportService.java # Report Writer (report_test.cbl) +│ │ │ ├── dto/ +│ │ │ │ ├── RecordDto.java # JSON DTO with @JsonProperty +│ │ │ │ └── RecordXmlDto.java # XML DTO with @XmlAttribute +│ │ │ ├── util/ +│ │ │ │ ├── StringUtils.java # TRIM, UNSTRING, IS NUMERIC, NUMVAL +│ │ │ │ └── NumericUtils.java # COMP/COMP-3 handling +│ │ │ ├── cli/ +│ │ │ │ ├── AccountCli.java # Interactive menu (sql_example.cbl) +│ │ │ │ └── CommandLineArgsRunner.java # CLI args (read_cmd_line_args.cbl) +│ │ │ └── controller/ +│ │ │ └── AccountController.java # REST API alternative +│ │ └── resources/ +│ │ ├── application.properties # DB config +│ │ └── db/migration/ +│ │ └── V1__create_accounts_table.sql # Schema + seed data +│ └── test/ +│ ├── java/com/cobolmigration/ +│ │ ├── repository/AccountRepositoryTest.java +│ │ ├── service/ +│ │ │ ├── AccountServiceTest.java +│ │ │ ├── FileMergeServiceTest.java +│ │ │ ├── SubProgramServiceTest.java +│ │ │ ├── JsonServiceTest.java +│ │ │ ├── XmlServiceTest.java +│ │ │ └── ReportServiceTest.java +│ │ ├── util/ +│ │ │ ├── StringUtilsTest.java +│ │ │ └── NumericUtilsTest.java +│ │ └── controller/AccountControllerTest.java +│ └── resources/ +│ └── application-test.properties +``` + +## COBOL Module to Java Mapping + +| COBOL Module | COBOL File(s) | Java Equivalent | Description | +|---|---|---|---| +| SQL Database Access | `sql/sql_example.cbl` | `Account.java`, `AccountRepository.java`, `AccountService.java` | PostgreSQL CRUD with cursors → JPA + Spring Data | +| SQL Schema | `sql/create_test_db.sql` | `V1__create_accounts_table.sql` | Database schema and seed data | +| JSON Generation | `json_generate/json_generate.cbl` | `RecordDto.java`, `JsonService.java` | JSON GENERATE → Jackson ObjectMapper | +| XML Generation | `xml_generate/xml_generate.cbl` | `RecordXmlDto.java`, `XmlService.java` | XML GENERATE → JAXB Marshaller | +| Sort/Merge | `merge_sort/merge_sort_test.cbl` | `CustomerRecord.java`, `FileMergeService.java` | SORT/MERGE → Collections.sort + Streams | +| Report Writer | `report_writer/report_test.cbl` | `StudentRecord.java`, `ReportService.java` | RD report → String.format() | +| Subprogram Calls | `sub_program/main_app.cbl`, `sub_program/sub.cbl` | `SubProgramService.java` | CALL BY CONTENT/REFERENCE → method params | +| String Trim | `trim/trim.cbl` | `StringUtils.trim/trimLeading/trimTrailing` | FUNCTION TRIM → String.strip* | +| Unstring | `unstring/unstring.cbl` | `StringUtils.unstring()` | UNSTRING → String.split with regex | +| Is Numeric | `is_numeric/is_numeric.cbl` | `StringUtils.isNumeric()` | IS NUMERIC → regex pattern | +| Numval | `numval_test/numval_test.cbl` | `StringUtils.numval()` | FUNCTION NUMVAL → BigDecimal parsing | +| COMP Types | `comp_test/comp_test.cbl` | `NumericUtils` | COMP/COMP-2/COMP-3 → BigDecimal | +| Command Args | `read_command_args/read_cmd_line_args.cbl` | `CommandLineArgsRunner.java` | ACCEPT FROM COMMAND-LINE → ApplicationArguments | +| Terminal Menu | `sql/sql_example.cbl` (menu loop) | `AccountCli.java` | ACCEPT/DISPLAY menu → Scanner-based CLI | +| REST API | N/A (new) | `AccountController.java` | Modern HTTP alternative to terminal UI | +| Accept Input | `accept/accept.cbl`, `accept/accept_from.cbl` | Covered by CLI + Spring Boot args | ACCEPT → Scanner / ApplicationArguments | +| Secure Accept | `accept/accept-secure.cbl` | Covered by CLI (Console.readPassword) | ACCEPT SECURE → Console.readPassword | +| Display | `display_test/display_test.cbl` | Standard System.out.println | DISPLAY → println | +| Display Timing | `display_timing/display_timing.cbl` | System.nanoTime() | ACCEPT FROM TIME → Instant.now() | +| Screen Size | `screen_size/get_screen_size.cbl` | N/A (terminal-specific) | CBL_GET_SCR_SIZE → not applicable in web context | +| Mouse Input | `mouse/mouse.cbl` | N/A (terminal-specific) | Mouse drawing → not applicable | +| Search/Search All | `search/search.cbl` | Java Collections / binary search | SEARCH/SEARCH ALL → List operations | +| Redefines | `redifines/redefines.cbl` | Java inheritance / conversion methods | REDEFINES → type conversion | + +## Running the Application + +### Prerequisites +- Java 17+ +- PostgreSQL with `cobol_db_example` database (see `sql/create_test_db.sql`) + +### Build +```bash +cd java-migration +./gradlew build +``` + +### Run (REST API mode) +```bash +./gradlew bootRun +``` +The REST API will be available at `http://localhost:8080/accounts`. + +### Run (CLI mode) +```bash +./gradlew bootRun --args='--spring.profiles.active=cli' +``` + +### Run Tests +```bash +./gradlew test +``` + +## REST API Endpoints + +| Method | Endpoint | Description | COBOL Equivalent | +|---|---|---|---| +| GET | `/accounts` | List all accounts | display-all-accounts | +| GET | `/accounts/disabled` | List disabled accounts | display-disabled-accounts | +| GET | `/accounts/search?q={term}` | Search accounts | query-accounts | +| GET | `/accounts/{id}` | Get account by ID | N/A | +| POST | `/accounts` | Create new account | N/A (extended) | +| PUT | `/accounts/{id}` | Update account | N/A (extended) | +| DELETE | `/accounts/{id}` | Delete account | N/A (extended) | +| PUT | `/accounts/{id}/toggle` | Toggle enabled status | N/A (extended) | diff --git a/java-migration/build.gradle b/java-migration/build.gradle new file mode 100644 index 0000000..237c3c7 --- /dev/null +++ b/java-migration/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.cobolmigration' +version = '1.0.0-SNAPSHOT' + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +repositories { + mavenCentral() +} + +dependencies { + // Spring Boot starters + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + + // PostgreSQL driver + runtimeOnly 'org.postgresql:postgresql' + + // Jackson (JSON) - included via spring-boot-starter-web + // JAXB (XML) + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1' + implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.4' + + // Testing + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'com.h2database:h2' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/java-migration/gradle/wrapper/gradle-wrapper.jar b/java-migration/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c z&{(nX_ht=QbJ%DzAya}!&uNu!4V0xI)QE$SY__m)SAKcN0P(&JcoK*Lxr@P zY&P=}&B3*UWNlc|&$Oh{BEqwK2+N2U$4WB7Fd|aIal`FGANUa9E-O)!gV`((ZGCc$ zBJA|FFrlg~9OBp#f7aHodCe{6= zay$6vN~zj1ddMZ9gQ4p32(7wD?(dE>KA2;SOzXRmPBiBc6g`eOsy+pVcHu=;Yd8@{ zSGgXf@%sKKQz~;!J;|2fC@emm#^_rnO0esEn^QxXgJYd`#FPWOUU5b;9eMAF zZhfiZb|gk8aJIw*YLp4!*(=3l8Cp{(%p?ho22*vN9+5NLV0TTazNY$B5L6UKUrd$n zjbX%#m7&F#U?QNOBXkiiWB*_tk+H?N3`vg;1F-I+83{M2!8<^nydGr5XX}tC!10&e z7D36bLaB56WrjL&HiiMVtpff|K%|*{t*ltt^5ood{FOG0<>k&1h95qPio)2`eL${YAGIx(b4VN*~nKn6E~SIQUuRH zQ+5zP6jfnP$S0iJ@~t!Ai3o`X7biohli;E zT#yXyl{bojG@-TGZzpdVDXhbmF%F9+-^YSIv|MT1l3j zrxOFq>gd2%U}?6}8mIj?M zc077Zc9fq(-)4+gXv?Az26IO6eV`RAJz8e3)SC7~>%rlzDwySVx*q$ygTR5kW2ds- z!HBgcq0KON9*8Ff$X0wOq$`T7ml(@TF)VeoF}x1OttjuVHn3~sHrMB++}f7f9H%@f z=|kP_?#+fve@{0MlbkC9tyvQ_R?lRdRJ@$qcB(8*jyMyeME5ns6ypVI1Xm*Zr{DuS zZ!1)rQfa89c~;l~VkCiHI|PCBd`S*2RLNQM8!g9L6?n`^evQNEwfO@&JJRme+uopQX0%Jo zgd5G&#&{nX{o?TQwQvF1<^Cg3?2co;_06=~Hcb6~4XWpNFL!WU{+CK;>gH%|BLOh7@!hsa(>pNDAmpcuVO-?;Bic17R}^|6@8DahH)G z!EmhsfunLL|3b=M0MeK2vqZ|OqUqS8npxwge$w-4pFVXFq$_EKrZY?BuP@Az@(k`L z`ViQBSk`y+YwRT;&W| z2e3UfkCo^uTA4}Qmmtqs+nk#gNr2W4 zTH%hhErhB)pkXR{B!q5P3-OM+M;qu~f>}IjtF%>w{~K-0*jPVLl?Chz&zIdxp}bjx zStp&Iufr58FTQ36AHU)0+CmvaOpKF;W@sMTFpJ`j;3d)J_$tNQI^c<^1o<49Z(~K> z;EZTBaVT%14(bFw2ob@?JLQ2@(1pCdg3S%E4*dJ}dA*v}_a4_P(a`cHnBFJxNobAv zf&Zl-Yt*lhn-wjZsq<9v-IsXxAxMZ58C@e0!rzhJ+D@9^3~?~yllY^s$?&oNwyH!#~6x4gUrfxplCvK#!f z$viuszW>MFEcFL?>ux*((!L$;R?xc*myjRIjgnQX79@UPD$6Dz0jutM@7h_pq z0Zr)#O<^y_K6jfY^X%A-ip>P%3saX{!v;fxT-*0C_j4=UMH+Xth(XVkVGiiKE#f)q z%Jp=JT)uy{&}Iq2E*xr4YsJ5>w^=#-mRZ4vPXpI6q~1aFwi+lQcimO45V-JXP;>(Q zo={U`{=_JF`EQj87Wf}{Qy35s8r1*9Mxg({CvOt}?Vh9d&(}iI-quvs-rm~P;eRA@ zG5?1HO}puruc@S{YNAF3vmUc2B4!k*yi))<5BQmvd3tr}cIs#9)*AX>t`=~{f#Uz0 z0&Nk!7sSZwJe}=)-R^$0{yeS!V`Dh7w{w5rZ9ir!Z7Cd7dwZcK;BT#V0bzTt>;@Cl z#|#A!-IL6CZ@eHH!CG>OO8!%G8&8t4)Ro@}USB*k>oEUo0LsljsJ-%5Mo^MJF2I8- z#v7a5VdJ-Cd%(a+y6QwTmi+?f8Nxtm{g-+WGL>t;s#epv7ug>inqimZCVm!uT5Pf6 ziEgQt7^%xJf#!aPWbuC_3Nxfb&CFbQy!(8ANpkWLI4oSnH?Q3f?0k1t$3d+lkQs{~(>06l&v|MpcFsyAv zin6N!-;pggosR*vV=DO(#+}4ps|5$`udE%Kdmp?G7B#y%H`R|i8skKOd9Xzx8xgR$>Zo2R2Ytktq^w#ul4uicxW#{ zFjG_RNlBroV_n;a7U(KIpcp*{M~e~@>Q#Av90Jc5v%0c>egEdY4v3%|K1XvB{O_8G zkTWLC>OZKf;XguMH2-Pw{BKbFzaY;4v2seZV0>^7Q~d4O=AwaPhP3h|!hw5aqOtT@ z!SNz}$of**Bl3TK209@F=Tn1+mgZa8yh(Png%Zd6Mt}^NSjy)etQrF zme*llAW=N_8R*O~d2!apJnF%(JcN??=`$qs3Y+~xs>L9x`0^NIn!8mMRFA_tg`etw z3k{9JAjnl@ygIiJcNHTy02GMAvBVqEss&t2<2mnw!; zU`J)0>lWiqVqo|ex7!+@0i>B~BSU1A_0w#Ee+2pJx0BFiZ7RDHEvE*ptc9md(B{&+ zKE>TM)+Pd>HEmdJao7U@S>nL(qq*A)#eLOuIfAS@j`_sK0UEY6OAJJ-kOrHG zjHx`g!9j*_jRcJ%>CE9K2MVf?BUZKFHY?EpV6ai7sET-tqk=nDFh-(65rhjtlKEY% z@G&cQ<5BKatfdA1FKuB=i>CCC5(|9TMW%K~GbA4}80I5%B}(gck#Wlq@$nO3%@QP_ z8nvPkJFa|znk>V92cA!K1rKtr)skHEJD;k8P|R8RkCq1Rh^&}Evwa4BUJz2f!2=MH zo4j8Y$YL2313}H~F7@J7mh>u%556Hw0VUOz-Un@ZASCL)y8}4XXS`t1AC*^>PLwIc zUQok5PFS=*#)Z!3JZN&eZ6ZDP^-c@StY*t20JhCnbMxXf=LK#;`4KHEqMZ-Ly9KsS zI2VUJGY&PmdbM+iT)zek)#Qc#_i4uH43 z@T5SZBrhNCiK~~esjsO9!qBpaWK<`>!-`b71Y5ReXQ4AJU~T2Njri1CEp5oKw;Lnm)-Y@Z3sEY}XIgSy%xo=uek(kAAH5MsV$V3uTUsoTzxp_rF=tx zV07vlJNKtJhCu`b}*#m&5LV4TAE&%KtHViDAdv#c^x`J7bg z&N;#I2GkF@SIGht6p-V}`!F_~lCXjl1BdTLIjD2hH$J^YFN`7f{Q?OHPFEM$65^!u zNwkelo*5+$ZT|oQ%o%;rBX$+?xhvjb)SHgNHE_yP%wYkkvXHS{Bf$OiKJ5d1gI0j< zF6N}Aq=(WDo(J{e-uOecxPD>XZ@|u-tgTR<972`q8;&ZD!cep^@B5CaqFz|oU!iFj zU0;6fQX&~15E53EW&w1s9gQQ~Zk16X%6 zjG`j0yq}4deX2?Tr(03kg>C(!7a|b9qFI?jcE^Y>-VhudI@&LI6Qa}WQ>4H_!UVyF z((cm&!3gmq@;BD#5P~0;_2qgZhtJS|>WdtjY=q zLnHH~Fm!cxw|Z?Vw8*~?I$g#9j&uvgm7vPr#&iZgPP~v~BI4jOv;*OQ?jYJtzO<^y z7-#C={r7CO810!^s(MT!@@Vz_SVU)7VBi(e1%1rvS!?PTa}Uv`J!EP3s6Y!xUgM^8 z4f!fq<3Wer_#;u!5ECZ|^c1{|q_lh3m^9|nsMR1#Qm|?4Yp5~|er2?W^7~cl;_r4WSme_o68J9p03~Hc%X#VcX!xAu%1`R!dfGJCp zV*&m47>s^%Ib0~-2f$6oSgn3jg8m%UA;ArcdcRyM5;}|r;)?a^D*lel5C`V5G=c~k zy*w_&BfySOxE!(~PI$*dwG><+-%KT5p?whOUMA*k<9*gi#T{h3DAxzAPxN&Xws8o9Cp*`PA5>d9*Z-ynV# z9yY*1WR^D8|C%I@vo+d8r^pjJ$>eo|j>XiLWvTWLl(^;JHCsoPgem6PvegHb-OTf| zvTgsHSa;BkbG=(NgPO|CZu9gUCGr$8*EoH2_Z#^BnxF0yM~t`|9ws_xZ8X8iZYqh! zAh;HXJ)3P&)Q0(&F>!LN0g#bdbis-cQxyGn9Qgh`q+~49Fqd2epikEUw9caM%V6WgP)532RMRW}8gNS%V%Hx7apSz}tn@bQy!<=lbhmAH=FsMD?leawbnP5BWM0 z5{)@EEIYMu5;u)!+HQWhQ;D3_Cm_NADNeb-f56}<{41aYq8p4=93d=-=q0Yx#knGYfXVt z+kMxlus}t2T5FEyCN~!}90O_X@@PQpuy;kuGz@bWft%diBTx?d)_xWd_-(!LmVrh**oKg!1CNF&LX4{*j|) zIvjCR0I2UUuuEXh<9}oT_zT#jOrJAHNLFT~Ilh9hGJPI1<5`C-WA{tUYlyMeoy!+U zhA#=p!u1R7DNg9u4|QfED-2TuKI}>p#2P9--z;Bbf4Op*;Q9LCbO&aL2i<0O$ByoI z!9;Ght733FC>Pz>$_mw(F`zU?`m@>gE`9_p*=7o=7av`-&ifU(^)UU`Kg3Kw`h9-1 z6`e6+im=|m2v`pN(2dE%%n8YyQz;#3Q-|x`91z?gj68cMrHl}C25|6(_dIGk*8cA3 zRHB|Nwv{@sP4W+YZM)VKI>RlB`n=Oj~Rzx~M+Khz$N$45rLn6k1nvvD^&HtsMA4`s=MmuOJID@$s8Ph4E zAmSV^+s-z8cfv~Yd(40Sh4JG#F~aB>WFoX7ykaOr3JaJ&Lb49=B8Vk-SQT9%7TYhv z?-Pprt{|=Y5ZQ1?od|A<_IJU93|l4oAfBm?3-wk{O<8ea+`}u%(kub(LFo2zFtd?4 zwpN|2mBNywv+d^y_8#<$r>*5+$wRTCygFLcrwT(qc^n&@9r+}Kd_u@Ithz(6Qb4}A zWo_HdBj#V$VE#l6pD0a=NfB0l^6W^g`vm^sta>Tly?$E&{F?TTX~DsKF~poFfmN%2 z4x`Dc{u{Lkqz&y!33;X}weD}&;7p>xiI&ZUb1H9iD25a(gI|`|;G^NwJPv=1S5e)j z;U;`?n}jnY6rA{V^ zxTd{bK)Gi^odL3l989DQlN+Zs39Xe&otGeY(b5>rlIqfc7Ap4}EC?j<{M=hlH{1+d zw|c}}yx88_xQr`{98Z!d^FNH77=u(p-L{W6RvIn40f-BldeF-YD>p6#)(Qzf)lfZj z?3wAMtPPp>vMehkT`3gToPd%|D8~4`5WK{`#+}{L{jRUMt zrFz+O$C7y8$M&E4@+p+oV5c%uYzbqd2Y%SSgYy#xh4G3hQv>V*BnuKQhBa#=oZB~w{azUB+q%bRe_R^ z>fHBilnRTUfaJ201czL8^~Ix#+qOHSO)A|xWLqOxB$dT2W~)e-r9;bm=;p;RjYahB z*1hegN(VKK+ztr~h1}YP@6cfj{e#|sS`;3tJhIJK=tVJ-*h-5y9n*&cYCSdg#EHE# zSIx=r#qOaLJoVVf6v;(okg6?*L_55atl^W(gm^yjR?$GplNP>BZsBYEf_>wM0Lc;T zhf&gpzOWNxS>m+mN92N0{;4uw`P+9^*|-1~$uXpggj4- z^SFc4`uzj2OwdEVT@}Q`(^EcQ_5(ZtXTql*yGzdS&vrS_w>~~ra|Nb5abwf}Y!uq6R5f&6g2ge~2p(%c< z@O)cz%%rr4*cRJ5f`n@lvHNk@lE1a*96Kw6lJ~B-XfJW%?&-y?;E&?1AacU@`N`!O z6}V>8^%RZ7SQnZ-z$(jsX`amu*5Fj8g!3RTRwK^`2_QHe;_2y_n|6gSaGyPmI#kA0sYV<_qOZc#-2BO%hX)f$s-Z3xlI!ub z^;3ru11DA`4heAu%}HIXo&ctujzE2!6DIGE{?Zs>2}J+p&C$rc7gJC35gxhflorvsb%sGOxpuWhF)dL_&7&Z99=5M0b~Qa;Mo!j&Ti_kXW!86N%n= zSC@6Lw>UQ__F&+&Rzv?gscwAz8IP!n63>SP)^62(HK98nGjLY2*e^OwOq`3O|C92? z;TVhZ2SK%9AGW4ZavTB9?)mUbOoF`V7S=XM;#3EUpR+^oHtdV!GK^nXzCu>tpR|89 zdD{fnvCaN^^LL%amZ^}-E+214g&^56rpdc@yv0b<3}Ys?)f|fXN4oHf$six)-@<;W&&_kj z-B}M5U*1sb4)77aR=@%I?|Wkn-QJVuA96an25;~!gq(g1@O-5VGo7y&E_srxL6ZfS z*R%$gR}dyONgju*D&?geiSj7SZ@ftyA|}(*Y4KbvU!YLsi1EDQQCnb+-cM=K1io78o!v*);o<XwjaQH%)uIP&Zm?)Nfbfn;jIr z)d#!$gOe3QHp}2NBak@yYv3m(CPKkwI|{;d=gi552u?xj9ObCU^DJFQp4t4e1tPzM zvsRIGZ6VF+{6PvqsplMZWhz10YwS={?`~O0Ec$`-!klNUYtzWA^f9m7tkEzCy<_nS z=&<(awFeZvt51>@o_~>PLs05CY)$;}Oo$VDO)?l-{CS1Co=nxjqben*O1BR>#9`0^ zkwk^k-wcLCLGh|XLjdWv0_Hg54B&OzCE^3NCP}~OajK-LuRW53CkV~Su0U>zN%yQP zH8UH#W5P3-!ToO-2k&)}nFe`t+mdqCxxAHgcifup^gKpMObbox9LFK;LP3}0dP-UW z?Zo*^nrQ6*$FtZ(>kLCc2LY*|{!dUn$^RW~m9leoF|@Jy|M5p-G~j%+P0_#orRKf8 zvuu5<*XO!B?1E}-*SY~MOa$6c%2cM+xa8}_8x*aVn~57v&W(0mqN1W`5a7*VN{SUH zXz98DDyCnX2EPl-`Lesf`=AQT%YSDb`$%;(jUTrNen$NPJrlpPDP}prI>Ml!r6bCT;mjsg@X^#&<}CGf0JtR{Ecwd&)2zuhr#nqdgHj+g2n}GK9CHuwO zk>oZxy{vcOL)$8-}L^iVfJHAGfwN$prHjYV0ju}8%jWquw>}_W6j~m<}Jf!G?~r5&Rx)!9JNX!ts#SGe2HzobV5); zpj@&`cNcO&q+%*<%D7za|?m5qlmFK$=MJ_iv{aRs+BGVrs)98BlN^nMr{V_fcl_;jkzRju+c-y?gqBC_@J0dFLq-D9@VN&-`R9U;nv$Hg?>$oe4N&Ht$V_(JR3TG^! zzJsbQbi zFE6-{#9{G{+Z}ww!ycl*7rRdmU#_&|DqPfX3CR1I{Kk;bHwF6jh0opI`UV2W{*|nn zf_Y@%wW6APb&9RrbEN=PQRBEpM(N1w`81s=(xQj6 z-eO0k9=Al|>Ej|Mw&G`%q8e$2xVz1v4DXAi8G};R$y)ww638Y=9y$ZYFDM$}vzusg zUf+~BPX>(SjA|tgaFZr_e0{)+z9i6G#lgt=F_n$d=beAt0Sa0a7>z-?vcjl3e+W}+ z1&9=|vC=$co}-Zh*%3588G?v&U7%N1Qf-wNWJ)(v`iO5KHSkC5&g7CrKu8V}uQGcfcz zmBz#Lbqwqy#Z~UzHgOQ;Q-rPxrRNvl(&u6ts4~0=KkeS;zqURz%!-ERppmd%0v>iRlEf+H$yl{_8TMJzo0 z>n)`On|7=WQdsqhXI?#V{>+~}qt-cQbokEbgwV3QvSP7&hK4R{Z{aGHVS3;+h{|Hz z6$Js}_AJr383c_+6sNR|$qu6dqHXQTc6?(XWPCVZv=)D#6_;D_8P-=zOGEN5&?~8S zl5jQ?NL$c%O)*bOohdNwGIKM#jSAC?BVY={@A#c9GmX0=T(0G}xs`-%f3r=m6-cpK z!%waekyAvm9C3%>sixdZj+I(wQlbB4wv9xKI*T13DYG^T%}zZYJ|0$Oj^YtY+d$V$ zAVudSc-)FMl|54n=N{BnZTM|!>=bhaja?o7s+v1*U$!v!qQ%`T-6fBvmdPbVmro&d zk07TOp*KuxRUSTLRrBj{mjsnF8`d}rMViY8j`jo~Hp$fkv9F_g(jUo#Arp;Xw0M$~ zRIN!B22~$kx;QYmOkos@%|5k)!QypDMVe}1M9tZfkpXKGOxvKXB!=lo`p?|R1l=tA zp(1}c6T3Fwj_CPJwVsYtgeRKg?9?}%oRq0F+r+kdB=bFUdVDRPa;E~~>2$w}>O>v=?|e>#(-Lyx?nbg=ckJ#5U6;RT zNvHhXk$P}m9wSvFyU3}=7!y?Y z=fg$PbV8d7g25&-jOcs{%}wTDKm>!Vk);&rr;O1nvO0VrU&Q?TtYVU=ir`te8SLlS zKSNmV=+vF|ATGg`4$N1uS|n??f}C_4Sz!f|4Ly8#yTW-FBfvS48Tef|-46C(wEO_%pPhUC5$-~Y?!0vFZ^Gu`x=m7X99_?C-`|h zfmMM&Y@zdfitA@KPw4Mc(YHcY1)3*1xvW9V-r4n-9ZuBpFcf{yz+SR{ zo$ZSU_|fgwF~aakGr(9Be`~A|3)B=9`$M-TWKipq-NqRDRQc}ABo*s_5kV%doIX7LRLRau_gd@Rd_aLFXGSU+U?uAqh z8qusWWcvgQ&wu{|sRXmv?sl=xc<$6AR$+cl& zFNh5q1~kffG{3lDUdvEZu5c(aAG~+64FxdlfwY^*;JSS|m~CJusvi-!$XR`6@XtY2 znDHSz7}_Bx7zGq-^5{stTRy|I@N=>*y$zz>m^}^{d&~h;0kYiq8<^Wq7Dz0w31ShO^~LUfW6rfitR0(=3;Uue`Y%y@ex#eKPOW zO~V?)M#AeHB2kovn1v=n^D?2{2jhIQd9t|_Q+c|ZFaWt+r&#yrOu-!4pXAJuxM+Cx z*H&>eZ0v8Y`t}8{TV6smOj=__gFC=eah)mZt9gwz>>W$!>b3O;Rm^Ig*POZP8Rl0f zT~o=Nu1J|lO>}xX&#P58%Yl z83`HRs5#32Qm9mdCrMlV|NKNC+Z~ z9OB8xk5HJ>gBLi+m@(pvpw)1(OaVJKs*$Ou#@Knd#bk+V@y;YXT?)4eP9E5{J%KGtYinNYJUH9PU3A}66c>Xn zZ{Bn0<;8$WCOAL$^NqTjwM?5d=RHgw3!72WRo0c;+houoUA@HWLZM;^U$&sycWrFd zE7ekt9;kb0`lps{>R(}YnXlyGY}5pPd9zBpgXeJTY_jwaJGSJQC#-KJqmh-;ad&F- z-Y)E>!&`Rz!HtCz>%yOJ|v(u7P*I$jqEY3}(Z-orn4 zlI?CYKNl`6I){#2P1h)y(6?i;^z`N3bxTV%wNvQW+eu|x=kbj~s8rhCR*0H=iGkSj zk23lr9kr|p7#qKL=UjgO`@UnvzU)`&fI>1Qs7ubq{@+lK{hH* zvl6eSb9%yngRn^T<;jG1SVa)eA>T^XX=yUS@NCKpk?ovCW1D@!=@kn;l_BrG;hOTC z6K&H{<8K#dI(A+zw-MWxS+~{g$tI7|SfP$EYKxA}LlVO^sT#Oby^grkdZ^^lA}uEF zBSj$weBJG{+Bh@Yffzsw=HyChS(dtLE3i*}Zj@~!_T-Ay7z=B)+*~3|?w`Zd)Co2t zC&4DyB!o&YgSw+fJn6`sn$e)29`kUwAc+1MND7YjV%lO;H2}fNy>hD#=gT ze+-aFNpyKIoXY~Vq-}OWPBe?Rfu^{ps8>Xy%42r@RV#*QV~P83jdlFNgkPN=T|Kt7 zV*M`Rh*30&AWlb$;ae130e@}Tqi3zx2^JQHpM>j$6x`#{mu%tZlwx9Gj@Hc92IuY* zarmT|*d0E~vt6<+r?W^UW0&#U&)8B6+1+;k^2|FWBRP9?C4Rk)HAh&=AS8FS|NQaZ z2j!iZ)nbEyg4ZTp-zHwVlfLC~tXIrv(xrP8PAtR{*c;T24ycA-;auWsya-!kF~CWZ zw_uZ|%urXgUbc@x=L=_g@QJ@m#5beS@6W195Hn7>_}z@Xt{DIEA`A&V82bc^#!q8$ zFh?z_Vn|ozJ;NPd^5uu(9tspo8t%&-U9Ckay-s@DnM*R5rtu|4)~e)`z0P-sy?)kc zs_k&J@0&0!q4~%cKL)2l;N*T&0;mqX5T{Qy60%JtKTQZ-xb%KOcgqwJmb%MOOKk7N zgq})R_6**{8A|6H?fO+2`#QU)p$Ei2&nbj6TpLSIT^D$|`TcSeh+)}VMb}LmvZ{O| ze*1IdCt3+yhdYVxcM)Q_V0bIXLgr6~%JS<<&dxIgfL=Vnx4YHuU@I34JXA|+$_S3~ zy~X#gO_X!cSs^XM{yzDGNM>?v(+sF#<0;AH^YrE8smx<36bUsHbN#y57K8WEu(`qHvQ6cAZPo=J5C(lSmUCZ57Rj6cx!e^rfaI5%w}unz}4 zoX=nt)FVNV%QDJH`o!u9olLD4O5fl)xp+#RloZlaA92o3x4->?rB4`gS$;WO{R;Z3>cG3IgFX2EA?PK^M}@%1%A;?f6}s&CV$cIyEr#q5;yHdNZ9h{| z-=dX+a5elJoDo?Eq&Og!nN6A)5yYpnGEp}?=!C-V)(*~z-+?kY1Q7qs#Rsy%hu_60rdbB+QQNr?S1 z?;xtjUv|*E3}HmuNyB9aFL5H~3Ho0UsmuMZELp1a#CA1g`P{-mT?BchuLEtK}!QZ=3AWakRu~?f9V~3F;TV`5%9Pcs_$gq&CcU}r8gOO zC2&SWPsSG{&o-LIGTBqp6SLQZPvYKp$$7L4WRRZ0BR$Kf0I0SCFkqveCp@f)o8W)! z$%7D1R`&j7W9Q9CGus_)b%+B#J2G;l*FLz#s$hw{BHS~WNLODV#(!u_2Pe&tMsq={ zdm7>_WecWF#D=?eMjLj=-_z`aHMZ=3_-&E8;ibPmM}61i6J3is*=dKf%HC>=xbj4$ zS|Q-hWQ8T5mWde6h@;mS+?k=89?1FU<%qH9B(l&O>k|u_aD|DY*@~(`_pb|B#rJ&g zR0(~(68fpUPz6TdS@4JT5MOPrqDh5_H(eX1$P2SQrkvN8sTxwV>l0)Qq z0pzTuvtEAKRDkKGhhv^jk%|HQ1DdF%5oKq5BS>szk-CIke{%js?~%@$uaN3^Uz6Wf z_iyx{bZ(;9y4X&>LPV=L=d+A}7I4GkK0c1Xts{rrW1Q7apHf-))`BgC^0^F(>At1* za@e7{lq%yAkn*NH8Q1{@{lKhRg*^TfGvv!Sn*ed*x@6>M%aaqySxR|oNadYt1mpUZ z6H(rupHYf&Z z29$5g#|0MX#aR6TZ$@eGxxABRKakDYtD%5BmKp;HbG_ZbT+=81E&=XRk6m_3t9PvD zr5Cqy(v?gHcYvYvXkNH@S#Po~q(_7MOuCAB8G$a9BC##gw^5mW16cML=T=ERL7wsk zzNEayTG?mtB=x*wc@ifBCJ|irFVMOvH)AFRW8WE~U()QT=HBCe@s$dA9O!@`zAAT) zaOZ7l6vyR+Nk_OOF!ZlZmjoImKh)dxFbbR~z(cMhfeX1l7S_`;h|v3gI}n9$sSQ>+3@AFAy9=B_y$)q;Wdl|C-X|VV3w8 z2S#>|5dGA8^9%Bu&fhmVRrTX>Z7{~3V&0UpJNEl0=N32euvDGCJ>#6dUSi&PxFW*s zS`}TB>?}H(T2lxBJ!V#2taV;q%zd6fOr=SGHpoSG*4PDaiG0pdb5`jelVipkEk%FV zThLc@Hc_AL1#D&T4D=w@UezYNJ%0=f3iVRuVL5H?eeZM}4W*bomebEU@e2d`M<~uW zf#Bugwf`VezG|^Qbt6R_=U0}|=k;mIIakz99*>FrsQR{0aQRP6ko?5<7bkDN8evZ& zB@_KqQG?ErKL=1*ZM9_5?Pq%lcS4uLSzN(Mr5=t6xHLS~Ym`UgM@D&VNu8e?_=nSFtF$u@hpPSmI4Vo_t&v?>$~K4y(O~Rb*(MFy_igM7 z*~yYUyR6yQgzWnWMUgDov!!g=lInM+=lOmOk4L`O?{i&qxy&D*_qorRbDwj6?)!ef z#JLd7F6Z2I$S0iYI={rZNk*<{HtIl^mx=h>Cim*04K4+Z4IJtd*-)%6XV2(MCscPiw_a+y*?BKbTS@BZ3AUao^%Zi#PhoY9Vib4N>SE%4>=Jco0v zH_Miey{E;FkdlZSq)e<{`+S3W=*ttvD#hB8w=|2aV*D=yOV}(&p%0LbEWH$&@$X3x~CiF-?ejQ*N+-M zc8zT@3iwkdRT2t(XS`d7`tJQAjRmKAhiw{WOqpuvFp`i@Q@!KMhwKgsA}%@sw8Xo5Y=F zhRJZg)O4uqNWj?V&&vth*H#je6T}}p_<>!Dr#89q@uSjWv~JuW(>FqoJ5^ho0%K?E z9?x_Q;kmcsQ@5=}z@tdljMSt9-Z3xn$k)kEjK|qXS>EfuDmu(Z8|(W?gY6-l z@R_#M8=vxKMAoi&PwnaIYw2COJM@atcgfr=zK1bvjW?9B`-+Voe$Q+H$j!1$Tjn+* z&LY<%)L@;zhnJlB^Og6I&BOR-m?{IW;tyYC%FZ!&Z>kGjHJ6cqM-F z&19n+e1=9AH1VrVeHrIzqlC`w9=*zfmrerF?JMzO&|Mmv;!4DKc(sp+jy^Dx?(8>1 zH&yS_4yL7m&GWX~mdfgH*AB4{CKo;+egw=PrvkTaoBU+P-4u?E|&!c z)DKc;>$$B6u*Zr1SjUh2)FeuWLWHl5TH(UHWkf zLs>7px!c5n;rbe^lO@qlYLzlDVp(z?6rPZel=YB)Uv&n!2{+Mb$-vQl=xKw( zve&>xYx+jW_NJh!FV||r?;hdP*jOXYcLCp>DOtJ?2S^)DkM{{Eb zS$!L$e_o0(^}n3tA1R3-$SNvgBq;DOEo}fNc|tB%%#g4RA3{|euq)p+xd3I8^4E&m zFrD%}nvG^HUAIKe9_{tXB;tl|G<%>yk6R;8L2)KUJw4yHJXUOPM>(-+jxq4R;z8H#>rnJy*)8N+$wA$^F zN+H*3t)eFEgxLw+Nw3};4WV$qj&_D`%ADV2%r zJCPCo%{=z7;`F98(us5JnT(G@sKTZ^;2FVitXyLe-S5(hV&Ium+1pIUB(CZ#h|g)u zSLJJ<@HgrDiA-}V_6B^x1>c9B6%~847JkQ!^KLZ2skm;q*edo;UA)~?SghG8;QbHh z_6M;ouo_1rq9=x$<`Y@EA{C%6-pEV}B(1#sDoe_e1s3^Y>n#1Sw;N|}8D|s|VPd+g z-_$QhCz`vLxxrVMx3ape1xu3*wjx=yKSlM~nFgkNWb4?DDr*!?U)L_VeffF<+!j|b zZ$Wn2$TDv3C3V@BHpSgv3JUif8%hk%OsGZ=OxH@8&4`bbf$`aAMchl^qN>Eyu3JH} z9-S!x8-s4fE=lad%Pkp8hAs~u?|uRnL48O|;*DEU! zuS0{cpk%1E0nc__2%;apFsTm0bKtd&A0~S3Cj^?72-*Owk3V!ZG*PswDfS~}2<8le z5+W^`Y(&R)yVF*tU_s!XMcJS`;(Tr`J0%>p=Z&InR%D3@KEzzI+-2)HK zuoNZ&o=wUC&+*?ofPb0a(E6(<2Amd6%uSu_^-<1?hsxs~0K5^f(LsGqgEF^+0_H=uNk9S0bb!|O8d?m5gQjUKevPaO+*VfSn^2892K~%crWM8+6 z25@V?Y@J<9w%@NXh-2!}SK_(X)O4AM1-WTg>sj1{lj5@=q&dxE^9xng1_z9w9DK>| z6Iybcd0e zyi;Ew!KBRIfGPGytQ6}z}MeXCfLY0?9%RiyagSp_D1?N&c{ zyo>VbJ4Gy`@Fv+5cKgUgs~na$>BV{*em7PU3%lloy_aEovR+J7TfQKh8BJXyL6|P8un-Jnq(ghd!_HEOh$zlv2$~y3krgeH;9zC}V3f`uDtW(%mT#944DQa~^8ZI+zAUu4U(j0YcDfKR$bK#gvn_{JZ>|gZ5+)u?T$w7Q%F^;!Wk?G z(le7r!ufT*cxS}PR6hIVtXa)i`d$-_1KkyBU>qmgz-=T};uxx&sKgv48akIWQ89F{ z0XiY?WM^~;|T8zBOr zs#zuOONzH?svv*jokd5SK8wG>+yMC)LYL|vLqm^PMHcT=`}V$=nIRHe2?h)8WQa6O zPAU}d`1y(>kZiP~Gr=mtJLMu`i<2CspL|q2DqAgAD^7*$xzM`PU4^ga`ilE134XBQ z99P(LhHU@7qvl9Yzg$M`+dlS=x^(m-_3t|h>S}E0bcFMn=C|KamQ)=w2^e)35p`zY zRV8X?d;s^>Cof2SPR&nP3E+-LCkS0J$H!eh8~k0qo$}00b=7!H_I2O+Ro@3O$nPdm ztmbOO^B+IHzQ5w>@@@J4cKw5&^_w6s!s=H%&byAbUtczPQ7}wfTqxxtQNfn*u73Qw zGuWsrky_ajPx-5`R<)6xHf>C(oqGf_Fw|-U*GfS?xLML$kv;h_pZ@Kk$y0X(S+K80 z6^|z)*`5VUkawg}=z`S;VhZhxyDfrE0$(PMurAxl~<>lfZa>JZ288ULK7D` zl9|#L^JL}Y$j*j`0-K6kH#?bRmg#5L3iB4Z)%iF@SqT+Lp|{i`m%R-|ZE94Np7Pa5 zCqC^V3}B(FR340pmF*qaa}M}+h6}mqE~7Sh!9bDv9YRT|>vBNAqv09zXHMlcuhKD| zcjjA(b*XCIwJ33?CB!+;{)vX@9xns_b-VO{i0y?}{!sdXj1GM8+$#v>W7nw;+O_9B z_{4L;C6ol?(?W0<6taGEn1^uG=?Q3i29sE`RfYCaV$3DKc_;?HsL?D_fSYg}SuO5U zOB_f4^vZ_x%o`5|C@9C5+o=mFy@au{s)sKw!UgC&L35aH(sgDxRE2De%(%OT=VUdN ziVLEmdOvJ&5*tCMKRyXctCwQu_RH%;m*$YK&m;jtbdH#Ak~13T1^f89tn`A%QEHWs~jnY~E}p_Z$XC z=?YXLCkzVSK+Id`xZYTegb@W8_baLt-Fq`Tv|=)JPbFsKRm)4UW;yT+J`<)%#ue9DPOkje)YF2fsCilK9MIIK>p*`fkoD5nGfmLwt)!KOT+> zOFq*VZktDDyM3P5UOg`~XL#cbzC}eL%qMB=Q5$d89MKuN#$6|4gx_Jt0Gfn8w&q}%lq4QU%6#jT*MRT% zrLz~C8FYKHawn-EQWN1B75O&quS+Z81(zN)G>~vN8VwC+e+y(`>HcxC{MrJ;H1Z4k zZWuv$w_F0-Ub%MVcpIc){4PGL^I7M{>;hS?;eH!;gmcOE66z3;Z1Phqo(t zVP(Hg6q#0gIKgsg7L7WE!{Y#1nI(45tx2{$34dDd#!Z0NIyrm)HOn5W#7;f4pQci# zDW!FI(g4e668kI9{2+mLwB+=#9bfqgX%!B34V-$wwSN(_cm*^{y0jQtv*4}eO^sOV z*9xoNvX)c9isB}Tgx&ZRjp3kwhTVK?r9;n!x>^XYT z@Q^7zp{rkIs{2mUSE^2!Gf6$6;j~&4=-0cSJJDizZp6LTe8b45;{AKM%v99}{{FfC zz709%u0mC=1KXTo(=TqmZQ;c?$M3z(!xah>aywrj40sc2y3rKFw4jCq+Y+u=CH@_V zxz|qeTwa>+<|H%8Dz5u>ZI5MmjTFwXS-Fv!TDd*`>3{krWoNVx$<133`(ftS?ZPyY z&4@ah^3^i`vL$BZa>O|Nt?ucewzsF)0zX3qmM^|waXr=T0pfIb0*$AwU=?Ipl|1Y; z*Pk6{C-p4MY;j@IJ|DW>QHZQJcp;Z~?8(Q+Kk3^0qJ}SCk^*n4W zu9ZFwLHUx-$6xvaQ)SUQcYd6fF8&x)V`1bIuX@>{mE$b|Yd(qomn3;bPwnDUc0F=; zh*6_((%bqAYQWQ~odER?h>1mkL4kpb3s7`0m@rDKGU*oyF)$j~Ffd4fXV$?`f~rHf zB%Y)@5SXZvfwm10RY5X?TEo)PK_`L6qgBp=#>fO49$D zDq8Ozj0q6213tV5Qq=;fZ0$|KroY{Dz=l@lU^J)?Ko@ti20TRplXzphBi>XGx4bou zEWrkNjz0t5j!_ke{g5I#PUlEU$Km8g8TE|XK=MkU@PT4T><2OVamoK;wJ}3X0L$vX zgd7gNa359*nc)R-0!`2X@FOTB`+oETOPc=ubp5R)VQgY+5BTZZJ2?9QwnO=dnulIUF3gFn;BODC2)65)HeVd%t86sL7Rv^Y+nbn+&l z6BAJY(ETvwI)Ts$aiE8rht4KD*qNyE{8{x6R|%akbTBzw;2+6Echkt+W+`u^XX z_z&x%n '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/java-migration/gradlew.bat b/java-migration/gradlew.bat new file mode 100644 index 0000000..7101f8e --- /dev/null +++ b/java-migration/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/java-migration/settings.gradle b/java-migration/settings.gradle new file mode 100644 index 0000000..1180a84 --- /dev/null +++ b/java-migration/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'cobol-migration' diff --git a/java-migration/src/main/java/com/cobolmigration/CobolMigrationApplication.java b/java-migration/src/main/java/com/cobolmigration/CobolMigrationApplication.java new file mode 100644 index 0000000..35e793d --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/CobolMigrationApplication.java @@ -0,0 +1,18 @@ +package com.cobolmigration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * Main Spring Boot application entry point. + * Replaces the COBOL program-id entry points across all .cbl files. + * + * @see sql/sql_example.cbl - main-procedure + */ +@SpringBootApplication +public class CobolMigrationApplication { + + public static void main(String[] args) { + SpringApplication.run(CobolMigrationApplication.class, args); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/cli/AccountCli.java b/java-migration/src/main/java/com/cobolmigration/cli/AccountCli.java new file mode 100644 index 0000000..af0c9f7 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/cli/AccountCli.java @@ -0,0 +1,179 @@ +package com.cobolmigration.cli; + +import com.cobolmigration.model.Account; +import com.cobolmigration.service.AccountService; +import java.util.List; +import java.util.Optional; +import java.util.Scanner; +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; + +/** + * Interactive command-line interface replacing the terminal menu from sql_example.cbl. + * + *

COBOL menu mapping (sql_example.cbl lines 158-185): + *

    + *
  • 1) Display all accounts → PERFORM display-all-accounts
    • + *
  • 2) Display disabled accounts → PERFORM display-disabled-accounts
    • + *
  • 3) Query accounts → PERFORM query-accounts
    • + *
  • 4) Add account (new)
    • + *
  • 5) Update account (new)
    • + *
  • 6) Delete account (new)
    • + *
  • 7) Toggle account enabled (new)
    • + *
  • 8) Exit → EXIT PERFORM / CONNECT RESET
    • + *
+ * + * @see sql/sql_example.cbl + */ +@Component +@Profile("cli") +public class AccountCli implements CommandLineRunner { + + private final AccountService accountService; + + public AccountCli(AccountService accountService) { + this.accountService = accountService; + } + + @Override + public void run(String... args) throws Exception { + Scanner scanner = new Scanner(System.in); + + System.out.println(); + System.out.println("COBOL SQL DB Example Program (Java Migration)"); + System.out.println("----------------------------------------------"); + System.out.println(); + + boolean running = true; + while (running) { + System.out.println(); + System.out.println("1) Display all accounts"); + System.out.println("2) Display disabled accounts"); + System.out.println("3) Query accounts"); + System.out.println("4) Add account"); + System.out.println("5) Update account"); + System.out.println("6) Delete account"); + System.out.println("7) Toggle account enabled"); + System.out.println("8) Exit"); + System.out.print("Selection: "); + + String choice = scanner.nextLine().trim(); + + switch (choice) { + case "1" -> displayAllAccounts(); + case "2" -> displayDisabledAccounts(); + case "3" -> queryAccounts(scanner); + case "4" -> addAccount(scanner); + case "5" -> updateAccount(scanner); + case "6" -> deleteAccount(scanner); + case "7" -> toggleAccountEnabled(scanner); + case "8" -> running = false; + default -> System.out.println("Please make a selection between 1-8"); + } + } + + System.out.println("Disconnected."); + System.out.println(); + } + + private void displayAllAccounts() { + List accounts = accountService.getAllAccounts(); + displayAccountResults(accounts); + } + + private void displayDisabledAccounts() { + List accounts = accountService.getDisabledAccounts(); + displayAccountResults(accounts); + } + + private void queryAccounts(Scanner scanner) { + boolean searchAgain = true; + while (searchAgain) { + System.out.println(); + System.out.print("Enter search value: "); + String searchTerm = scanner.nextLine(); + + List accounts = accountService.searchAccounts(searchTerm); + displayAccountResults(accounts); + + System.out.println(); + System.out.print("Search again? (Y/[N]) "); + String answer = scanner.nextLine().trim().toUpperCase(); + searchAgain = "Y".equals(answer); + } + } + + private void addAccount(Scanner scanner) { + System.out.print("First name: "); + String firstName = scanner.nextLine(); + System.out.print("Last name: "); + String lastName = scanner.nextLine(); + System.out.print("Phone: "); + String phone = scanner.nextLine(); + System.out.print("Address: "); + String address = scanner.nextLine(); + + Account account = accountService.addAccount(firstName, lastName, phone, address); + System.out.println("Account added with ID: " + account.getId()); + } + + private void updateAccount(Scanner scanner) { + System.out.print("Account ID to update: "); + Long id = Long.parseLong(scanner.nextLine().trim()); + System.out.print("New first name: "); + String firstName = scanner.nextLine(); + System.out.print("New last name: "); + String lastName = scanner.nextLine(); + System.out.print("New phone: "); + String phone = scanner.nextLine(); + System.out.print("New address: "); + String address = scanner.nextLine(); + + Optional updated = accountService.updateAccount(id, firstName, lastName, phone, address); + if (updated.isPresent()) { + System.out.println("Account updated."); + } else { + System.out.println("Account not found."); + } + } + + private void deleteAccount(Scanner scanner) { + System.out.print("Account ID to delete: "); + Long id = Long.parseLong(scanner.nextLine().trim()); + + if (accountService.deleteAccount(id)) { + System.out.println("Account deleted."); + } else { + System.out.println("Account not found."); + } + } + + private void toggleAccountEnabled(Scanner scanner) { + System.out.print("Account ID to toggle: "); + Long id = Long.parseLong(scanner.nextLine().trim()); + + Optional toggled = accountService.toggleAccountEnabled(id); + if (toggled.isPresent()) { + System.out.println("Account enabled status toggled to: " + toggled.get().getIsEnabled()); + } else { + System.out.println("Account not found."); + } + } + + /** + * Displays account results in a table format matching the COBOL + * display-account-results paragraph (sql_example.cbl lines 400-430). + */ + private void displayAccountResults(List accounts) { + System.out.println(); + System.out.println("ACCOUNTS:"); + System.out.println(); + System.out.println(" ID | First | Last | Phone | Address | Enabled "); + System.out.println("------|----------|----------|------------|------------------------|---------"); + + for (Account account : accounts) { + System.out.println(account.toString()); + } + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/cli/CommandLineArgsRunner.java b/java-migration/src/main/java/com/cobolmigration/cli/CommandLineArgsRunner.java new file mode 100644 index 0000000..e95c60a --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/cli/CommandLineArgsRunner.java @@ -0,0 +1,62 @@ +package com.cobolmigration.cli; + +import org.springframework.boot.ApplicationArguments; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; + +/** + * Command-line argument handler replacing read_command_args/read_cmd_line_args.cbl. + * + *

COBOL equivalent (read_cmd_line_args.cbl): + * 

+ *   ACCEPT ws-cmd-args FROM COMMAND-LINE
+ *   INSPECT FUNCTION LOWER-CASE(ws-cmd-args)
+ *       TALLYING ws-test-arg-count FOR ALL "--test"
+ *
+ * + *

Uses Spring Boot's {@link ApplicationArguments} instead of COBOL's + * ACCEPT FROM COMMAND-LINE. + * + * @see read_command_args/read_cmd_line_args.cbl + */ +@Component +@Profile("cli") +public class CommandLineArgsRunner { + + private final ApplicationArguments applicationArguments; + + public CommandLineArgsRunner(ApplicationArguments applicationArguments) { + this.applicationArguments = applicationArguments; + } + + /** + * Checks if the "--test" argument was provided on the command line. + * Replaces the COBOL INSPECT TALLYING pattern. + * + * @return true if --test was passed + */ + public boolean hasTestArg() { + return applicationArguments.containsOption("test") + || applicationArguments.getNonOptionArgs().stream() + .anyMatch(arg -> arg.equalsIgnoreCase("--test")); + } + + /** + * Returns the full command line arguments as a single string, + * equivalent to COBOL's ACCEPT ws-cmd-args FROM COMMAND-LINE. + * + * @return concatenated command line arguments + */ + public String getFullCommandLine() { + return String.join(" ", applicationArguments.getSourceArgs()); + } + + /** + * Returns all non-option arguments. + * + * @return array of non-option arguments + */ + public String[] getNonOptionArgs() { + return applicationArguments.getNonOptionArgs().toArray(new String[0]); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/controller/AccountController.java b/java-migration/src/main/java/com/cobolmigration/controller/AccountController.java new file mode 100644 index 0000000..a928753 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/controller/AccountController.java @@ -0,0 +1,128 @@ +package com.cobolmigration.controller; + +import com.cobolmigration.model.Account; +import com.cobolmigration.service.AccountService; +import java.util.List; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * REST API layer providing a modern alternative to the COBOL terminal UI. + * Maps the account operations from sql/sql_example.cbl to HTTP endpoints. + * + *

Endpoint mapping: + *

    + *
  • GET /accounts → display-all-accounts (ACCOUNT-ALL-CUR)
    • + *
  • GET /accounts/disabled → display-disabled-accounts (ACCOUNT-DISABLED-CUR)
    • + *
  • GET /accounts/search?q= → query-accounts (ACCOUNT-QUERY-CUR)
    • + *
  • GET /accounts/{id} → single account lookup
    • + *
  • POST /accounts → add account
    • + *
  • PUT /accounts/{id} → update account
    • + *
  • DELETE /accounts/{id} → delete account
    • + *
  • PUT /accounts/{id}/toggle → toggle enabled status
    • + *
+ * + * @see sql/sql_example.cbl + */ +@RestController +@RequestMapping("/accounts") +public class AccountController { + + private final AccountService accountService; + + public AccountController(AccountService accountService) { + this.accountService = accountService; + } + + /** + * GET /accounts - Display all accounts ordered by ID. + */ + @GetMapping + public List getAllAccounts() { + return accountService.getAllAccounts(); + } + + /** + * GET /accounts/disabled - Display disabled accounts. + */ + @GetMapping("/disabled") + public List getDisabledAccounts() { + return accountService.getDisabledAccounts(); + } + + /** + * GET /accounts/search?q={term} - Search accounts across all text fields. + */ + @GetMapping("/search") + public List searchAccounts(@RequestParam("q") String searchTerm) { + return accountService.searchAccounts(searchTerm); + } + + /** + * GET /accounts/{id} - Get a single account by ID. + */ + @GetMapping("/{id}") + public ResponseEntity getAccountById(@PathVariable Long id) { + return accountService.getAccountById(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + /** + * POST /accounts - Add a new account. + */ + @PostMapping + public ResponseEntity addAccount(@RequestBody Account account) { + Account created = accountService.addAccount( + account.getFirstName(), + account.getLastName(), + account.getPhone(), + account.getAddress()); + return ResponseEntity.status(HttpStatus.CREATED).body(created); + } + + /** + * PUT /accounts/{id} - Update an existing account. + */ + @PutMapping("/{id}") + public ResponseEntity updateAccount(@PathVariable Long id, + @RequestBody Account account) { + return accountService.updateAccount(id, + account.getFirstName(), + account.getLastName(), + account.getPhone(), + account.getAddress()) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + /** + * DELETE /accounts/{id} - Delete an account. + */ + @DeleteMapping("/{id}") + public ResponseEntity deleteAccount(@PathVariable Long id) { + if (accountService.deleteAccount(id)) { + return ResponseEntity.noContent().build(); + } + return ResponseEntity.notFound().build(); + } + + /** + * PUT /accounts/{id}/toggle - Toggle the enabled status. + */ + @PutMapping("/{id}/toggle") + public ResponseEntity toggleAccountEnabled(@PathVariable Long id) { + return accountService.toggleAccountEnabled(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/dto/RecordDto.java b/java-migration/src/main/java/com/cobolmigration/dto/RecordDto.java new file mode 100644 index 0000000..7b7f51c --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/dto/RecordDto.java @@ -0,0 +1,78 @@ +package com.cobolmigration.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * DTO with Jackson annotations mapping the COBOL NAME OF renames from + * json_generate/json_generate.cbl. + * + *

COBOL field mapping (json_generate.cbl lines 45-48): + *

    + *
  • ws-record-name IS "name" → {@code @JsonProperty("name")}
    • + *
  • ws-record-value IS "value" → {@code @JsonProperty("value")}
    • + *
  • ws-record-blank (suppressed when spaces) → + * {@code @JsonInclude(JsonInclude.Include.NON_EMPTY)}
    • + *
  • ws-record-flag IS "enabled" → {@code @JsonProperty("enabled")}
    • + *
+ * + * @see json_generate/json_generate.cbl + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class RecordDto { + + @JsonProperty("name") + private String name; + + @JsonProperty("value") + private String value; + + @JsonProperty("blank") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String blank; + + @JsonProperty("enabled") + private String enabled; + + public RecordDto() { + } + + public RecordDto(String name, String value, String blank, String enabled) { + this.name = name; + this.value = value; + this.blank = blank; + this.enabled = enabled; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getBlank() { + return blank; + } + + public void setBlank(String blank) { + this.blank = blank; + } + + public String getEnabled() { + return enabled; + } + + public void setEnabled(String enabled) { + this.enabled = enabled; + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/dto/RecordXmlDto.java b/java-migration/src/main/java/com/cobolmigration/dto/RecordXmlDto.java new file mode 100644 index 0000000..fcb171b --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/dto/RecordXmlDto.java @@ -0,0 +1,82 @@ +package com.cobolmigration.dto; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; + +/** + * DTO with JAXB annotations for XML serialization, mapping the COBOL XML GENERATE + * from xml_generate/xml_generate.cbl. + * + *

COBOL XML mapping (xml_generate.cbl lines 45-50): + *

    + *
  • ws-record-name IS "name" → {@code @XmlElement(name = "name")}
    • + *
  • ws-record-value IS "value" → {@code @XmlElement(name = "value")}
    • + *
  • ws-record-blank (SUPPRESS WHEN SPACES) → null check in marshalling
    • + *
  • ws-record-flag IS "enabled", TYPE IS ATTRIBUTE → + * {@code @XmlAttribute(name = "enabled")}
    • + *
+ * + * @see xml_generate/xml_generate.cbl + */ +@XmlRootElement(name = "ws-record") +@XmlAccessorType(XmlAccessType.FIELD) +public class RecordXmlDto { + + @XmlElement(name = "name") + private String name; + + @XmlElement(name = "value") + private String value; + + @XmlElement(name = "blank", nillable = false) + private String blank; + + @XmlAttribute(name = "enabled") + private String enabled; + + public RecordXmlDto() { + } + + public RecordXmlDto(String name, String value, String blank, String enabled) { + this.name = name; + this.value = value; + // SUPPRESS WHEN SPACES: if blank is all spaces or empty, set to null + this.blank = (blank != null && !blank.trim().isEmpty()) ? blank : null; + this.enabled = enabled; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getBlank() { + return blank; + } + + public void setBlank(String blank) { + this.blank = (blank != null && !blank.trim().isEmpty()) ? blank : null; + } + + public String getEnabled() { + return enabled; + } + + public void setEnabled(String enabled) { + this.enabled = enabled; + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/model/Account.java b/java-migration/src/main/java/com/cobolmigration/model/Account.java new file mode 100644 index 0000000..ce751d7 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/model/Account.java @@ -0,0 +1,146 @@ +package com.cobolmigration.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; + +/** + * JPA entity mapping from the COBOL ws-sql-account-record in sql/sql_example.cbl. + * + *

COBOL field mapping: + *

    + *
  • ws-sql-account-id (PIC 9(5)) → id (Long, auto-generated)
    • + *
  • ws-sql-account-first-name (PIC X(8)) → firstName (String)
    • + *
  • ws-sql-account-last-name (PIC X(8)) → lastName (String)
    • + *
  • ws-sql-account-phone (PIC X(10)) → phone (String)
    • + *
  • ws-sql-account-address (PIC X(22)) → address (String)
    • + *
  • ws-sql-account-is-enabled (PIC X) → isEnabled (Character, 'Y'/'N')
    • + *
  • ws-sql-account-create-dt (PIC X(20)) → createDt (LocalDateTime)
    • + *
  • ws-sql-account-mod-dt (PIC X(20)) → modDt (LocalDateTime)
    • + *
+ * + * @see sql/sql_example.cbl lines 44-52 + * @see sql/create_test_db.sql + */ +@Entity +@Table(name = "accounts") +public class Account { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "first_name", nullable = false) + private String firstName; + + @Column(name = "last_name", nullable = false) + private String lastName; + + @Column(name = "phone", nullable = false) + private String phone; + + @Column(name = "address", nullable = false) + private String address; + + @Column(name = "is_enabled", nullable = false, length = 1) + private Character isEnabled; + + @Column(name = "create_dt") + private LocalDateTime createDt; + + @Column(name = "mod_dt") + private LocalDateTime modDt; + + public Account() { + } + + public Account(String firstName, String lastName, String phone, + String address, Character isEnabled) { + this.firstName = firstName; + this.lastName = lastName; + this.phone = phone; + this.address = address; + this.isEnabled = isEnabled; + this.createDt = LocalDateTime.now(); + this.modDt = LocalDateTime.now(); + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Character getIsEnabled() { + return isEnabled; + } + + public void setIsEnabled(Character isEnabled) { + this.isEnabled = isEnabled; + } + + public LocalDateTime getCreateDt() { + return createDt; + } + + public void setCreateDt(LocalDateTime createDt) { + this.createDt = createDt; + } + + public LocalDateTime getModDt() { + return modDt; + } + + public void setModDt(LocalDateTime modDt) { + this.modDt = modDt; + } + + @Override + public String toString() { + return String.format("%-5d | %-8s | %-8s | %-10s | %-22s | %c", + id != null ? id : 0, + firstName != null ? firstName.trim() : "", + lastName != null ? lastName.trim() : "", + phone != null ? phone.trim() : "", + address != null ? address.trim() : "", + isEnabled != null ? isEnabled : ' '); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/model/CustomerRecord.java b/java-migration/src/main/java/com/cobolmigration/model/CustomerRecord.java new file mode 100644 index 0000000..f7efd90 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/model/CustomerRecord.java @@ -0,0 +1,112 @@ +package com.cobolmigration.model; + +/** + * Model mapping from the COBOL FD customer record layout in merge_sort/merge_sort_test.cbl. + * + *

COBOL field mapping: + *

    + *
  • f-customer-id (PIC 9(5)) → customerId (int)
    • + *
  • f-customer-last-name (PIC X(50)) → lastName (String)
    • + *
  • f-customer-first-name (PIC X(50)) → firstName (String)
    • + *
  • f-customer-contract-id (PIC 9(5)) → contractId (int)
    • + *
  • f-customer-comment (PIC X(25)) → comment (String)
    • + *
+ * + * @see merge_sort/merge_sort_test.cbl lines 40-46 + */ +public class CustomerRecord implements Comparable { + + private int customerId; + private String lastName; + private String firstName; + private int contractId; + private String comment; + + public CustomerRecord() { + } + + public CustomerRecord(int customerId, String lastName, String firstName, + int contractId, String comment) { + this.customerId = customerId; + this.lastName = lastName; + this.firstName = firstName; + this.contractId = contractId; + this.comment = comment; + } + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public int getContractId() { + return contractId; + } + + public void setContractId(int contractId) { + this.contractId = contractId; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + @Override + public int compareTo(CustomerRecord other) { + return Integer.compare(this.customerId, other.customerId); + } + + @Override + public String toString() { + return String.format("%-5d%-50s%-50s%-5d%-25s", + customerId, + lastName != null ? lastName : "", + firstName != null ? firstName : "", + contractId, + comment != null ? comment : ""); + } + + /** + * Parses a fixed-width record line matching the COBOL FD layout. + * Total width: 5 + 50 + 50 + 5 + 25 = 135 characters. + * + * @param line the fixed-width line to parse + * @return a CustomerRecord parsed from the line + */ + public static CustomerRecord fromFixedWidth(String line) { + if (line == null || line.length() < 110) { + throw new IllegalArgumentException("Line too short for customer record: " + line); + } + String padded = String.format("%-135s", line); + CustomerRecord record = new CustomerRecord(); + record.setCustomerId(Integer.parseInt(padded.substring(0, 5).trim())); + record.setLastName(padded.substring(5, 55).trim()); + record.setFirstName(padded.substring(55, 105).trim()); + record.setContractId(Integer.parseInt(padded.substring(105, 110).trim())); + record.setComment(padded.substring(110, 135).trim()); + return record; + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/model/StudentRecord.java b/java-migration/src/main/java/com/cobolmigration/model/StudentRecord.java new file mode 100644 index 0000000..5bf1ea5 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/model/StudentRecord.java @@ -0,0 +1,91 @@ +package com.cobolmigration.model; + +/** + * Model mapping from the COBOL FD student record layout in report_writer/report_test.cbl. + * + *

COBOL field mapping: + *

    + *
  • f-test-student-id (PIC 9(6)) → studentId (int)
    • + *
  • f-test-student-name (PIC X(20)) → studentName (String)
    • + *
  • f-test-major (PIC XXX) → major (String)
    • + *
  • f-test-num-courses (PIC 99) → numCourses (int)
    • + *
+ * + * @see report_writer/report_test.cbl lines 24-28 + */ +public class StudentRecord { + + private int studentId; + private String studentName; + private String major; + private int numCourses; + + public StudentRecord() { + } + + public StudentRecord(int studentId, String studentName, String major, int numCourses) { + this.studentId = studentId; + this.studentName = studentName; + this.major = major; + this.numCourses = numCourses; + } + + public int getStudentId() { + return studentId; + } + + public void setStudentId(int studentId) { + this.studentId = studentId; + } + + public String getStudentName() { + return studentName; + } + + public void setStudentName(String studentName) { + this.studentName = studentName; + } + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + + public int getNumCourses() { + return numCourses; + } + + public void setNumCourses(int numCourses) { + this.numCourses = numCourses; + } + + /** + * Parses a fixed-width record line matching the COBOL FD layout. + * Total width: 6 + 20 + 3 + 2 = 31 characters. + * + * @param line the fixed-width line to parse + * @return a StudentRecord parsed from the line + */ + public static StudentRecord fromFixedWidth(String line) { + if (line == null || line.length() < 31) { + throw new IllegalArgumentException("Line too short for student record: " + line); + } + StudentRecord record = new StudentRecord(); + record.setStudentId(Integer.parseInt(line.substring(0, 6).trim())); + record.setStudentName(line.substring(6, 26).trim()); + record.setMajor(line.substring(26, 29).trim()); + record.setNumCourses(Integer.parseInt(line.substring(29, 31).trim())); + return record; + } + + @Override + public String toString() { + return String.format("%-6d%-20s%-3s%02d", studentId, + studentName != null ? studentName : "", + major != null ? major : "", + numCourses); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/repository/AccountRepository.java b/java-migration/src/main/java/com/cobolmigration/repository/AccountRepository.java new file mode 100644 index 0000000..1761df6 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/repository/AccountRepository.java @@ -0,0 +1,51 @@ +package com.cobolmigration.repository; + +import com.cobolmigration.model.Account; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +/** + * Spring Data JPA repository replacing the three COBOL cursors defined in + * sql/sql_example.cbl (lines 118-153). + * + *

Cursor mapping: + *

    + *
  • ACCOUNT-ALL-CUR → {@link #findAllByOrderByIdAsc()}
    • + *
  • ACCOUNT-DISABLED-CUR → {@link #findByIsEnabledOrderByIdAsc(Character)}
    • + *
  • ACCOUNT-QUERY-CUR → {@link #searchAccounts(String)}
    • + *
+ * + * @see sql/sql_example.cbl + */ +@Repository +public interface AccountRepository extends JpaRepository { + + /** + * Replaces ACCOUNT-ALL-CUR: SELECT ... FROM ACCOUNTS ORDER BY ID. + */ + List findAllByOrderByIdAsc(); + + /** + * Replaces ACCOUNT-DISABLED-CUR: SELECT ... FROM ACCOUNTS WHERE IS_ENABLED = ? ORDER BY ID. + */ + List findByIsEnabledOrderByIdAsc(Character isEnabled); + + /** + * Replaces ACCOUNT-QUERY-CUR: searches across firstName, lastName, phone, and address + * using LIKE with wildcards. The COBOL version wraps the search term with '%' wildcards + * (sql_example.cbl lines 333-337). + * + * @param searchTerm the search term (wildcards should be included by the caller) + * @return matching accounts ordered by ID + */ + @Query("SELECT a FROM Account a WHERE " + + "a.firstName LIKE :searchTerm OR " + + "a.lastName LIKE :searchTerm OR " + + "a.phone LIKE :searchTerm OR " + + "a.address LIKE :searchTerm " + + "ORDER BY a.id ASC") + List searchAccounts(@Param("searchTerm") String searchTerm); +} diff --git a/java-migration/src/main/java/com/cobolmigration/service/AccountService.java b/java-migration/src/main/java/com/cobolmigration/service/AccountService.java new file mode 100644 index 0000000..9e294dd --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/service/AccountService.java @@ -0,0 +1,126 @@ +package com.cobolmigration.service; + +import com.cobolmigration.model.Account; +import com.cobolmigration.repository.AccountRepository; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * Service encapsulating the business logic from sql_example.cbl's procedure division. + * + *

Operations mapped from COBOL paragraphs: + *

    + *
  • display-all-accounts → {@link #getAllAccounts()}
    • + *
  • display-disabled-accounts → {@link #getDisabledAccounts()}
    • + *
  • query-accounts → {@link #searchAccounts(String)}
    • + *
  • (implicit INSERT) → {@link #addAccount(String, String, String, String)}
    • + *
  • (implicit UPDATE) → {@link #updateAccount(Long, String, String, String, String)}
    • + *
  • (implicit DELETE) → {@link #deleteAccount(Long)}
    • + *
  • (toggle IS_ENABLED) → {@link #toggleAccountEnabled(Long)}
    • + *
+ * + * @see sql/sql_example.cbl + */ +@Service +@Transactional +public class AccountService { + + private final AccountRepository accountRepository; + + public AccountService(AccountRepository accountRepository) { + this.accountRepository = accountRepository; + } + + /** + * Display all accounts ordered by ID. + * Replaces the display-all-accounts paragraph using ACCOUNT-ALL-CUR. + */ + @Transactional(readOnly = true) + public List getAllAccounts() { + return accountRepository.findAllByOrderByIdAsc(); + } + + /** + * Display disabled accounts (IS_ENABLED = 'N') ordered by ID. + * Replaces the display-disabled-accounts paragraph using ACCOUNT-DISABLED-CUR. + */ + @Transactional(readOnly = true) + public List getDisabledAccounts() { + return accountRepository.findByIsEnabledOrderByIdAsc('N'); + } + + /** + * Query accounts by search term across firstName, lastName, phone, and address. + * Replaces the query-accounts paragraph using ACCOUNT-QUERY-CUR. + * The COBOL version wraps the search term with '%' wildcards (lines 333-337). + * + * @param searchTerm the raw search term (wildcards are added automatically) + */ + @Transactional(readOnly = true) + public List searchAccounts(String searchTerm) { + String wildcardTerm = "%" + searchTerm.trim() + "%"; + return accountRepository.searchAccounts(wildcardTerm); + } + + /** + * Add a new account. New accounts default to enabled ('Y'). + */ + public Account addAccount(String firstName, String lastName, + String phone, String address) { + Account account = new Account( + firstName.trim(), lastName.trim(), + phone.trim(), address.trim(), 'Y'); + return accountRepository.save(account); + } + + /** + * Update an existing account's fields and set mod_dt. + */ + public Optional updateAccount(Long id, String firstName, String lastName, + String phone, String address) { + return accountRepository.findById(id).map(account -> { + account.setFirstName(firstName.trim()); + account.setLastName(lastName.trim()); + account.setPhone(phone.trim()); + account.setAddress(address.trim()); + account.setModDt(LocalDateTime.now()); + return accountRepository.save(account); + }); + } + + /** + * Delete an account by ID. + * + * @return true if the account existed and was deleted + */ + public boolean deleteAccount(Long id) { + if (accountRepository.existsById(id)) { + accountRepository.deleteById(id); + return true; + } + return false; + } + + /** + * Toggle the IS_ENABLED field between 'Y' and 'N'. + * Maps the COBOL 88-level condition values ws-account-enabled/ws-account-disabled. + */ + public Optional toggleAccountEnabled(Long id) { + return accountRepository.findById(id).map(account -> { + account.setIsEnabled(account.getIsEnabled() == 'Y' ? 'N' : 'Y'); + account.setModDt(LocalDateTime.now()); + return accountRepository.save(account); + }); + } + + /** + * Find a single account by ID. + */ + @Transactional(readOnly = true) + public Optional getAccountById(Long id) { + return accountRepository.findById(id); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/service/FileMergeService.java b/java-migration/src/main/java/com/cobolmigration/service/FileMergeService.java new file mode 100644 index 0000000..c3af8f0 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/service/FileMergeService.java @@ -0,0 +1,96 @@ +package com.cobolmigration.service; + +import com.cobolmigration.model.CustomerRecord; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import org.springframework.stereotype.Service; + +/** + * Service replacing the SORT/MERGE logic from merge_sort/merge_sort_test.cbl. + * + *

COBOL operation mapping: + *

    + *
  • MERGE fd-sorting-file ON ASCENDING KEY f-customer-id + * USING fd-test-file-1 fd-test-file-2 GIVING fd-merged-file + * → {@link #mergeFiles(Path, Path, Path)}
    • + *
  • SORT fd-sorting-file ON DESCENDING KEY f-customer-contract-id + * USING fd-merged-file GIVING fd-sorted-contract-id + * → {@link #sortByContractIdDescending(Path, Path)}
    • + *
+ * + * @see merge_sort/merge_sort_test.cbl + */ +@Service +public class FileMergeService { + + /** + * Merges two input files and sorts by customer ID ascending. + * Replaces the COBOL MERGE statement (merge_sort_test.cbl lines 107-110). + * + * @param inputFile1 path to the first input file (East region) + * @param inputFile2 path to the second input file (West region) + * @param outputFile path to the merged output file + * @return the list of merged and sorted records + * @throws IOException if file I/O fails + */ + public List mergeFiles(Path inputFile1, Path inputFile2, Path outputFile) + throws IOException { + List records1 = readRecords(inputFile1); + List records2 = readRecords(inputFile2); + + List merged = new ArrayList<>(); + merged.addAll(records1); + merged.addAll(records2); + + // Sort ascending by customer ID (matches COBOL: ON ASCENDING KEY f-customer-id) + merged.sort(Comparator.comparingInt(CustomerRecord::getCustomerId)); + + writeRecords(outputFile, merged); + return merged; + } + + /** + * Sorts a file by contract ID in descending order. + * Replaces the COBOL SORT statement (merge_sort_test.cbl lines 142-145). + * + * @param inputFile path to the input file (merged output) + * @param outputFile path to the sorted output file + * @return the list of sorted records + * @throws IOException if file I/O fails + */ + public List sortByContractIdDescending(Path inputFile, Path outputFile) + throws IOException { + List records = readRecords(inputFile); + + // Sort descending by contract ID (matches COBOL: ON DESCENDING KEY f-customer-contract-id) + records.sort(Comparator.comparingInt(CustomerRecord::getContractId).reversed()); + + writeRecords(outputFile, records); + return records; + } + + /** + * Reads customer records from a fixed-width file. + */ + public List readRecords(Path filePath) throws IOException { + return Files.readAllLines(filePath).stream() + .filter(line -> !line.isBlank()) + .map(CustomerRecord::fromFixedWidth) + .collect(Collectors.toList()); + } + + /** + * Writes customer records to a fixed-width file. + */ + public void writeRecords(Path filePath, List records) throws IOException { + List lines = records.stream() + .map(CustomerRecord::toString) + .collect(Collectors.toList()); + Files.write(filePath, lines); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/service/JsonService.java b/java-migration/src/main/java/com/cobolmigration/service/JsonService.java new file mode 100644 index 0000000..b523c8f --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/service/JsonService.java @@ -0,0 +1,76 @@ +package com.cobolmigration.service; + +import com.cobolmigration.dto.RecordDto; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.stereotype.Service; + +/** + * Service generating JSON from record objects. + * Replaces the COBOL JSON GENERATE statement from json_generate/json_generate.cbl. + * + *

COBOL equivalent (json_generate.cbl lines 42-54): + * 

+ *   JSON GENERATE ws-json-output FROM ws-record
+ *       COUNT IN ws-json-char-count
+ *       NAME OF ws-record-name IS "name", ...
+ *
+ * + * @see json_generate/json_generate.cbl + */ +@Service +public class JsonService { + + private final ObjectMapper objectMapper; + + public JsonService(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + /** + * Generates JSON from a RecordDto. + * Returns a result containing the JSON string and its character count, + * matching the COBOL COUNT IN behavior. + * + * @param record the record to serialize + * @return the generated JSON string + * @throws JsonProcessingException if serialization fails + */ + public String generateJson(RecordDto record) throws JsonProcessingException { + return objectMapper.writeValueAsString(record); + } + + /** + * Generates JSON and returns the character count alongside the output, + * matching the COBOL COUNT IN ws-json-char-count behavior. + * + * @param record the record to serialize + * @return a JsonResult containing the JSON string and character count + * @throws JsonProcessingException if serialization fails + */ + public JsonResult generateJsonWithCount(RecordDto record) throws JsonProcessingException { + String json = objectMapper.writeValueAsString(record); + return new JsonResult(json, json.length()); + } + + /** + * Result holder matching COBOL's dual output of JSON content and character count. + */ + public static class JsonResult { + private final String json; + private final int charCount; + + public JsonResult(String json, int charCount) { + this.json = json; + this.charCount = charCount; + } + + public String getJson() { + return json; + } + + public int getCharCount() { + return charCount; + } + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/service/ReportService.java b/java-migration/src/main/java/com/cobolmigration/service/ReportService.java new file mode 100644 index 0000000..a2d8604 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/service/ReportService.java @@ -0,0 +1,109 @@ +package com.cobolmigration.service; + +import com.cobolmigration.model.StudentRecord; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Service; + +/** + * Service replacing the COBOL Report Writer (RD) from report_writer/report_test.cbl. + * + *

COBOL Report Writer mapping: + *

    + *
  • RD r-test-report PAGE LIMIT IS 66 → {@code PAGE_LIMIT = 66}
    • + *
  • HEADING IS 1 → header at line 1
    • + *
  • FIRST DETAIL 6 → first detail line at position 6
    • + *
  • LAST DETAIL 42 → maximum detail lines per page
    • + *
  • FOOTING 52 → page footing position
    • + *
  • report-header TYPE REPORT HEADING: "Customer Order Report" at col 44, + * "PAGE" + page-counter at col 100
    • + *
  • report-line TYPE DETAIL: student-id at col 4, name at col 15, + * major at col 40, num-courses at col 46
    • + *
+ * + * @see report_writer/report_test.cbl + */ +@Service +public class ReportService { + + private static final int PAGE_LIMIT = 66; + private static final int FIRST_DETAIL_LINE = 6; + private static final int LAST_DETAIL_LINE = 42; + private static final String REPORT_TITLE = "Customer Order Report"; + + /** + * Generates a formatted text report from a list of student records. + * Produces page headers with title and page numbers, and detail lines + * with student ID, name, major, and number of courses. + * + * @param records the student records to include in the report + * @return the formatted report as a list of lines + */ + public List generateReport(List records) { + List reportLines = new ArrayList<>(); + int pageNumber = 1; + int detailLineCount = 0; + int maxDetailsPerPage = LAST_DETAIL_LINE - FIRST_DETAIL_LINE + 1; + + // Generate first page header + reportLines.addAll(generatePageHeader(pageNumber)); + + for (StudentRecord record : records) { + // Check if we need a new page + if (detailLineCount >= maxDetailsPerPage) { + // Pad remaining lines to reach page limit + while (reportLines.size() % PAGE_LIMIT != 0) { + reportLines.add(""); + } + pageNumber++; + reportLines.addAll(generatePageHeader(pageNumber)); + detailLineCount = 0; + } + + // Generate detail line (report_test.cbl lines 59-63) + reportLines.add(formatDetailLine(record)); + detailLineCount++; + } + + return reportLines; + } + + /** + * Generates the page header matching the COBOL report-header definition. + * Line 1: "Customer Order Report" at column 44 + * Line 2: "PAGE" at column 100, page number at column 105 + * Lines 3-5: blank (spacing before first detail at line 6) + */ + private List generatePageHeader(int pageNumber) { + List header = new ArrayList<>(); + + // Line 1: Report title at column 44 (report_test.cbl lines 48-50) + header.add(String.format("%-43s%s", "", REPORT_TITLE)); + + // Line 2: PAGE + number at column 100 (report_test.cbl lines 52-57) + header.add(String.format("%-99s%s%3d", "", "PAGE", pageNumber)); + + // Lines 3-5: blank lines before first detail + header.add(""); + header.add(""); + header.add(""); + + return header; + } + + /** + * Formats a single detail line matching the COBOL report-line definition. + * Column layout (report_test.cbl lines 59-63): + * col 4: student-id (PIC 9(6)) + * col 15: student-name (PIC X(20)) + * col 40: major (PIC XXX) + * col 46: num-courses (PIC 99) + */ + private String formatDetailLine(StudentRecord record) { + return String.format(" %-6d %-20s %-3s %02d", + record.getStudentId(), + record.getStudentName() != null ? record.getStudentName() : "", + record.getMajor() != null ? record.getMajor() : "", + record.getNumCourses()); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/service/SubProgramService.java b/java-migration/src/main/java/com/cobolmigration/service/SubProgramService.java new file mode 100644 index 0000000..08f24a0 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/service/SubProgramService.java @@ -0,0 +1,175 @@ +package com.cobolmigration.service; + +import org.springframework.stereotype.Service; + +/** + * Service replacing the CALL by-content/by-reference pattern from + * sub_program/main_app.cbl and sub_program/sub.cbl. + * + *

COBOL subprogram semantics mapping: + *

    + *
  • CALL "sub-app" USING BY CONTENT ws-item-1 BY CONTENT ws-item-2 + * → Pass immutable/copied values (Java: pass String copies)
    • + *
  • CALL "sub-app" USING ws-item-1 ws-item-2 (BY REFERENCE, default) + * → Pass mutable objects (Java: pass mutable wrapper)
    • + *
  • CANCEL "sub-app" → Reset working-storage (Java: {@link #cancel()})
    • + *
+ * + *

COBOL storage section mapping: + *

    + *
  • WORKING-STORAGE SECTION → Instance fields (persist between calls)
    • + *
  • LOCAL-STORAGE SECTION → Method-local variables (fresh each call)
    • + *
  • LINKAGE SECTION → Method parameters
    • + *
+ * + * @see sub_program/main_app.cbl + * @see sub_program/sub.cbl + */ +@Service +public class SubProgramService { + + // Working-storage: persists between calls until cancel() is invoked + private String wsTestItem1 = ""; + private String wsTestItem2 = ""; + + /** + * Mutable wrapper for by-reference parameter passing. + * In COBOL, CALL BY REFERENCE allows the subprogram to modify the caller's variables + * (sub_program/main_app.cbl lines 47-48). + */ + public static class MutableString { + private String value; + + public MutableString(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + } + + /** + * Result from a subprogram call, containing the working-storage and local-storage + * values at the start and end of execution. + */ + public static class SubProgramResult { + private final String wsItem1AtStart; + private final String wsItem2AtStart; + private final String wsItem1AtEnd; + private final String wsItem2AtEnd; + private final String outputItem1; + private final String outputItem2; + + public SubProgramResult(String wsItem1AtStart, String wsItem2AtStart, + String wsItem1AtEnd, String wsItem2AtEnd, + String outputItem1, String outputItem2) { + this.wsItem1AtStart = wsItem1AtStart; + this.wsItem2AtStart = wsItem2AtStart; + this.wsItem1AtEnd = wsItem1AtEnd; + this.wsItem2AtEnd = wsItem2AtEnd; + this.outputItem1 = outputItem1; + this.outputItem2 = outputItem2; + } + + public String getWsItem1AtStart() { return wsItem1AtStart; } + public String getWsItem2AtStart() { return wsItem2AtStart; } + public String getWsItem1AtEnd() { return wsItem1AtEnd; } + public String getWsItem2AtEnd() { return wsItem2AtEnd; } + public String getOutputItem1() { return outputItem1; } + public String getOutputItem2() { return outputItem2; } + } + + /** + * Call by content: passes copies of the values. + * The caller's variables are NOT modified (main_app.cbl lines 35-38). + * + * @param item1 first value (immutable copy) + * @param item2 second value (immutable copy) + * @return the result showing working-storage state + */ + public SubProgramResult callByContent(String item1, String item2) { + // Local-storage: fresh on each call (sub.cbl lines 23-25) + String lsTestItem1 = ""; + String lsTestItem2 = ""; + + String wsAtStart1 = wsTestItem1; + String wsAtStart2 = wsTestItem2; + + // Move linkage values to working-storage and local-storage (sub.cbl lines 45-48) + wsTestItem1 = item1; + wsTestItem2 = item2; + lsTestItem1 = item1; + lsTestItem2 = item2; + + // By content: replacements don't affect caller (sub.cbl lines 52-53) + // We return the replaced values but the caller's original strings are unchanged + return new SubProgramResult(wsAtStart1, wsAtStart2, + wsTestItem1, wsTestItem2, + "replace1", "replace2"); + } + + /** + * Call by reference: passes mutable references. + * The caller's variables CAN be modified (main_app.cbl lines 47-49). + * + * @param item1 first value (mutable reference) + * @param item2 second value (mutable reference) + * @return the result showing working-storage state + */ + public SubProgramResult callByReference(MutableString item1, MutableString item2) { + // Local-storage: fresh on each call + String lsTestItem1 = ""; + String lsTestItem2 = ""; + + String wsAtStart1 = wsTestItem1; + String wsAtStart2 = wsTestItem2; + + // Move linkage values to working-storage and local-storage + wsTestItem1 = item1.getValue(); + wsTestItem2 = item2.getValue(); + lsTestItem1 = item1.getValue(); + lsTestItem2 = item2.getValue(); + + // By reference: modifications are visible to the caller (sub.cbl lines 52-53) + item1.setValue("replace1"); + item2.setValue("replace2"); + + return new SubProgramResult(wsAtStart1, wsAtStart2, + wsTestItem1, wsTestItem2, + item1.getValue(), item2.getValue()); + } + + /** + * Cancel/reset the subprogram. + * Replaces CANCEL "sub-app" (main_app.cbl line 55) which resets + * all WORKING-STORAGE variables to their initial values. + */ + public void cancel() { + wsTestItem1 = ""; + wsTestItem2 = ""; + } + + /** + * Returns current working-storage item 1 value for inspection. + */ + public String getWsTestItem1() { + return wsTestItem1; + } + + /** + * Returns current working-storage item 2 value for inspection. + */ + public String getWsTestItem2() { + return wsTestItem2; + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/service/XmlService.java b/java-migration/src/main/java/com/cobolmigration/service/XmlService.java new file mode 100644 index 0000000..b41c297 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/service/XmlService.java @@ -0,0 +1,84 @@ +package com.cobolmigration.service; + +import com.cobolmigration.dto.RecordXmlDto; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import java.io.StringWriter; +import org.springframework.stereotype.Service; + +/** + * Service generating XML from record objects with XML declaration header. + * Replaces the COBOL XML GENERATE statement from xml_generate/xml_generate.cbl. + * + *

COBOL equivalent (xml_generate.cbl lines 41-56): + * 

+ *   XML GENERATE ws-xml-output FROM ws-record
+ *       COUNT IN ws-xml-char-count
+ *       WITH XML-DECLARATION
+ *       NAME OF ws-record-name IS "name", ...
+ *       TYPE OF ws-record-flag IS ATTRIBUTE
+ *       SUPPRESS WHEN SPACES
+ *
+ * + * @see xml_generate/xml_generate.cbl + */ +@Service +public class XmlService { + + /** + * Generates XML from a RecordXmlDto with XML declaration. + * The XML declaration header matches the COBOL WITH XML-DECLARATION option. + * The enabled field is rendered as an attribute (TYPE IS ATTRIBUTE). + * Fields with only spaces are suppressed (SUPPRESS WHEN SPACES). + * + * @param record the record to serialize + * @return the generated XML string + * @throws JAXBException if marshalling fails + */ + public String generateXml(RecordXmlDto record) throws JAXBException { + JAXBContext context = JAXBContext.newInstance(RecordXmlDto.class); + Marshaller marshaller = context.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.FALSE); + // WITH XML-DECLARATION: include the header + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.FALSE); + + StringWriter writer = new StringWriter(); + marshaller.marshal(record, writer); + return writer.toString(); + } + + /** + * Generates XML and returns the character count alongside the output, + * matching the COBOL COUNT IN ws-xml-char-count behavior. + * + * @param record the record to serialize + * @return an XmlResult containing the XML string and character count + * @throws JAXBException if marshalling fails + */ + public XmlResult generateXmlWithCount(RecordXmlDto record) throws JAXBException { + String xml = generateXml(record); + return new XmlResult(xml, xml.length()); + } + + /** + * Result holder matching COBOL's dual output of XML content and character count. + */ + public static class XmlResult { + private final String xml; + private final int charCount; + + public XmlResult(String xml, int charCount) { + this.xml = xml; + this.charCount = charCount; + } + + public String getXml() { + return xml; + } + + public int getCharCount() { + return charCount; + } + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/util/NumericUtils.java b/java-migration/src/main/java/com/cobolmigration/util/NumericUtils.java new file mode 100644 index 0000000..4c74ce9 --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/util/NumericUtils.java @@ -0,0 +1,119 @@ +package com.cobolmigration.util; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * Utility class replacing COBOL COMP/COMP-3 numeric handling from comp_test/comp_test.cbl. + * + *

In COBOL, numeric storage types include: + *

    + *
  • COMP (binary) - stored as binary integer, used for subscripts and calculations
    • + *
  • COMP-2 (double-precision floating point) - used in numval_test/numval_test.cbl
    • + *
  • COMP-3 (packed decimal) - BCD encoding for financial calculations
    • + *
  • COMP-5 (native binary) - used in sql_example.cbl for variable-length strings
    • + *
  • DISPLAY (default) - stored as characters, one byte per digit
    • + *
+ * + *

In Java, we use BigDecimal for precision-sensitive calculations, replacing all + * COMP variants to avoid floating-point precision loss. + * + * @see comp_test/comp_test.cbl + * @see numval_test/numval_test.cbl + */ +public final class NumericUtils { + + private NumericUtils() { + // Utility class - prevent instantiation + } + + /** + * Converts a COBOL COMP (binary) value representation to BigDecimal. + * In COBOL, COMP stores values as binary integers (comp_test.cbl line 13: PIC 999 COMP). + * + * @param value the integer value + * @return BigDecimal representation + */ + public static BigDecimal fromComp(int value) { + return BigDecimal.valueOf(value); + } + + /** + * Converts a COBOL COMP-2 (double-precision float) value to BigDecimal. + * Used in numval_test.cbl (line 17: ws-total COMP-2). + * + * @param value the double value + * @return BigDecimal representation with controlled precision + */ + public static BigDecimal fromComp2(double value) { + return BigDecimal.valueOf(value); + } + + /** + * Converts a COBOL COMP-3 (packed decimal) conceptual value to BigDecimal. + * COMP-3 stores two digits per byte in BCD format. + * In Java, BigDecimal natively handles decimal precision. + * + * @param value the string representation of the packed decimal value + * @param scale the number of decimal places implied by the COBOL PIC clause + * @return BigDecimal with the correct scale + */ + public static BigDecimal fromComp3(String value, int scale) { + BigDecimal result = new BigDecimal(value.trim()); + return result.setScale(scale, RoundingMode.HALF_UP); + } + + /** + * Formats a BigDecimal to a COBOL DISPLAY format string. + * Replaces the COBOL MOVE of COMP to DISPLAY (comp_test.cbl lines 27-28). + * + * @param value the BigDecimal to format + * @param width the total character width (PIC 999 = width 3) + * @return zero-padded string representation + */ + public static String toDisplay(BigDecimal value, int width) { + if (value == null) { + return "0".repeat(width); + } + long longVal = value.longValue(); + return String.format("%0" + width + "d", longVal); + } + + /** + * Formats a BigDecimal to a COBOL dynamic display format (suppressed leading zeros). + * Replaces the PIC ZZ9 format (comp_test.cbl line 17). + * + * @param value the BigDecimal to format + * @param width the total character width + * @return right-justified string with leading spaces instead of zeros + */ + public static String toDynamicDisplay(BigDecimal value, int width) { + if (value == null) { + return " ".repeat(width - 1) + "0"; + } + return String.format("%" + width + "d", value.longValue()); + } + + /** + * Multiplies two values, equivalent to COBOL MULTIPLY ... GIVING. + * Uses BigDecimal for precision (comp_test.cbl line 24). + * + * @param a first operand + * @param b second operand + * @return product as BigDecimal + */ + public static BigDecimal multiply(BigDecimal a, BigDecimal b) { + return a.multiply(b); + } + + /** + * Adds two values, equivalent to COBOL ADD or COMPUTE. + * + * @param a first operand + * @param b second operand + * @return sum as BigDecimal + */ + public static BigDecimal add(BigDecimal a, BigDecimal b) { + return a.add(b); + } +} diff --git a/java-migration/src/main/java/com/cobolmigration/util/StringUtils.java b/java-migration/src/main/java/com/cobolmigration/util/StringUtils.java new file mode 100644 index 0000000..d3faefc --- /dev/null +++ b/java-migration/src/main/java/com/cobolmigration/util/StringUtils.java @@ -0,0 +1,159 @@ +package com.cobolmigration.util; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +/** + * Utility class replacing COBOL string/data operations: + *

    + *
  • TRIM intrinsic function → {@link #trim(String)}, {@link #trimLeading(String)}, + * {@link #trimTrailing(String)} (from trim/trim.cbl)
    • + *
  • UNSTRING statement → {@link #unstring(String, String...)} (from unstring/unstring.cbl)
    • + *
  • IS NUMERIC class condition → {@link #isNumeric(String)} (from is_numeric/is_numeric.cbl)
    • + *
  • NUMVAL intrinsic function → {@link #numval(String)} (from numval_test/numval_test.cbl)
    • + *
+ * + * @see trim/trim.cbl + * @see unstring/unstring.cbl + * @see is_numeric/is_numeric.cbl + * @see numval_test/numval_test.cbl + */ +public final class StringUtils { + + private static final Pattern NUMERIC_PATTERN = Pattern.compile("-?\\d+(\\.\\d+)?"); + + private StringUtils() { + // Utility class - prevent instantiation + } + + /** + * Replaces COBOL FUNCTION TRIM(value). + * Removes both leading and trailing spaces, equivalent to COBOL's default TRIM. + * + * @see trim/trim.cbl line 23 + */ + public static String trim(String value) { + if (value == null) { + return ""; + } + return value.trim(); + } + + /** + * Replaces COBOL FUNCTION TRIM(value LEADING). + * Removes leading spaces only. + * + * @see trim/trim.cbl line 24 + */ + public static String trimLeading(String value) { + if (value == null) { + return ""; + } + return value.stripLeading(); + } + + /** + * Replaces COBOL FUNCTION TRIM(value TRAILING). + * Removes trailing spaces only. + * + * @see trim/trim.cbl line 25 + */ + public static String trimTrailing(String value) { + if (value == null) { + return ""; + } + return value.stripTrailing(); + } + + /** + * Replaces the COBOL UNSTRING statement with multiple delimiters. + * Splits a source string by one or more delimiter patterns. + * + *

In COBOL, UNSTRING splits a source string into destination fields + * based on specified delimiters (unstring/unstring.cbl lines 58-61). + * + * @param source the source string to split + * @param delimiters one or more delimiter strings + * @return list of parts after splitting + * @see unstring/unstring.cbl + */ + public static List unstring(String source, String... delimiters) { + if (source == null || delimiters == null || delimiters.length == 0) { + List result = new ArrayList<>(); + if (source != null) { + result.add(source); + } + return result; + } + + // Build a regex pattern from all delimiters, escaping special regex chars + StringBuilder patternBuilder = new StringBuilder(); + for (int i = 0; i < delimiters.length; i++) { + if (i > 0) { + patternBuilder.append("|"); + } + patternBuilder.append(Pattern.quote(delimiters[i])); + } + + String[] parts = source.split(patternBuilder.toString(), -1); + List result = new ArrayList<>(); + for (String part : parts) { + result.add(part); + } + return result; + } + + /** + * Replaces the COBOL IS NUMERIC class condition. + * In COBOL, a PIC X field IS NUMERIC only if all characters are contiguous digits + * (is_numeric/is_numeric.cbl). Spaces cause the test to fail unless the value is trimmed first. + * + * @param value the string to test + * @return true if the trimmed value represents a valid number + * @see is_numeric/is_numeric.cbl + */ + public static boolean isNumeric(String value) { + if (value == null || value.trim().isEmpty()) { + return false; + } + return NUMERIC_PATTERN.matcher(value.trim()).matches(); + } + + /** + * Replaces the COBOL FUNCTION NUMVAL(value). + * Converts an alphanumeric PIC X value to a numeric BigDecimal. + * In COBOL, NUMVAL converts a string representation of a number to its numeric + * equivalent (numval_test/numval_test.cbl line 28). + * + * @param value the string to parse + * @return the numeric value as BigDecimal + * @throws NumberFormatException if the value cannot be parsed + * @see numval_test/numval_test.cbl + */ + public static BigDecimal numval(String value) { + if (value == null || value.trim().isEmpty()) { + throw new NumberFormatException("Cannot parse null or empty value"); + } + return new BigDecimal(value.trim()); + } + + /** + * Pads a string to a fixed width with trailing spaces, mimicking COBOL's PIC X(n) behavior. + * COBOL alphanumeric fields are always space-padded to their defined length. + * + * @param value the string to pad + * @param width the target width + * @return the padded string + */ + public static String padRight(String value, int width) { + if (value == null) { + return " ".repeat(width); + } + if (value.length() >= width) { + return value.substring(0, width); + } + return value + " ".repeat(width - value.length()); + } +} diff --git a/java-migration/src/main/resources/application.properties b/java-migration/src/main/resources/application.properties new file mode 100644 index 0000000..37190e3 --- /dev/null +++ b/java-migration/src/main/resources/application.properties @@ -0,0 +1,16 @@ +# PostgreSQL connection configuration +# Maps from the COBOL connection string in sql/sql_example.cbl lines 35-42: +# DRIVER={PostgreSQL Unicode};SERVER=localhost;PORT=5432; +# DATABASE=cobol_db_example;UID=postgres;PWD=password; +spring.datasource.url=jdbc:postgresql://localhost:5432/cobol_db_example +spring.datasource.username=postgres +spring.datasource.password=password +spring.datasource.driver-class-name=org.postgresql.Driver + +# JPA/Hibernate settings +spring.jpa.hibernate.ddl-auto=validate +spring.jpa.show-sql=false +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect + +# Initialize schema from migration scripts +spring.sql.init.mode=never diff --git a/java-migration/src/main/resources/db/migration/V1__create_accounts_table.sql b/java-migration/src/main/resources/db/migration/V1__create_accounts_table.sql new file mode 100644 index 0000000..88bcc3e --- /dev/null +++ b/java-migration/src/main/resources/db/migration/V1__create_accounts_table.sql @@ -0,0 +1,49 @@ +-- Database schema migration for the COBOL-to-Java migration. +-- Reference: sql/create_test_db.sql from the COBOL project. + +CREATE TABLE IF NOT EXISTS accounts ( + id SERIAL NOT NULL, + first_name VARCHAR NOT NULL, + last_name VARCHAR NOT NULL, + phone VARCHAR NOT NULL, + address VARCHAR NOT NULL, + is_enabled VARCHAR(1) NOT NULL DEFAULT 'N', + create_dt TIMESTAMP DEFAULT NOW(), + mod_dt TIMESTAMP DEFAULT NOW(), + PRIMARY KEY (id) +); + +-- Populate fake account data (same as the COBOL create_test_db.sql). + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('John', 'Tester', '15555550100', '123 Fake St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Mike', 'Tester1', '15555550121', '122 Real St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Mary', 'Tester2', '15555550132', '121 ABC St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Jack', 'Tester3', '15555550143', '120 Rock St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Bob', 'Tester4', '15555550154', '119 Truck St, Nowhere', 'N', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Paula', 'Tester5', '1555550165', '118 Car St, Nowhere', 'N', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('James', 'Tester6', '1555550176', '117 Land St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Jane', 'Tester7', '1555550187', '116 Sea St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Bill', 'Tester8', '1555550198', '115 Dock St, Nowhere', 'N', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Lucy', 'Tester9', '1555550209', '114 Beach St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Richard', 'Tester10', '1555550210', '113 Water St, Nowhere', 'Y', NOW(), NOW()); diff --git a/java-migration/src/test/java/com/cobolmigration/controller/AccountControllerTest.java b/java-migration/src/test/java/com/cobolmigration/controller/AccountControllerTest.java new file mode 100644 index 0000000..af84474 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/controller/AccountControllerTest.java @@ -0,0 +1,164 @@ +package com.cobolmigration.controller; + +import com.cobolmigration.model.Account; +import com.cobolmigration.service.AccountService; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.List; +import java.util.Optional; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * Integration tests for AccountController REST endpoints. + */ +@WebMvcTest(AccountController.class) +class AccountControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean + private AccountService accountService; + + @Autowired + private ObjectMapper objectMapper; + + @Test + @DisplayName("GET /accounts returns all accounts") + void testGetAllAccounts() throws Exception { + Account account = createTestAccount(1L, "John", "Tester", 'Y'); + when(accountService.getAllAccounts()).thenReturn(List.of(account)); + + mockMvc.perform(get("/accounts")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].firstName").value("John")) + .andExpect(jsonPath("$[0].lastName").value("Tester")); + } + + @Test + @DisplayName("GET /accounts/disabled returns disabled accounts") + void testGetDisabledAccounts() throws Exception { + Account account = createTestAccount(1L, "Bob", "Tester4", 'N'); + when(accountService.getDisabledAccounts()).thenReturn(List.of(account)); + + mockMvc.perform(get("/accounts/disabled")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].firstName").value("Bob")) + .andExpect(jsonPath("$[0].isEnabled").value("N")); + } + + @Test + @DisplayName("GET /accounts/search?q=term searches accounts") + void testSearchAccounts() throws Exception { + Account account = createTestAccount(1L, "John", "Tester", 'Y'); + when(accountService.searchAccounts("John")).thenReturn(List.of(account)); + + mockMvc.perform(get("/accounts/search").param("q", "John")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].firstName").value("John")); + } + + @Test + @DisplayName("GET /accounts/{id} returns account by ID") + void testGetAccountById() throws Exception { + Account account = createTestAccount(1L, "John", "Tester", 'Y'); + when(accountService.getAccountById(1L)).thenReturn(Optional.of(account)); + + mockMvc.perform(get("/accounts/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.firstName").value("John")); + } + + @Test + @DisplayName("GET /accounts/{id} returns 404 for nonexistent ID") + void testGetAccountByIdNotFound() throws Exception { + when(accountService.getAccountById(999L)).thenReturn(Optional.empty()); + + mockMvc.perform(get("/accounts/999")) + .andExpect(status().isNotFound()); + } + + @Test + @DisplayName("POST /accounts creates a new account") + void testAddAccount() throws Exception { + Account created = createTestAccount(1L, "Jane", "Doe", 'Y'); + when(accountService.addAccount(anyString(), anyString(), anyString(), anyString())) + .thenReturn(created); + + Account request = new Account("Jane", "Doe", "5551234567", "456 St", 'Y'); + + mockMvc.perform(post("/accounts") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.firstName").value("Jane")); + } + + @Test + @DisplayName("PUT /accounts/{id} updates an existing account") + void testUpdateAccount() throws Exception { + Account updated = createTestAccount(1L, "Updated", "Name", 'Y'); + when(accountService.updateAccount(anyLong(), anyString(), anyString(), anyString(), anyString())) + .thenReturn(Optional.of(updated)); + + Account request = new Account("Updated", "Name", "9999999999", "New Address", 'Y'); + + mockMvc.perform(put("/accounts/1") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.firstName").value("Updated")); + } + + @Test + @DisplayName("DELETE /accounts/{id} deletes an account") + void testDeleteAccount() throws Exception { + when(accountService.deleteAccount(1L)).thenReturn(true); + + mockMvc.perform(delete("/accounts/1")) + .andExpect(status().isNoContent()); + } + + @Test + @DisplayName("DELETE /accounts/{id} returns 404 for nonexistent ID") + void testDeleteAccountNotFound() throws Exception { + when(accountService.deleteAccount(999L)).thenReturn(false); + + mockMvc.perform(delete("/accounts/999")) + .andExpect(status().isNotFound()); + } + + @Test + @DisplayName("PUT /accounts/{id}/toggle toggles enabled status") + void testToggleAccountEnabled() throws Exception { + Account toggled = createTestAccount(1L, "John", "Tester", 'N'); + when(accountService.toggleAccountEnabled(1L)).thenReturn(Optional.of(toggled)); + + mockMvc.perform(put("/accounts/1/toggle")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.isEnabled").value("N")); + } + + private Account createTestAccount(Long id, String firstName, String lastName, + Character isEnabled) { + Account account = new Account(firstName, lastName, "5551234567", "123 Test St", isEnabled); + account.setId(id); + return account; + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/repository/AccountRepositoryTest.java b/java-migration/src/test/java/com/cobolmigration/repository/AccountRepositoryTest.java new file mode 100644 index 0000000..8640c8a --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/repository/AccountRepositoryTest.java @@ -0,0 +1,105 @@ +package com.cobolmigration.repository; + +import com.cobolmigration.model.Account; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.test.context.ActiveProfiles; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Integration tests for AccountRepository validating all three query patterns + * that replace the COBOL cursors in sql/sql_example.cbl. + */ +@DataJpaTest +@ActiveProfiles("test") +class AccountRepositoryTest { + + @Autowired + private AccountRepository accountRepository; + + @BeforeEach + void setUp() { + accountRepository.deleteAll(); + + // Seed test data matching sql/create_test_db.sql + accountRepository.save(new Account("John", "Tester", "15555550100", "123 Fake St, Nowhere", 'Y')); + accountRepository.save(new Account("Mike", "Tester1", "15555550121", "122 Real St, Nowhere", 'Y')); + accountRepository.save(new Account("Mary", "Tester2", "15555550132", "121 ABC St, Nowhere", 'Y')); + accountRepository.save(new Account("Bob", "Tester4", "15555550154", "119 Truck St, Nowhere", 'N')); + accountRepository.save(new Account("Paula", "Tester5", "1555550165", "118 Car St, Nowhere", 'N')); + accountRepository.save(new Account("Bill", "Tester8", "1555550198", "115 Dock St, Nowhere", 'N')); + } + + @Test + @DisplayName("findAllByOrderByIdAsc replaces ACCOUNT-ALL-CUR: returns all accounts sorted by ID") + void testFindAllByOrderByIdAsc() { + List accounts = accountRepository.findAllByOrderByIdAsc(); + + assertThat(accounts).hasSize(6); + // Verify ordering by ID ascending + for (int i = 1; i < accounts.size(); i++) { + assertThat(accounts.get(i).getId()) + .isGreaterThan(accounts.get(i - 1).getId()); + } + } + + @Test + @DisplayName("findByIsEnabledOrderByIdAsc replaces ACCOUNT-DISABLED-CUR: returns only disabled accounts") + void testFindByIsEnabledDisabled() { + List disabledAccounts = accountRepository.findByIsEnabledOrderByIdAsc('N'); + + assertThat(disabledAccounts).hasSize(3); + assertThat(disabledAccounts).allMatch(a -> a.getIsEnabled() == 'N'); + assertThat(disabledAccounts).extracting(Account::getFirstName) + .containsExactly("Bob", "Paula", "Bill"); + } + + @Test + @DisplayName("findByIsEnabledOrderByIdAsc returns enabled accounts when queried with 'Y'") + void testFindByIsEnabledEnabled() { + List enabledAccounts = accountRepository.findByIsEnabledOrderByIdAsc('Y'); + + assertThat(enabledAccounts).hasSize(3); + assertThat(enabledAccounts).allMatch(a -> a.getIsEnabled() == 'Y'); + } + + @Test + @DisplayName("searchAccounts replaces ACCOUNT-QUERY-CUR: searches across firstName, lastName, phone, address") + void testSearchAccountsByFirstName() { + List results = accountRepository.searchAccounts("%John%"); + + assertThat(results).hasSize(1); + assertThat(results.get(0).getFirstName()).isEqualTo("John"); + } + + @Test + @DisplayName("searchAccounts finds matches in lastName field") + void testSearchAccountsByLastName() { + List results = accountRepository.searchAccounts("%Tester%"); + + // All accounts have "Tester" in their last name + assertThat(results).hasSize(6); + } + + @Test + @DisplayName("searchAccounts finds matches in address field") + void testSearchAccountsByAddress() { + List results = accountRepository.searchAccounts("%Fake%"); + + assertThat(results).hasSize(1); + assertThat(results.get(0).getAddress()).contains("Fake"); + } + + @Test + @DisplayName("searchAccounts returns empty list for no matches") + void testSearchAccountsNoResults() { + List results = accountRepository.searchAccounts("%NONEXISTENT%"); + + assertThat(results).isEmpty(); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/service/AccountServiceTest.java b/java-migration/src/test/java/com/cobolmigration/service/AccountServiceTest.java new file mode 100644 index 0000000..a963249 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/service/AccountServiceTest.java @@ -0,0 +1,119 @@ +package com.cobolmigration.service; + +import com.cobolmigration.model.Account; +import com.cobolmigration.repository.AccountRepository; +import java.util.List; +import java.util.Optional; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ActiveProfiles; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Unit tests for AccountService validating business logic from sql_example.cbl. + */ +@DataJpaTest +@ActiveProfiles("test") +@Import(AccountService.class) +class AccountServiceTest { + + @Autowired + private AccountService accountService; + + @Autowired + private AccountRepository accountRepository; + + @BeforeEach + void setUp() { + accountRepository.deleteAll(); + accountRepository.save(new Account("John", "Tester", "15555550100", "123 Fake St", 'Y')); + accountRepository.save(new Account("Bob", "Tester4", "15555550154", "119 Truck St", 'N')); + } + + @Test + @DisplayName("getAllAccounts returns all accounts ordered by ID") + void testGetAllAccounts() { + List accounts = accountService.getAllAccounts(); + assertThat(accounts).hasSize(2); + } + + @Test + @DisplayName("getDisabledAccounts returns only disabled accounts") + void testGetDisabledAccounts() { + List disabled = accountService.getDisabledAccounts(); + assertThat(disabled).hasSize(1); + assertThat(disabled.get(0).getFirstName()).isEqualTo("Bob"); + } + + @Test + @DisplayName("searchAccounts wraps term with wildcards and finds matches") + void testSearchAccounts() { + List results = accountService.searchAccounts("Tester"); + assertThat(results).hasSize(2); + } + + @Test + @DisplayName("addAccount creates a new enabled account") + void testAddAccount() { + Account added = accountService.addAccount("Jane", "Doe", "5551234567", "456 New St"); + assertThat(added.getId()).isNotNull(); + assertThat(added.getIsEnabled()).isEqualTo('Y'); + assertThat(added.getCreateDt()).isNotNull(); + } + + @Test + @DisplayName("updateAccount modifies existing account fields") + void testUpdateAccount() { + Account existing = accountRepository.findAllByOrderByIdAsc().get(0); + Optional updated = accountService.updateAccount( + existing.getId(), "Updated", "Name", "9999999999", "New Address"); + + assertThat(updated).isPresent(); + assertThat(updated.get().getFirstName()).isEqualTo("Updated"); + assertThat(updated.get().getModDt()).isNotNull(); + } + + @Test + @DisplayName("updateAccount returns empty for nonexistent ID") + void testUpdateNonexistentAccount() { + Optional result = accountService.updateAccount( + 99999L, "X", "Y", "Z", "W"); + assertThat(result).isEmpty(); + } + + @Test + @DisplayName("deleteAccount removes an existing account") + void testDeleteAccount() { + Account existing = accountRepository.findAllByOrderByIdAsc().get(0); + boolean deleted = accountService.deleteAccount(existing.getId()); + assertThat(deleted).isTrue(); + assertThat(accountRepository.findById(existing.getId())).isEmpty(); + } + + @Test + @DisplayName("deleteAccount returns false for nonexistent ID") + void testDeleteNonexistentAccount() { + boolean deleted = accountService.deleteAccount(99999L); + assertThat(deleted).isFalse(); + } + + @Test + @DisplayName("toggleAccountEnabled flips Y to N and vice versa") + void testToggleAccountEnabled() { + Account enabledAccount = accountRepository.findAllByOrderByIdAsc().get(0); + assertThat(enabledAccount.getIsEnabled()).isEqualTo('Y'); + + Optional toggled = accountService.toggleAccountEnabled(enabledAccount.getId()); + assertThat(toggled).isPresent(); + assertThat(toggled.get().getIsEnabled()).isEqualTo('N'); + + Optional toggledBack = accountService.toggleAccountEnabled(enabledAccount.getId()); + assertThat(toggledBack).isPresent(); + assertThat(toggledBack.get().getIsEnabled()).isEqualTo('Y'); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/service/FileMergeServiceTest.java b/java-migration/src/test/java/com/cobolmigration/service/FileMergeServiceTest.java new file mode 100644 index 0000000..781ada8 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/service/FileMergeServiceTest.java @@ -0,0 +1,83 @@ +package com.cobolmigration.service; + +import com.cobolmigration.model.CustomerRecord; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for FileMergeService validating SORT/MERGE logic from merge_sort/merge_sort_test.cbl. + */ +class FileMergeServiceTest { + + private final FileMergeService fileMergeService = new FileMergeService(); + + @TempDir + Path tempDir; + + @Test + @DisplayName("mergeFiles merges two files and sorts by customer ID ascending") + void testMergeFiles() throws IOException { + // Create test data matching merge_sort_test.cbl create-test-data paragraph + Path file1 = tempDir.resolve("test-file-1.txt"); + Path file2 = tempDir.resolve("test-file-2.txt"); + Path outputFile = tempDir.resolve("merge-output.txt"); + + // East region data (file 1) - matches lines 185-259 + Files.writeString(file1, buildRecord(1, "last-1", "first-1", 5423, "comment-1") + "\n" + + buildRecord(5, "last-5", "first-5", 12323, "comment-5") + "\n" + + buildRecord(10, "last-10", "first-10", 653, "comment-10") + "\n"); + + // West region data (file 2) - matches lines 272-333 + Files.writeString(file2, buildRecord(999, "last-999", "first-999", 1610, "comment-99") + "\n" + + buildRecord(3, "last-03", "first-03", 3331, "comment-03") + "\n"); + + List merged = fileMergeService.mergeFiles(file1, file2, outputFile); + + assertThat(merged).hasSize(5); + // Verify ascending order by customer ID + assertThat(merged.get(0).getCustomerId()).isEqualTo(1); + assertThat(merged.get(1).getCustomerId()).isEqualTo(3); + assertThat(merged.get(2).getCustomerId()).isEqualTo(5); + assertThat(merged.get(3).getCustomerId()).isEqualTo(10); + assertThat(merged.get(4).getCustomerId()).isEqualTo(999); + + // Verify output file was written + assertThat(Files.exists(outputFile)).isTrue(); + assertThat(Files.readAllLines(outputFile)).hasSize(5); + } + + @Test + @DisplayName("sortByContractIdDescending sorts by contract ID in descending order") + void testSortByContractIdDescending() throws IOException { + Path inputFile = tempDir.resolve("input.txt"); + Path outputFile = tempDir.resolve("sorted-output.txt"); + + Files.writeString(inputFile, + buildRecord(1, "last-1", "first-1", 5423, "comment-1") + "\n" + + buildRecord(3, "last-03", "first-03", 3331, "comment-03") + "\n" + + buildRecord(5, "last-5", "first-5", 12323, "comment-5") + "\n" + + buildRecord(10, "last-10", "first-10", 653, "comment-10") + "\n"); + + List sorted = fileMergeService.sortByContractIdDescending(inputFile, outputFile); + + assertThat(sorted).hasSize(4); + // Verify descending order by contract ID + assertThat(sorted.get(0).getContractId()).isEqualTo(12323); + assertThat(sorted.get(1).getContractId()).isEqualTo(5423); + assertThat(sorted.get(2).getContractId()).isEqualTo(3331); + assertThat(sorted.get(3).getContractId()).isEqualTo(653); + } + + private String buildRecord(int customerId, String lastName, String firstName, + int contractId, String comment) { + return String.format("%-5d%-50s%-50s%-5d%-25s", + customerId, lastName, firstName, contractId, comment); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/service/JsonServiceTest.java b/java-migration/src/test/java/com/cobolmigration/service/JsonServiceTest.java new file mode 100644 index 0000000..5fa42d2 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/service/JsonServiceTest.java @@ -0,0 +1,67 @@ +package com.cobolmigration.service; + +import com.cobolmigration.dto.RecordDto; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for JsonService validating JSON generation matching json_generate/json_generate.cbl. + */ +class JsonServiceTest { + + private final JsonService jsonService = new JsonService(new ObjectMapper()); + + @Test + @DisplayName("generateJson produces correct JSON with renamed fields") + void testGenerateJson() throws Exception { + // Match the COBOL example data (json_generate.cbl lines 38-40) + RecordDto record = new RecordDto("Test Name", "Test Value", null, "true"); + + String json = jsonService.generateJson(record); + + assertThat(json).contains("\"name\":"); + assertThat(json).contains("\"Test Name\""); + assertThat(json).contains("\"value\":"); + assertThat(json).contains("\"Test Value\""); + assertThat(json).contains("\"enabled\":"); + assertThat(json).contains("\"true\""); + // Blank field should be suppressed (null/empty) + assertThat(json).doesNotContain("\"blank\""); + } + + @Test + @DisplayName("generateJsonWithCount returns character count matching COBOL COUNT IN") + void testGenerateJsonWithCount() throws Exception { + RecordDto record = new RecordDto("Test Name", "Test Value", null, "true"); + + JsonService.JsonResult result = jsonService.generateJsonWithCount(record); + + assertThat(result.getJson()).isNotEmpty(); + assertThat(result.getCharCount()).isEqualTo(result.getJson().length()); + assertThat(result.getCharCount()).isGreaterThan(0); + } + + @Test + @DisplayName("generateJson suppresses blank field when empty (SUPPRESS WHEN SPACES equivalent)") + void testSuppressBlankField() throws Exception { + RecordDto record = new RecordDto("Name", "Value", "", "false"); + + String json = jsonService.generateJson(record); + + assertThat(json).doesNotContain("\"blank\""); + } + + @Test + @DisplayName("generateJson includes blank field when non-empty") + void testNonEmptyBlankField() throws Exception { + RecordDto record = new RecordDto("Name", "Value", "NotBlank", "false"); + + String json = jsonService.generateJson(record); + + assertThat(json).contains("\"blank\""); + assertThat(json).contains("\"NotBlank\""); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/service/ReportServiceTest.java b/java-migration/src/test/java/com/cobolmigration/service/ReportServiceTest.java new file mode 100644 index 0000000..bd28140 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/service/ReportServiceTest.java @@ -0,0 +1,91 @@ +package com.cobolmigration.service; + +import com.cobolmigration.model.StudentRecord; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for ReportService validating report formatting matching report_writer/report_test.cbl. + */ +class ReportServiceTest { + + private final ReportService reportService = new ReportService(); + + @Test + @DisplayName("generateReport includes page header with report title") + void testReportHeader() { + List records = List.of( + new StudentRecord(123456, "Test Student", "CSC", 5)); + + List report = reportService.generateReport(records); + + // Header should contain the report title + assertThat(report.get(0)).contains("Customer Order Report"); + } + + @Test + @DisplayName("generateReport includes page number in header") + void testPageNumber() { + List records = List.of( + new StudentRecord(123456, "Test Student", "CSC", 5)); + + List report = reportService.generateReport(records); + + // Second line should contain PAGE and page number + assertThat(report.get(1)).contains("PAGE"); + assertThat(report.get(1)).contains("1"); + } + + @Test + @DisplayName("generateReport includes detail lines with student data") + void testDetailLines() { + List records = List.of( + new StudentRecord(334500, "Test Name", "PHY", 12), + new StudentRecord(112233, "Another Name", "CSC", 8)); + + List report = reportService.generateReport(records); + + // Detail lines start after 5 header lines + String detailLine1 = report.get(5); + assertThat(detailLine1).contains("334500"); + assertThat(detailLine1).contains("Test Name"); + assertThat(detailLine1).contains("PHY"); + assertThat(detailLine1).contains("12"); + + String detailLine2 = report.get(6); + assertThat(detailLine2).contains("112233"); + assertThat(detailLine2).contains("Another Name"); + } + + @Test + @DisplayName("generateReport handles empty record list") + void testEmptyRecords() { + List report = reportService.generateReport(List.of()); + + // Should still have a page header + assertThat(report).isNotEmpty(); + assertThat(report.get(0)).contains("Customer Order Report"); + } + + @Test + @DisplayName("generateReport creates new page when exceeding max details per page") + void testPageBreak() { + // Create enough records to trigger a page break (>37 detail lines) + StudentRecord[] records = new StudentRecord[40]; + for (int i = 0; i < 40; i++) { + records[i] = new StudentRecord(100000 + i, "Student " + i, "CSC", i % 20); + } + + List report = reportService.generateReport(Arrays.asList(records)); + + // Should contain two page headers + long pageHeaderCount = report.stream() + .filter(line -> line.contains("Customer Order Report")) + .count(); + assertThat(pageHeaderCount).isEqualTo(2); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/service/SubProgramServiceTest.java b/java-migration/src/test/java/com/cobolmigration/service/SubProgramServiceTest.java new file mode 100644 index 0000000..e5acdbf --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/service/SubProgramServiceTest.java @@ -0,0 +1,86 @@ +package com.cobolmigration.service; + +import com.cobolmigration.service.SubProgramService.MutableString; +import com.cobolmigration.service.SubProgramService.SubProgramResult; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for SubProgramService validating CALL by-content/by-reference patterns + * from sub_program/main_app.cbl and sub_program/sub.cbl. + */ +class SubProgramServiceTest { + + private SubProgramService subProgramService; + + @BeforeEach + void setUp() { + subProgramService = new SubProgramService(); + } + + @Test + @DisplayName("callByContent does not modify caller's variables (CALL BY CONTENT)") + void testCallByContent() { + String item1 = "value1"; + String item2 = "value2"; + + SubProgramResult result = subProgramService.callByContent(item1, item2); + + // Working-storage was empty at start (first call) + assertThat(result.getWsItem1AtStart()).isEmpty(); + assertThat(result.getWsItem2AtStart()).isEmpty(); + + // Working-storage was updated during call + assertThat(result.getWsItem1AtEnd()).isEqualTo("value1"); + assertThat(result.getWsItem2AtEnd()).isEqualTo("value2"); + + // Caller's variables are NOT modified (by content = copy) + assertThat(item1).isEqualTo("value1"); + assertThat(item2).isEqualTo("value2"); + } + + @Test + @DisplayName("callByReference modifies caller's variables (CALL BY REFERENCE)") + void testCallByReference() { + MutableString item1 = new MutableString("value1"); + MutableString item2 = new MutableString("value2"); + + SubProgramResult result = subProgramService.callByReference(item1, item2); + + // Caller's variables ARE modified (by reference) + assertThat(item1.getValue()).isEqualTo("replace1"); + assertThat(item2.getValue()).isEqualTo("replace2"); + } + + @Test + @DisplayName("working-storage persists between calls until cancel") + void testWorkingStoragePersistence() { + // First call sets working-storage values + subProgramService.callByContent("first1", "first2"); + assertThat(subProgramService.getWsTestItem1()).isEqualTo("first1"); + + // Second call sees working-storage from first call + SubProgramResult result = subProgramService.callByContent("second1", "second2"); + assertThat(result.getWsItem1AtStart()).isEqualTo("first1"); + assertThat(result.getWsItem2AtStart()).isEqualTo("first2"); + } + + @Test + @DisplayName("cancel resets working-storage (CANCEL 'sub-app')") + void testCancel() { + subProgramService.callByContent("value1", "value2"); + assertThat(subProgramService.getWsTestItem1()).isEqualTo("value1"); + + subProgramService.cancel(); + + assertThat(subProgramService.getWsTestItem1()).isEmpty(); + assertThat(subProgramService.getWsTestItem2()).isEmpty(); + + // After cancel, working-storage starts empty again + SubProgramResult result = subProgramService.callByContent("new1", "new2"); + assertThat(result.getWsItem1AtStart()).isEmpty(); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/service/XmlServiceTest.java b/java-migration/src/test/java/com/cobolmigration/service/XmlServiceTest.java new file mode 100644 index 0000000..00efa35 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/service/XmlServiceTest.java @@ -0,0 +1,84 @@ +package com.cobolmigration.service; + +import com.cobolmigration.dto.RecordXmlDto; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for XmlService validating XML generation matching xml_generate/xml_generate.cbl. + */ +class XmlServiceTest { + + private final XmlService xmlService = new XmlService(); + + @Test + @DisplayName("generateXml includes XML declaration header (WITH XML-DECLARATION)") + void testXmlDeclaration() throws Exception { + RecordXmlDto record = new RecordXmlDto("Test Name", "Test Value", null, "true"); + + String xml = xmlService.generateXml(record); + + assertThat(xml).startsWith(""); + } + + @Test + @DisplayName("generateXml suppresses blank field when spaces (SUPPRESS WHEN SPACES)") + void testSuppressWhenSpaces() throws Exception { + RecordXmlDto record = new RecordXmlDto("Test Name", "Test Value", " ", "true"); + + String xml = xmlService.generateXml(record); + + // Blank field with only spaces should be suppressed (set to null in constructor) + assertThat(xml).doesNotContain(""); + } + + @Test + @DisplayName("generateXml includes blank field when non-empty") + void testBlankFieldPresent() throws Exception { + RecordXmlDto record = new RecordXmlDto("Name", "Value", "NonBlank", "false"); + + String xml = xmlService.generateXml(record); + + assertThat(xml).contains("NonBlank"); + } + + @Test + @DisplayName("generateXml includes name and value elements with renamed tags") + void testElementNames() throws Exception { + RecordXmlDto record = new RecordXmlDto("Test Name", "Test Value", null, "true"); + + String xml = xmlService.generateXml(record); + + assertThat(xml).contains(""); + assertThat(xml).contains("Test Name"); + assertThat(xml).contains(""); + assertThat(xml).contains("Test Value"); + } + + @Test + @DisplayName("generateXmlWithCount returns character count matching COBOL COUNT IN") + void testGenerateXmlWithCount() throws Exception { + RecordXmlDto record = new RecordXmlDto("Test Name", "Test Value", null, "true"); + + XmlService.XmlResult result = xmlService.generateXmlWithCount(record); + + assertThat(result.getXml()).isNotEmpty(); + assertThat(result.getCharCount()).isEqualTo(result.getXml().length()); + assertThat(result.getCharCount()).isGreaterThan(0); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/util/NumericUtilsTest.java b/java-migration/src/test/java/com/cobolmigration/util/NumericUtilsTest.java new file mode 100644 index 0000000..9fd7172 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/util/NumericUtilsTest.java @@ -0,0 +1,80 @@ +package com.cobolmigration.util; + +import java.math.BigDecimal; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for NumericUtils validating replacements for COBOL COMP/COMP-3 numeric handling. + * + * @see comp_test/comp_test.cbl + */ +class NumericUtilsTest { + + @Test + @DisplayName("fromComp converts integer to BigDecimal (COMP PIC 999)") + void testFromComp() { + BigDecimal result = NumericUtils.fromComp(24); + assertThat(result).isEqualByComparingTo(new BigDecimal("24")); + } + + @Test + @DisplayName("fromComp2 converts double to BigDecimal (COMP-2)") + void testFromComp2() { + BigDecimal result = NumericUtils.fromComp2(123.456); + assertThat(result).isEqualByComparingTo(new BigDecimal("123.456")); + } + + @Test + @DisplayName("fromComp3 parses string with scale (COMP-3)") + void testFromComp3() { + BigDecimal result = NumericUtils.fromComp3("12345", 2); + assertThat(result).isEqualByComparingTo(new BigDecimal("12345.00")); + assertThat(result.scale()).isEqualTo(2); + } + + @Test + @DisplayName("toDisplay formats to zero-padded string (PIC 999)") + void testToDisplay() { + String result = NumericUtils.toDisplay(new BigDecimal("24"), 3); + assertThat(result).isEqualTo("024"); + } + + @Test + @DisplayName("toDynamicDisplay formats with leading spaces (PIC ZZ9)") + void testToDynamicDisplay() { + String result = NumericUtils.toDynamicDisplay(new BigDecimal("24"), 3); + assertThat(result).isEqualTo(" 24"); + } + + @Test + @DisplayName("multiply performs COBOL MULTIPLY...GIVING operation") + void testMultiply() { + // Mirrors comp_test.cbl: MOVE 12 TO ws-comp-val, MULTIPLY ws-comp-val BY 2 + BigDecimal result = NumericUtils.multiply(new BigDecimal("12"), new BigDecimal("2")); + assertThat(result).isEqualByComparingTo(new BigDecimal("24")); + } + + @Test + @DisplayName("add performs COBOL ADD/COMPUTE operation") + void testAdd() { + BigDecimal result = NumericUtils.add(new BigDecimal("100"), new BigDecimal("200")); + assertThat(result).isEqualByComparingTo(new BigDecimal("300")); + } + + @Test + @DisplayName("toDisplay handles null value") + void testToDisplayNull() { + String result = NumericUtils.toDisplay(null, 3); + assertThat(result).isEqualTo("000"); + } + + @Test + @DisplayName("toDynamicDisplay handles null value") + void testToDynamicDisplayNull() { + String result = NumericUtils.toDynamicDisplay(null, 3); + assertThat(result).isEqualTo(" 0"); + } +} diff --git a/java-migration/src/test/java/com/cobolmigration/util/StringUtilsTest.java b/java-migration/src/test/java/com/cobolmigration/util/StringUtilsTest.java new file mode 100644 index 0000000..2fe0ae8 --- /dev/null +++ b/java-migration/src/test/java/com/cobolmigration/util/StringUtilsTest.java @@ -0,0 +1,172 @@ +package com.cobolmigration.util; + +import java.math.BigDecimal; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +/** + * Tests for StringUtils validating replacements for COBOL TRIM, UNSTRING, + * IS NUMERIC, and NUMVAL operations. + */ +class StringUtilsTest { + + // --- TRIM tests (from trim/trim.cbl) --- + + @Test + @DisplayName("trim removes both leading and trailing spaces") + void testTrim() { + assertThat(StringUtils.trim(" hello world ")).isEqualTo("hello world"); + } + + @Test + @DisplayName("trimLeading removes only leading spaces") + void testTrimLeading() { + assertThat(StringUtils.trimLeading(" hello world ")) + .isEqualTo("hello world "); + } + + @Test + @DisplayName("trimTrailing removes only trailing spaces") + void testTrimTrailing() { + assertThat(StringUtils.trimTrailing(" hello world ")) + .isEqualTo(" hello world"); + } + + @Test + @DisplayName("trim handles null input") + void testTrimNull() { + assertThat(StringUtils.trim(null)).isEqualTo(""); + } + + @Test + @DisplayName("trim handles string literal with spaces") + void testTrimStringLiteral() { + assertThat(StringUtils.trim(" String literal ")).isEqualTo("String literal"); + } + + // --- UNSTRING tests (from unstring/unstring.cbl) --- + + @Test + @DisplayName("unstring splits by single space delimiter") + void testUnstringSingleDelimiter() { + List parts = StringUtils.unstring("Hello World", " "); + assertThat(parts).containsExactly("Hello", "World"); + } + + @Test + @DisplayName("unstring splits by multiple delimiters") + void testUnstringMultipleDelimiters() { + List parts = StringUtils.unstring("AC!D|E", "<", ">", "!", "|"); + assertThat(parts).containsExactly("A", "B", "C", "D", "E"); + } + + @Test + @DisplayName("unstring handles source with no delimiters") + void testUnstringNoDelimiters() { + List parts = StringUtils.unstring("Hello"); + assertThat(parts).containsExactly("Hello"); + } + + @Test + @DisplayName("unstring handles null source") + void testUnstringNull() { + List parts = StringUtils.unstring(null, " "); + assertThat(parts).isEmpty(); + } + + @Test + @DisplayName("unstring with comma and dot delimiters for formatted numbers") + void testUnstringFormattedNumber() { + // Mirrors unstring.cbl Example 6: unstring formatted number + List parts = StringUtils.unstring("123,456.12", ",", "."); + assertThat(parts).containsExactly("123", "456", "12"); + } + + // --- IS NUMERIC tests (from is_numeric/is_numeric.cbl) --- + + @Test + @DisplayName("isNumeric returns true for digit-only string") + void testIsNumericDigits() { + assertThat(StringUtils.isNumeric("12345")).isTrue(); + } + + @Test + @DisplayName("isNumeric returns true for decimal number") + void testIsNumericDecimal() { + assertThat(StringUtils.isNumeric("123.45")).isTrue(); + } + + @Test + @DisplayName("isNumeric returns true for negative number") + void testIsNumericNegative() { + assertThat(StringUtils.isNumeric("-42")).isTrue(); + } + + @Test + @DisplayName("isNumeric returns false for string with letters") + void testIsNumericWithLetters() { + assertThat(StringUtils.isNumeric("abc")).isFalse(); + } + + @Test + @DisplayName("isNumeric returns false for empty/null input") + void testIsNumericEmpty() { + assertThat(StringUtils.isNumeric("")).isFalse(); + assertThat(StringUtils.isNumeric(null)).isFalse(); + } + + @Test + @DisplayName("isNumeric handles trimmed value with spaces") + void testIsNumericWithSpaces() { + // Mirrors the is_numeric.cbl process-trim paragraph + assertThat(StringUtils.isNumeric(" 123 ")).isTrue(); + } + + // --- NUMVAL tests (from numval_test/numval_test.cbl) --- + + @Test + @DisplayName("numval parses string to BigDecimal") + void testNumval() { + BigDecimal result = StringUtils.numval("42"); + assertThat(result).isEqualByComparingTo(new BigDecimal("42")); + } + + @Test + @DisplayName("numval handles decimal values") + void testNumvalDecimal() { + BigDecimal result = StringUtils.numval("123.45"); + assertThat(result).isEqualByComparingTo(new BigDecimal("123.45")); + } + + @Test + @DisplayName("numval trims spaces before parsing") + void testNumvalWithSpaces() { + BigDecimal result = StringUtils.numval(" 100 "); + assertThat(result).isEqualByComparingTo(new BigDecimal("100")); + } + + @Test + @DisplayName("numval throws exception for non-numeric input") + void testNumvalInvalid() { + assertThatThrownBy(() -> StringUtils.numval("abc")) + .isInstanceOf(NumberFormatException.class); + } + + // --- padRight tests --- + + @Test + @DisplayName("padRight pads to specified width") + void testPadRight() { + assertThat(StringUtils.padRight("Hello", 10)).isEqualTo("Hello "); + } + + @Test + @DisplayName("padRight truncates if longer than width") + void testPadRightTruncate() { + assertThat(StringUtils.padRight("Hello World", 5)).isEqualTo("Hello"); + } +} diff --git a/java-migration/src/test/resources/application-test.properties b/java-migration/src/test/resources/application-test.properties new file mode 100644 index 0000000..307f16d --- /dev/null +++ b/java-migration/src/test/resources/application-test.properties @@ -0,0 +1,11 @@ +# Test configuration using H2 in-memory database +spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=PostgreSQL +spring.datasource.username=sa +spring.datasource.password= +spring.datasource.driver-class-name=org.h2.Driver + +spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect + +spring.sql.init.mode=never From 76844abee8fb6d11fc262716c0dd1d42f6b7d624 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 16:44:44 +0000 Subject: [PATCH 2/2] feat: add H2 profile for local testing without PostgreSQL - Add application-h2.properties with H2 in-memory DB config - Add data-h2.sql with 11 seed records matching COBOL create_test_db.sql - Add H2 as runtimeOnly dependency for non-test profiles - Run locally with: ./gradlew bootRun --args='--spring.profiles.active=h2' Co-Authored-By: Jerry Oliphant --- java-migration/build.gradle | 1 + .../main/resources/application-h2.properties | 13 ++++++++ java-migration/src/main/resources/data-h2.sql | 33 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 java-migration/src/main/resources/application-h2.properties create mode 100644 java-migration/src/main/resources/data-h2.sql diff --git a/java-migration/build.gradle b/java-migration/build.gradle index 237c3c7..d6271f9 100644 --- a/java-migration/build.gradle +++ b/java-migration/build.gradle @@ -32,6 +32,7 @@ dependencies { // Testing testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'com.h2database:h2' + runtimeOnly 'com.h2database:h2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/java-migration/src/main/resources/application-h2.properties b/java-migration/src/main/resources/application-h2.properties new file mode 100644 index 0000000..3b95ffe --- /dev/null +++ b/java-migration/src/main/resources/application-h2.properties @@ -0,0 +1,13 @@ +# H2 in-memory database for local testing without PostgreSQL +spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=PostgreSQL +spring.datasource.username=sa +spring.datasource.password= +spring.datasource.driver-class-name=org.h2.Driver + +spring.jpa.hibernate.ddl-auto=create +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect +spring.jpa.defer-datasource-initialization=true + +spring.sql.init.mode=always +spring.sql.init.data-locations=classpath:data-h2.sql diff --git a/java-migration/src/main/resources/data-h2.sql b/java-migration/src/main/resources/data-h2.sql new file mode 100644 index 0000000..ac1ac01 --- /dev/null +++ b/java-migration/src/main/resources/data-h2.sql @@ -0,0 +1,33 @@ +-- Seed data for H2 testing profile (same as sql/create_test_db.sql) +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('John', 'Tester', '15555550100', '123 Fake St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Mike', 'Tester1', '15555550121', '122 Real St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Mary', 'Tester2', '15555550132', '121 ABC St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Jack', 'Tester3', '15555550143', '120 Rock St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Bob', 'Tester4', '15555550154', '119 Truck St, Nowhere', 'N', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Paula', 'Tester5', '1555550165', '118 Car St, Nowhere', 'N', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('James', 'Tester6', '1555550176', '117 Land St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Jane', 'Tester7', '1555550187', '116 Sea St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Bill', 'Tester8', '1555550198', '115 Dock St, Nowhere', 'N', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Lucy', 'Tester9', '1555550209', '114 Beach St, Nowhere', 'Y', NOW(), NOW()); + +INSERT INTO accounts (first_name, last_name, phone, address, is_enabled, create_dt, mod_dt) +VALUES ('Richard', 'Tester10', '1555550210', '113 Water St, Nowhere', 'Y', NOW(), NOW());