Skip to content

refactor: remove equivalent generated-source edits - #919

Merged
apcha-oai merged 1 commit into
mainfrom
apcha/castiron-java-equivalent-cleanup
Aug 21, 2026
Merged

refactor: remove equivalent generated-source edits#919
apcha-oai merged 1 commit into
mainfrom
apcha/castiron-java-equivalent-cleanup

Conversation

@apcha-oai

Copy link
Copy Markdown
Contributor

Summary

Remove two behavior-equivalent edits from generated Kotlin files: an extra blank line in ResponseStreamEvent serialization and an unqualified reference to ImageServiceImpl.WithRawResponseImpl. Both complete files now match the verified public generated snapshot. Serialization, request handling, public API, generation metadata, and API-reference artifacts are unchanged.

The custom-code report moves from 61 to 59 mixed files, with two customizations removed and all 59 others unchanged.

Test Plan

Automated

  • Full formatting, lint, and SDK build, including Jackson compatibility: passed.
  • ResponseStreamEventTest, ResponseStreamEventValidationTest, ImageServiceTest, and ImageServiceAsyncTest: 136 passed, four existing skips.
  • Baseline and proposed API-compatibility compilation and public-signature checks: passed.
  • Exact generated-file and before/after source comparison: passed.

@apcha-oai apcha-oai added the custom-code-burndown Behavior-preserving cleanup of custom code in generated SDK files label Aug 20, 2026
@github-actions

github-actions Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Castiron custom code

✅ No new custom-code files detected.

59 mixed files remain; 0 existing customizations changed; 2 customizations removed.

Compared ca9c11dd90bea71b01501e3b. Generated baselines verified.

File Result Current custom patch
openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseStreamEvent.kt Customization removed None
openai-java-core/src/main/kotlin/com/openai/services/blocking/ImageServiceImpl.kt Customization removed None
59 existing customizations unchanged
  • openai-java-core/src/main/kotlin/com/openai/models/audio/AudioResponseFormat.kt
  • openai-java-core/src/main/kotlin/com/openai/models/beta/responses/BetaResponsesServerEvent.kt
  • openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionCreateParams.kt
  • openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionMessageFunctionToolCall.kt
  • openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionToolMessageParam.kt
  • openai-java-core/src/main/kotlin/com/openai/models/embeddings/Embedding.kt
  • openai-java-core/src/main/kotlin/com/openai/models/embeddings/EmbeddingCreateParams.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseCreateParams.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseFunctionToolCall.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseFunctionWebSearch.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseInputItem.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseTextConfig.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponsesServerEvent.kt
  • openai-java-core/src/main/kotlin/com/openai/models/videos/Video.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/ResponseServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/ResponseServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/WebhookServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/WebhookServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/audio/TranscriptionServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/beta/ResponseServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/chat/ChatCompletionServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/finetuning/checkpoints/PermissionServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/ResponseService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/ResponseServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/WebhookService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/WebhookServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/audio/TranscriptionServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/beta/ResponseServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/ChatCompletionService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/finetuning/checkpoints/PermissionServiceImpl.kt
  • openai-java-core/src/test/kotlin/com/openai/models/beta/responses/BetaResponsesServerEventTest.kt
  • openai-java-core/src/test/kotlin/com/openai/models/chat/completions/ChatCompletionCreateParamsTest.kt
  • openai-java-core/src/test/kotlin/com/openai/models/embeddings/EmbeddingTest.kt
  • openai-java-core/src/test/kotlin/com/openai/models/responses/ResponsesServerEventTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/CompletionServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/ImageServiceAsyncTest.kt

19 more in the full report.

A changed generated baseline means this report cannot reliably identify which handwritten lines changed.

Inspect the custom-code diff

Download the exact patch produced by this run (requires repository access):

gh run download 32429695602 --repo openai/openai-java \
  --name castiron-custom-code-32429695602-1 --dir /tmp/castiron-custom-code-32429695602-1
git apply --stat /tmp/castiron-custom-code-32429695602-1/custom-code.patch
cat /tmp/castiron-custom-code-32429695602-1/custom-code.patch

Or reproduce it from an SDK checkout containing the vendored reporter:

git fetch --no-tags origin ca9c11dd90be5b10b67797a0af6e575ce776bb6a a71b01501e3b72644c3bf535cc9dec8156457f02
python3 scripts/castiron/custom_code_report.py report \
  --base ca9c11dd90be5b10b67797a0af6e575ce776bb6a \
  --head a71b01501e3b72644c3bf535cc9dec8156457f02 --fetch --require-head-hash --public \
  --out /tmp/castiron-custom-code-a71b01501e3b
