forgejo/wordcount

Fork 0

fix/frequency-assertions #7

Merged

forgejo merged 44 commits from fix/frequency-assertions into main

2026-08-29 16:49:30 +02:00

forgejo commented

2026-08-29 16:48:55 +02:00

Owner

No description provided.

forgejo added 44 commits

2026-08-29 16:48:55 +02:00

refactor: extract exception handling to GlobalExceptionHandler 97a94b81e4

- Create @RestControllerAdvice GlobalExceptionHandler for constraint violation (400) and illegal argument (404)
- Remove @ExceptionHandler methods from WordFrequencyController (now pure routing layer)
- Add GlobalExceptionHandlerTest with @WebMvcTest and @MockBean (2 tests)
- No behavioral changes, same 59 tests passing

refactor: return Integer from getFrequencyForWord controller endpoint bcedc62f82

- Controller returns just the frequency count, matching analyzer's int return type
- Removed word property from controller test assertions

Changes: controller + 2 test assertions updated. 59 tests passing.

refactor: inline service calls in controller, no intermediate variables e771578ec1

refactor: return int from calculateFrequencyForWord in service layer 28f243a4fd

- Service method returns int directly, removing WordFrequency model wrapping
- Removed WordFrequencyMapper dependency from service (no longer needed)
- Controller no longer calls .getFrequency()
- Updated service test to assert int instead of WordFrequency
- Same 59 tests passing

refactor: proper error handling with custom exceptions and error response bodies d999d31713

- Create InvalidInputException (400) for validation errors (blank/null text, word, n)
- Create ResourceNotFoundException (404) for not-found errors (missing words, empty text results)
- Create ErrorResponse DTO with title and error fields for structured error responses
- Update GlobalExceptionHandler to handle MissingServletRequestParameterException, ConstraintViolationException, InvalidInputException, and ResourceNotFoundException
- Validators throw InvalidInputException instead of IllegalArgumentException
- Service throws InvalidInputException for validation and ResourceNotFoundException for not-found
- Controller tests updated: empty text now returns 400 (validation) instead of 404
- Add unit tests for exception classes and ErrorResponse
- 64 tests passing (5 new test files, 5 new source files)

refactor: consolidate ConstraintViolation into InvalidInput handler 28b0a20742

- Single @ExceptionHandler handles both InvalidInputException and ConstraintViolationException
- No separate ConstraintViolation handler — both return same ErrorResponse format
- ConstraintViolationException import retained only for handler parameter typing

refactor: simplify to IllegalArgumentException and ResourceNotFoundException handlers 6f933a522d

- Remove InvalidInputException and ErrorResponse (no error bodies)
- GlobalExceptionHandler: 2 custom handlers + ConstraintViolationException
  for @Min (all return status-only responses)
- Validators and service throw IllegalArgumentException instead of
  InvalidInputException
- Update tests: IllegalArgumentException assertions, remove InvalidInputException
  and ErrorResponse tests
- 61 tests passing (64 - 3 deleted)

refactor: remove @Min and ConstraintViolationException handler 5652bcf116

- Remove @Min from controller parameter — n validation handled by
  service layer validator (throws IllegalArgumentException)
- Remove ConstraintViolationException handler from GlobalExceptionHandler
- Remove @Validated from controller — no more validation annotations
- GlobalExceptionHandler now has exactly 2 handlers:
  IllegalArgumentException → 400, ResourceNotFoundException → 404

test: consolidate validation and analyzer tests with @ParameterizedTest 82553f9120

- ValidateTextNotBlankTest: 4 → 2 tests (parameterize null/empty/blank)
- ValidateTextAndWordNotBlankTest: 5 → 3 tests (parameterize text and word)
- ValidateTextNotBlankAndNPositiveTest: 5 → 3 tests (parameterize text and n)
- WordFrequencyAnalyzerImplTest: 12 → 11 tests (parameterize case variants)
- Total: 18 individual tests → 9 parameterized test methods (64 test invocations)

test: remove duplicated 400 tests from GlobalExceptionHandlerTest 89446f1bc6

