-
Notifications
You must be signed in to change notification settings - Fork 184
New codecs for java 8 time types - issue 591 #608
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
Open
steverigney
wants to merge
3
commits into
pgjdbc:main
Choose a base branch
from
steverigney:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
Large diffs are not rendered by default.
Oops, something went wrong.
28 changes: 28 additions & 0 deletions
28
src/main/java/io/r2dbc/postgresql/codec/DayOfWeekCodec.java
This file contains hidden or 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,28 @@ | ||
| /* | ||
| * Copyright 2017 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.r2dbc.postgresql.codec; | ||
|
|
||
| import io.netty.buffer.ByteBufAllocator; | ||
|
|
||
| import java.time.DayOfWeek; | ||
|
|
||
| final class DayOfWeekCodec extends IntegerCodecDelegate<DayOfWeek> { | ||
|
|
||
| DayOfWeekCodec(ByteBufAllocator byteBufAllocator) { | ||
| super(DayOfWeek.class, byteBufAllocator, DayOfWeek::getValue, DayOfWeek::of); | ||
| } | ||
| } |
This file contains hidden or 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
73 changes: 73 additions & 0 deletions
73
src/main/java/io/r2dbc/postgresql/codec/IntegerCodecDelegate.java
This file contains hidden or 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,73 @@ | ||
| /* | ||
| * Copyright 2017 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.r2dbc.postgresql.codec; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.buffer.ByteBufAllocator; | ||
| import io.r2dbc.postgresql.client.EncodedParameter; | ||
| import io.r2dbc.postgresql.message.Format; | ||
| import io.r2dbc.postgresql.util.Assert; | ||
|
|
||
| import java.util.function.Function; | ||
|
|
||
| class IntegerCodecDelegate<T> extends AbstractCodec<T> { | ||
|
|
||
| private final IntegerCodec delegate; | ||
| private final Function<T, Integer> toIntegerConverter; | ||
| private final Function<Integer, T> fromIntegerConverter; | ||
|
|
||
| IntegerCodecDelegate(Class<T> type, ByteBufAllocator byteBufAllocator, Function<T,Integer> toIntegerConverter, Function<Integer, T> fromIntegerConverter) { | ||
| super(type); | ||
| this.delegate = new IntegerCodec(byteBufAllocator); | ||
| this.toIntegerConverter = toIntegerConverter; | ||
| this.fromIntegerConverter = fromIntegerConverter; | ||
| } | ||
|
|
||
| @Override | ||
| boolean doCanDecode(PostgresqlObjectId type, Format format) { | ||
| return delegate.doCanDecode(type, format); | ||
| } | ||
|
|
||
| @Override | ||
| T doDecode(ByteBuf buffer, PostgresTypeIdentifier dataType, Format format, Class<? extends T> type) { | ||
| final Integer number = delegate.doDecode(buffer, dataType, format, Integer.TYPE); | ||
| return fromIntegerConverter.apply(number); | ||
| } | ||
|
|
||
| @Override | ||
| EncodedParameter doEncode(T value) { | ||
| Assert.requireNonNull(value, "value must not be null"); | ||
| return delegate.doEncode(toIntegerConverter.apply(value)); | ||
| } | ||
|
|
||
| @Override | ||
| EncodedParameter doEncode(T value, PostgresTypeIdentifier dataType) { | ||
| Assert.requireNonNull(value, "value must not be null"); | ||
| Assert.requireNonNull(dataType, "dataType must not be null"); | ||
| return delegate.doEncode(toIntegerConverter.apply(value), dataType); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterable<? extends PostgresTypeIdentifier> getDataTypes() { | ||
| return delegate.getDataTypes(); | ||
| } | ||
|
|
||
| @Override | ||
| public EncodedParameter encodeNull() { | ||
| return delegate.encodeNull(); | ||
| } | ||
| } |
Oops, something went wrong.
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.
What's the reason for this change? It makes the pull request almost illegible because it mixes refactorings with actual changes.
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.
This looks to have been introduced as part of accidental reformatting and is an oversight on my part, I have created a new commit that rolls back the formatting changes to Default Codec.