cat /tmp/castiron-custom-code-a71b01501e3b/custom-code.patch

This is the current full custom patch for mixed files, not an attribution of only the handwritten lines changed by this PR.

Full report and patch

@apcha-oai
apcha-oai marked this pull request as ready for review August 20, 2026 23:41
@apcha-oai
apcha-oai requested a review from a team as a code owner August 20, 2026 23:41
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 20, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review Completed 2026-08-20T23:42:14.913802Z a71b015 Draft marked ready
🔒 Security Review Completed 2026-08-20T23:42:38.695734Z a71b015 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@openai-sdks

openai-sdks Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

OkTest Summary

237/237 SDK tests passed in 16.507s for Java SDK PR #919.

Test results — 42 files
Test Result Time
tests/chat-completions-complex-body.test.ts ✅ Passed 169ms
tests/chat-completions-create.test.ts ✅ Passed 495ms
tests/chat-completions-stream.test.ts ✅ Passed 338ms
tests/files-content-binary.test.ts ✅ Passed 326ms
tests/files-create-multipart.test.ts ✅ Passed 378ms
tests/files-list-pagination.test.ts ✅ Passed 264ms
tests/initialize-config.test.ts ✅ Passed 181ms
tests/instance-isolation.test.ts ✅ Passed 278ms
tests/models-list.test.ts ✅ Passed 200ms
tests/responses-background-lifecycle.test.ts ✅ Passed 256ms
tests/responses-body-method-errors.test.ts ✅ Passed 512ms
tests/responses-cancel-timeout.test.ts ✅ Passed 239ms
tests/responses-cancel.test.ts ✅ Passed 258ms
tests/responses-compact-retries.test.ts ✅ Passed 345ms
tests/responses-compact.test.ts ✅ Passed 361ms
tests/responses-create-advanced-stream.test.ts ✅ Passed 812ms
tests/responses-create-advanced.test.ts ✅ Passed 1.357s
tests/responses-create-disconnect.test.ts ✅ Passed 1.093s
tests/responses-create-errors.test.ts ✅ Passed 398ms
tests/responses-create-malformed-api-responses.test.ts ✅ Passed 316ms
tests/responses-create-retries.test.ts ✅ Passed 312ms
tests/responses-create-stream-failures.test.ts ✅ Passed 236ms
tests/responses-create-stream-timeout.test.ts ✅ Passed 311ms
tests/responses-create-stream-wire.test.ts ✅ Passed 6.26s
tests/responses-create-stream.test.ts ✅ Passed 132ms
tests/responses-create-terminal-states.test.ts ✅ Passed 360ms
tests/responses-create-timeout.test.ts ✅ Passed 231ms
tests/responses-create.test.ts ✅ Passed 732ms
tests/responses-delete.test.ts ✅ Passed 297ms
tests/responses-input-items-errors.test.ts ✅ Passed 317ms
tests/responses-input-items-list.test.ts ✅ Passed 334ms
tests/responses-input-items-options.test.ts ✅ Passed 275ms
tests/responses-input-tokens-count-timeout.test.ts ✅ Passed 246ms
tests/responses-input-tokens-count.test.ts ✅ Passed 438ms
tests/responses-malformed-inputs.test.ts ✅ Passed 5.207s
tests/responses-not-found-errors.test.ts ✅ Passed 414ms
tests/responses-parse.test.ts ✅ Passed 601ms
tests/responses-retrieve-retries.test.ts ✅ Passed 406ms
tests/responses-retrieve.test.ts ✅ Passed 306ms
tests/responses-stored-method-errors.test.ts ✅ Passed 1.008s
tests/retry-behavior.test.ts ✅ Passed 3.514s
tests/sdk-error-shape.test.ts ✅ Passed 415ms

View OkTest run #32429697333

SDK merge (1ac4f76655f1) · head (a71b01501e3b) · base (ca9c11dd90be) · OkTest (2b1bdfd25e98)

@jbeckwith-oai jbeckwith-oai left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Independently verified both generated-source restorations are behavior-equivalent: whitespace normalization and explicit qualification of the same nested implementation preserve public signatures, serialization, constructors, and runtime behavior.

@apcha-oai
apcha-oai added this pull request to the merge queue Aug 21, 2026
Merged via the queue into main with commit a2f4dde Aug 21, 2026
11 checks passed
@openai-sdks openai-sdks Bot mentioned this pull request Aug 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

custom-code-burndown Behavior-preserving cleanup of custom code in generated SDK files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants