-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
feat: add type handlers for SimpleUri and BlockUri #5061
Merged
Merged
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
c3cc34c
feat: add type handler for SimpleUri
jdrueckert 0cd29f0
chore: register new SimpleUri type handler
jdrueckert 9a50fb3
feat: add uri validity check
jdrueckert 9181b83
test: add tests for new SimpleUriTypeHandler
jdrueckert a4578e5
fix: return null if uri invalid
jdrueckert e9a8707
Merge branch 'develop' into feat/add-simpleuri-typehandler
jdrueckert 6fafbde
feat: add type handler for BlockUri
jdrueckert 388e720
Merge branch 'develop' into feat/add-simpleuri-typehandler
jdrueckert 60282ab
chore: remove unused imports
jdrueckert 005e60c
feat: register BlockUriTypeHandler
jdrueckert 64b06e1
Merge branch 'develop' into feat/add-simpleuri-typehandler
jdrueckert File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...a/org/terasology/engine/persistence/typeHandling/extensionTypes/SimpleUriTypeHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,32 @@ | ||||||||||
// Copyright 2022 The Terasology Foundation | ||||||||||
// SPDX-License-Identifier: Apache-2.0 | ||||||||||
|
||||||||||
package org.terasology.engine.persistence.typeHandling.extensionTypes; | ||||||||||
|
||||||||||
import org.slf4j.Logger; | ||||||||||
import org.slf4j.LoggerFactory; | ||||||||||
import org.terasology.engine.core.SimpleUri; | ||||||||||
import org.terasology.persistence.typeHandling.StringRepresentationTypeHandler; | ||||||||||
|
||||||||||
public class SimpleUriTypeHandler extends StringRepresentationTypeHandler<SimpleUri> { | ||||||||||
|
||||||||||
private static final Logger logger = LoggerFactory.getLogger(SimpleUriTypeHandler.class); | ||||||||||
|
||||||||||
@Override | ||||||||||
public String getAsString(SimpleUri uri) { | ||||||||||
if (uri == null) { | ||||||||||
return ""; | ||||||||||
} | ||||||||||
return uri.toString(); | ||||||||||
} | ||||||||||
|
||||||||||
@Override | ||||||||||
public SimpleUri getFromString(String representation) { | ||||||||||
SimpleUri uri = new SimpleUri(representation); | ||||||||||
if (!uri.isValid()) { | ||||||||||
logger.error("Failed to create valid SimpleURI from string '{}'", representation); | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done ✔️ also added tests |
||||||||||
} | ||||||||||
|
||||||||||
return uri; | ||||||||||
} | ||||||||||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll want to add BlockUri's handler here too, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch, thank you! will add that later today 👍