-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Record processing backport Signed-off-by: David Kral <[email protected]>
- Loading branch information
Showing
16 changed files
with
498 additions
and
14 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| # | ||
| # Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. | ||
| # | ||
| # This program and the accompanying materials are made available under the | ||
| # terms of the Eclipse Public License v. 2.0 which is available at | ||
| # http://www.eclipse.org/legal/epl-2.0, | ||
| # or the Eclipse Distribution License v. 1.0 which is available at | ||
| # http://www.eclipse.org/org/documents/edl-v10.php. | ||
| # | ||
| # SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause | ||
| # | ||
|
|
||
| name: Yasson | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Test on JDK ${{ matrix.java_version }} | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| matrix: | ||
| java_version: [ 11, 17 ] | ||
|
|
||
| steps: | ||
| - name: Checkout for build | ||
| uses: actions/[email protected] | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Set up compile JDK | ||
| uses: actions/setup-java@v2 | ||
| with: #Compile java needs to be the highest to ensure proper compilation of the multi-release jar | ||
| distribution: 'adopt' | ||
| java-version: 17 | ||
| - name: Maven cache | ||
| uses: actions/cache@v2 | ||
| env: | ||
| cache-name: maven-cache | ||
| with: | ||
| path: | ||
| ~/.m2 | ||
| key: build-${{ env.cache-name }} | ||
| - name: Copyright | ||
| run: bash etc/copyright.sh | ||
| - name: Checkstyle | ||
| run: mvn -B -Pstaging checkstyle:checkstyle | ||
| - name: Yasson install | ||
| run: mvn -U -C -Pstaging clean install -DskipTests | ||
| - name: Set up JDK for tests | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: 'adopt' | ||
| java-version: ${{ matrix.java_version }} | ||
| - name: Yasson tests | ||
| run: mvn -U -C -Dmaven.javadoc.skip=true -Pstaging verify |
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
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
53 changes: 53 additions & 0 deletions
53
src/main/java/org/eclipse/yasson/internal/ClassMultiReleaseExtension.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,53 @@ | ||
| /* | ||
| * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0, | ||
| * or the Eclipse Distribution License v. 1.0 which is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause | ||
| */ | ||
|
|
||
| package org.eclipse.yasson.internal; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.Method; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| import javax.json.bind.JsonbException; | ||
|
|
||
| import org.eclipse.yasson.internal.model.JsonbCreator; | ||
| import org.eclipse.yasson.internal.model.Property; | ||
|
|
||
| /** | ||
| * Search for instance creator from other sources. | ||
| * Mainly intended to add extensibility for different java versions and new features. | ||
| */ | ||
| public class ClassMultiReleaseExtension { | ||
|
|
||
| private ClassMultiReleaseExtension() { | ||
| throw new IllegalStateException("This class cannot be instantiated"); | ||
| } | ||
|
|
||
| static boolean shouldTransformToPropertyName(Method method) { | ||
| return true; | ||
| } | ||
|
|
||
| static boolean isSpecialAccessorMethod(Method method, Map<String, Property> classProperties) { | ||
| return false; | ||
| } | ||
|
|
||
| static JsonbCreator findCreator(Class<?> clazz, | ||
| Constructor<?>[] declaredConstructors, | ||
| AnnotationIntrospector introspector) { | ||
| return null; | ||
| } | ||
|
|
||
| public static Optional<JsonbException> exceptionToThrow(Class<?> clazz) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| } |
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
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
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.