-
Notifications
You must be signed in to change notification settings - Fork 2
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
Casl 534 java proxy fix #347
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 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
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
60 changes: 60 additions & 0 deletions
60
here-naksha-lib-base/src/jvmTest/java/naksha/base/JavaProxyTest.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,60 @@ | ||
| /* | ||
| * Copyright (C) 2017-2024 HERE Europe B.V. | ||
| * | ||
| * 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 | ||
| * | ||
| * http://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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * License-Filename: LICENSE | ||
| */ | ||
| package naksha.base; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertInstanceOf; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class JavaProxyTest { | ||
|
|
||
| @Test | ||
| void shouldAllowProxyingInJava() { | ||
| // Given: | ||
| ProxyParent parent = new ProxyParent(); | ||
|
|
||
| // When: | ||
| var child = parent.proxy(Platform.klassOf(ProxyParent.class)); | ||
|
|
||
| // Then: | ||
| assertNotNull(child); | ||
| assertInstanceOf(ProxyChild.class, child); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldFailForProxyWithoutNonArgConstructor() { | ||
| // Given: | ||
| ProxyParent parent = new ProxyParent(); | ||
|
|
||
| // Then: | ||
| assertThrows(IllegalArgumentException.class, () -> { | ||
| parent.proxy(Platform.klassOf(ProxyChildWithoutNonArgConstructor.class)); | ||
| }); | ||
| } | ||
|
|
||
| static class ProxyParent extends AnyObject {} | ||
|
|
||
| static class ProxyChild extends ProxyParent {} | ||
|
|
||
| static class ProxyChildWithoutNonArgConstructor extends ProxyParent { | ||
| ProxyChildWithoutNonArgConstructor(String unusedParam) {} | ||
| } | ||
| } |
79 changes: 79 additions & 0 deletions
79
here-naksha-lib-model/src/jvmTest/java/NakshaFeatureProxyTest.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,79 @@ | ||
| /* | ||
| * Copyright (C) 2017-2024 HERE Europe B.V. | ||
| * | ||
| * 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 | ||
| * | ||
| * http://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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * License-Filename: LICENSE | ||
| */ | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import kotlin.reflect.full.IllegalCallableAccessException; | ||
| import naksha.base.Platform; | ||
| import naksha.geo.PointCoord; | ||
| import naksha.geo.SpPoint; | ||
| import naksha.model.objects.NakshaFeature; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class NakshaFeatureProxyTest { | ||
|
|
||
| @Test | ||
| void shouldAllowProxyingFeature() { | ||
| // Given: | ||
| NakshaFeature nakshaFeature = new NakshaFeature(); | ||
| nakshaFeature.setId("my_id"); | ||
| nakshaFeature.setGeometry(new SpPoint(new PointCoord(10, 20))); | ||
|
|
||
| // When: | ||
| CustomFeature proxiedFeature = nakshaFeature.proxy(Platform.klassOf(CustomFeature.class)); | ||
|
|
||
| // Then: | ||
| assertEquals(nakshaFeature.getId(), proxiedFeature.getId()); | ||
| assertEquals(nakshaFeature.getGeometry(), proxiedFeature.getGeometry()); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldFailForProxyWithoutNonArgConstructor() { | ||
| // Given: | ||
| NakshaFeature nakshaFeature = new NakshaFeature(); | ||
|
|
||
| // Then: | ||
| assertThrows(IllegalArgumentException.class, () -> { | ||
| nakshaFeature.proxy(Platform.klassOf(CustomFeatureWithoutNonArgConstructor.class)); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldFailForNonPublicProxy() { | ||
| // Given: | ||
| NakshaFeature nakshaFeature = new NakshaFeature(); | ||
|
|
||
| // Then: | ||
| assertThrows(IllegalCallableAccessException.class, () -> { | ||
| nakshaFeature.proxy(Platform.klassOf(NonPublicCustomFeature.class)); | ||
| }); | ||
| } | ||
|
|
||
| public static class CustomFeature extends NakshaFeature { | ||
|
|
||
| public CustomFeature() {} | ||
| } | ||
|
|
||
| public static class CustomFeatureWithoutNonArgConstructor extends NakshaFeature { | ||
|
|
||
| public CustomFeatureWithoutNonArgConstructor(String unusedParam) {} | ||
| } | ||
|
|
||
| static class NonPublicCustomFeature extends NakshaFeature {} | ||
| } |
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.
I think, any constructor that does not require arguments is fine for us, we should always first try the primary constructor, but if that does not match, try to find any other constructor.
These checks and searching for the correct constructor can be time consuming, I would suggest to add a cache here, a concurrent hash-map, to cache the found constructors. Like:
We do not need any synchronization here, because we can assume that the finding operation is idempotent, so even when multiple threads in parallel enter the search and override each other, the cache should work after that as intended.
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.
done