-
Notifications
You must be signed in to change notification settings - Fork 198
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minor Improvement for Oracle JsonView optimistic locking (#2915)
* Minor Improvement for Oracle JsonView optimistic locking Extract SqlExceptionMapper for extensibility. Added support for optimistic lock checking in batch update for JsonView. * Separate handlers for Jdbc and R2dbc * Address review comments. * Removed unused var and imports * More changes per CR comments * Sonar suggested changes
- Loading branch information
1 parent
bbd95c7
commit ee8cf96
Showing
10 changed files
with
363 additions
and
83 deletions.
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
55 changes: 55 additions & 0 deletions
55
data-jdbc/src/main/java/io/micronaut/data/jdbc/operations/OracleSqlExceptionMapper.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,55 @@ | ||
| /* | ||
| * Copyright 2017-2024 original 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.micronaut.data.jdbc.operations; | ||
|
|
||
| import io.micronaut.core.annotation.Internal; | ||
| import io.micronaut.core.annotation.NonNull; | ||
| import io.micronaut.core.annotation.Nullable; | ||
| import io.micronaut.data.exceptions.DataAccessException; | ||
| import io.micronaut.data.exceptions.OptimisticLockException; | ||
| import io.micronaut.data.model.query.builder.sql.Dialect; | ||
| import jakarta.inject.Singleton; | ||
|
|
||
| import java.sql.SQLException; | ||
|
|
||
| /** | ||
| * The {@link SqlExceptionMapper} for {@link Dialect#ORACLE}. | ||
| * Handles {@link SQLException} for Oracle update commands. Can add more logic if needed, but this | ||
| * now handles only optimistic locking exception for given error code. | ||
| * | ||
| * @since 4.8.0 | ||
| */ | ||
| @Singleton | ||
| @Internal | ||
| final class OracleSqlExceptionMapper implements SqlExceptionMapper { | ||
|
|
||
| private static final int JSON_VIEW_ETAG_NOT_MATCHING_ERROR = 42699; | ||
|
|
||
| @Override | ||
| public Dialect getDialect() { | ||
| return Dialect.ORACLE; | ||
| } | ||
|
|
||
| @Override | ||
| @Nullable | ||
| public DataAccessException mapSqlException(@NonNull SQLException sqlException) { | ||
| if (sqlException.getErrorCode() == JSON_VIEW_ETAG_NOT_MATCHING_ERROR) { | ||
| return new OptimisticLockException("ETAG did not match when updating record: " + sqlException.getMessage(), sqlException); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
|
|
52 changes: 52 additions & 0 deletions
52
data-jdbc/src/main/java/io/micronaut/data/jdbc/operations/SqlExceptionMapper.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,52 @@ | ||
| /* | ||
| * Copyright 2017-2024 original 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.micronaut.data.jdbc.operations; | ||
|
|
||
| import io.micronaut.core.annotation.Experimental; | ||
| import io.micronaut.core.annotation.NonNull; | ||
| import io.micronaut.core.annotation.Nullable; | ||
| import io.micronaut.core.order.Ordered; | ||
| import io.micronaut.data.exceptions.DataAccessException; | ||
| import io.micronaut.data.model.query.builder.sql.Dialect; | ||
|
|
||
| import java.sql.SQLException; | ||
|
|
||
| /** | ||
| * The {@link SQLException} mapper interface. Can be used to map given SQL exceptions to some custom exceptions | ||
| * (for example {@link DataAccessException} and its descendents like {@link io.micronaut.data.exceptions.OptimisticLockException}). | ||
| * | ||
| * @since 4.8.0 | ||
| */ | ||
| @Experimental | ||
| public interface SqlExceptionMapper extends Ordered { | ||
|
|
||
| /** | ||
| * @return the {@link Dialect} that this mapper supports | ||
| */ | ||
| @NonNull | ||
| Dialect getDialect(); | ||
|
|
||
| /** | ||
| * Maps {@link SQLException} to custom {@link DataAccessException}. | ||
| * In case when mapper is not able to map {@link SQLException} to custom {@link DataAccessException} then result will be null | ||
| * indicating that mapper cannot map the exception. | ||
| * | ||
| * @param sqlException The SQL exception | ||
| * @return mapped {@link DataAccessException} from {@link SQLException} or if mapper cannot map {@link SQLException} then returns null | ||
| */ | ||
| @Nullable | ||
| DataAccessException mapSqlException(@NonNull SQLException sqlException); | ||
| } |
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
Oops, something went wrong.