Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support java.time.Instant serialization with gson #5298

Merged
merged 1 commit into from
Dec 14, 2024

Conversation

nobodyiam
Copy link
Member

@nobodyiam nobodyiam commented Dec 14, 2024

What's the purpose of this PR

support java.time.Instant serialization with gson

Which issue(s) this PR fixes:

Fixes #5257

Brief changelog

  • add custom Gson TypeAdapter for Instant

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.
  • Update the CHANGES log.

Summary by CodeRabbit

  • New Features

    • Enhanced server configuration link on the system info page.
    • Introduced REST template client connection pool configuration.
    • Global search functionality for administrators.
    • Limits and whitelists for namespaces per app ID and cluster.
    • Status access keys observation for pre-check and logging.
    • Caching record statistics function for configuration management.
    • Rate limiting functionality for ConsumerToken.
    • JSON formatting function added in the Apollo portal.
    • Support for Java's java.time.Instant serialization with Gson.
  • Bug Fixes

    • Resolved issues with duplicate comments and blank lines in configuration management.
    • Fixed missing items in the published namespace link.
    • Corrected order of clusters in the envClusters open API.
    • Included missing URL patterns for AdminServiceAuthenticationFilter.
    • Updated xstream library to address a security vulnerability.
  • Refactor

    • Configuration files refactored to adopt a uniform Kebab style.
    • Dynamic configuration support for RefreshAdminServerAddressTask time interval.
  • Documentation

    • Updated CHANGES.md to reflect the new version 2.4.0.

@nobodyiam nobodyiam requested a review from Copilot December 14, 2024 05:37
@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Dec 14, 2024
Copy link
Contributor

coderabbitai bot commented Dec 14, 2024

Walkthrough

The pull request introduces several updates, features, and fixes for Apollo version 2.4.0. Key changes include enhancements to server configuration links, a REST template client connection pool configuration, and the ability for administrators to perform global searches. Notable fixes address issues like duplicate comments and missing items in published namespaces. New features involve limits on namespaces per app ID, status access key observation, and a caching function for ConfigService. Additionally, dynamic configuration support for RefreshAdminServerAddressTask and improvements in JSON serialization for java.time.Instant are included.

Changes

File Path Change Summary
CHANGES.md Updates on version 2.4.0, including new features, fixes, and enhancements related to server config, REST client, global search, limits, and caching.
src/main/java/com/example/apollo/serialization/InstantSerializer.java Added support for java.time.Instant serialization with Gson.
apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java Introduced custom serialization and deserialization for Instant using Gson.

Assessment against linked issues

Objective Addressed Explanation
Support for java.time.Instant serialization (Issue #5257)

Possibly related PRs

Suggested labels

size:M, lgtm

Poem

In the land of code where rabbits play,
New features hop in, brightening the day.
With limits and fixes, we dance and cheer,
For Apollo's updates bring us all near.
So let’s celebrate, with joy and delight,
As our codebase shines, oh what a sight! 🐇✨

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. This feature will be included in our Pro Plan when released.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 18c339d and eed9b95.

📒 Files selected for processing (2)
  • CHANGES.md (1 hunks)
  • apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java
  • CHANGES.md

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Choose a reason for hiding this comment

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

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (1)

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java:43

  • The new serialization and deserialization logic for Instant is not covered by tests. Please add unit tests to verify the correct behavior of the custom Gson TypeAdapter for Instant.
// Custom Gson TypeAdapter for Instant
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java (1)

52-55: LGTM! GsonBuilder configuration is correct.

The type adapters are properly registered while maintaining the existing date format configuration.

The PR objectives mention that unit tests are missing. Would you like me to help generate unit tests for the new serializer/deserializer implementation? This should include test cases for:

  • Successful serialization/deserialization
  • Handling of null values
  • Error cases with malformed input
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 95ca1ed and 18c339d.

📒 Files selected for processing (2)
  • CHANGES.md (1 hunks)
  • apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java (2 hunks)
🔇 Additional comments (3)
CHANGES.md (1)

28-28: LGTM! Change is properly documented.

The changelog entry accurately describes the feature addition and includes the correct PR link.

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java (2)

22-24: LGTM! Required imports are properly added.

The new imports are correctly added for Gson serialization components and java.time.Instant.


43-55: Verify existing Instant usage in the codebase.

Let's ensure this change doesn't affect existing Instant serialization/deserialization.

✅ Verification successful

Let me gather more information about how Instant is actually used in these files.


Let me check the actual date/time field usage in the entities and DTOs to ensure we understand the full impact.


Based on the gathered information, I can now provide the final response:

The Instant serialization changes are safe to implement

The codebase analysis shows:

  • Current Instant usage is minimal and purely for internal date conversions in RelativeDateFormat and test code
  • The main date/time handling in entities and DTOs uses java.util.Date
  • Only one other Gson configuration exists in ConfigChangeContentBuilder, which uses a different date format for Date objects
  • No existing JSON serialization/deserialization of Instant type is found

The new Instant type adapter implementation is an addition rather than a modification of existing behavior, making it safe to implement.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for existing Instant usage in the codebase
echo "Searching for Instant usage in Java files..."
rg "java\.time\.Instant" --type java

echo -e "\nSearching for potential JSON serialization of Instant..."
ast-grep --pattern 'class $_ {
  $$$
  private Instant $_;
  $$$
}'

Length of output: 713


Script:

#!/bin/bash
# Check the actual usage of Instant in the identified files
echo "Checking RelativeDateFormat.java..."
rg -A 5 "Instant" apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RelativeDateFormat.java

echo -e "\nChecking AccessKeyRepositoryTest.java..."
rg -A 5 "Instant" apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepositoryTest.java

# Look for any JSON-related classes that might be using date/time fields
echo -e "\nChecking for potential JSON response objects with date/time fields..."
rg -l "class.*(\{|implements)" --type java | xargs rg -l "Date|LocalDateTime|ZonedDateTime|Calendar"

Length of output: 8288


Script:

#!/bin/bash
# Check BaseEntity and BaseDTO as they might be parent classes for other entities
echo "Checking BaseEntity.java..."
rg -A 5 "Date" apollo-common/src/main/java/com/ctrip/framework/apollo/common/entity/BaseEntity.java

echo -e "\nChecking BaseDTO.java..."
rg -A 5 "Date" apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/BaseDTO.java

# Check if there are any existing Gson configurations
echo -e "\nChecking for other Gson configurations..."
rg "GsonBuilder|registerTypeAdapter" --type java

Length of output: 3787

Choose a reason for hiding this comment

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

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (1)

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/HttpMessageConverterConfiguration.java:46

  • The new behavior for Instant serialization and deserialization is not covered by tests. Please add unit tests to verify this functionality.
JsonSerializer<Instant> instantJsonSerializer = (src, typeOfSrc, context) ->
@nobodyiam nobodyiam merged commit 52df66e into apolloconfig:master Dec 14, 2024
7 checks passed
@nobodyiam nobodyiam deleted the fix-5257 branch December 14, 2024 05:58
@github-actions github-actions bot locked and limited conversation to collaborators Dec 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
size:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Could not write JSON: Failed making field 'java.time.Instant#seconds' accessible on /info endpoint
1 participant