- missingParam_returns400 → covered by highestFrequencyMissingText
- illegalArgument_returns400 → covered by highestFrequencyEmptyText
- Kept resourceNotFound_returns404 as it's unique to the handler layer
- 62 tests passing (was 64, removed 2 duplicates)

test: remove GlobalExceptionHandlerTest — fully covered by controller test 1c0601f2db

- handler has no logic beyond RNF → 404
- frequencyForWordNotFound in controller test covers this end-to-end
- 61 tests passing

test: remove 6 mocked service tests covered by controller layer 0d8111cc92

- Removed: valid/delegation and zero/empty-result → RNF tests
- Kept: 5 input validation tests (service concern) + word lowercasing (service-specific behavior)
- 61 → 55 tests, no loss of unique coverage

test: remove lowercasesWord service test — already covered by analyzer + controller b9a2012587

- Analyzer tests verify case-insensitivity directly (caseInsensitiveMatching)
- Controller test frequencyForWordCaseInsensitive covers full-stack scenario
- Removed Mockito dependency from service tests entirely
- 55 → 54 tests, no loss of coverage

refactor: remove ResourceNotFoundException, return 0 for missing words 1644138ae3

- Remove ResourceNotFoundException exception and its test
- Service inlines analyzer calls (no intermediate variables, no throws)
- GlobalExceptionHandler: only IllegalArgumentException handler remains
- Controller test: word not found → 200 with body 0 (was 404)
- 54 → 53 tests

refactor: remove redundant toLowerCase from service — analyzer already normalizes case 2df15246cf

refactor: remove default value for n parameter — now required 81b2e869b9

- @RequestParam int n instead of defaultValue = 3
- Removed mostFrequentDefaultN test — no longer valid
- 53 → 52 tests

feat: add Lombok @RequiredArgsConstructor to reduce boilerplate a775b9e2e0

- Add lombok dependency to pom.xml
- Replace manual constructors with @RequiredArgsConstructor on 6 classes
- 32 lines removed, 15 added (imports + annotations)
- All 52 tests pass

refactor: inline stream operations in WordFrequencyAnalyzerImpl 0c578389c9

- calculateFrequencyForWord: removed intermediate frequencies variable
- calculateHighestFrequency: compacted method chain
- calculateMostFrequentNWords: use .toList() + assign to correctly-typed variable
- All 52 tests pass

refactor: inline .toList() in calculateMostFrequentNWords 17c4762be4

- Wrapped .toList() result directly in new ArrayList<>(...) for type coercion
- WordFrequencyModel implements WordFrequency but List<WordFrequencyModel>
  is not assignable to List<WordFrequency> (Java generics are invariant)
- ArrayList wrapper required for type conversion
- 52 tests pass

Use WordFrequencyModel instead of WordFrequency interface and fix blank lines 65656aae95

- Replace all WordFrequency interface references with WordFrequencyModel in return types
- Remove ArrayList wrapper from stream collection in analyzer
- Add missing blank lines after fields in 5 source files

Use Predicate.not(String::isEmpty) instead of lambda filter 7f6eee00f1

Replace List.of().stream() with Arrays.stream() and use .toList() 188ec274e5

Remove WordFrequencyMapper — use WordFrequencyModel(Entry) constructor directly 96c45dff45

Use equalsIgnoreCase instead of equals + toLowerCase for clarity 85f36b3717

Remove validator-from-validator coupling — service orchestrates validation e9b2db593a

Rename ValidateTextNotBlankAndNPositive to ValidateNPositive e700cd10f9

Fix field name: validateTextNotBlankAndNPositive → validateNPositive b6ed6e37df

Rename ValidateNPositive to ValidatePositive de295363e6

Remove ValidateTextAndWordNotBlank validator coupling — service orchestrates validation cc011095f0

Remove unused text parameter from ValidatePositive and ValidateWordNotBlank 09a7df43e3

Move interfaces to their implementation packages 4e14c506b0

Support Unicode letters with \p{L} regex and add accented word tests aa7f6f4cc7