server: support json object in query parameters for configurations #70
+541
−82
Conversation
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
bhufmann
changed the title
bhufmann
commented
Sep 6, 2024
| // Pass JSON object as json string | ||
| params.put(TmfConfiguration.JSON_STRING_KEY, queryParameters.getParameters().toString()); | ||
| } else { | ||
| // Convert it to a Map<String, Object> |
There was a problem hiding this comment.
We can discuss the removal of the support for the query param map in the TSP to avoid having clients to implement the support for 2 ways of user input. (To be discussed). This would be done in a follow-up PR.
bhufmann
force-pushed
the
json-schema-2-json-if
branch
4 times, most recently
from
b629159
to
f42d8ec
Compare
bhufmann
force-pushed
the
json-schema-2-json-if
branch
2 times, most recently
from
5e53655
to
3ca5be9
Compare
| .path(CONFIG_INSTANCES_PATH); | ||
|
|
||
| Bundle bundle = Platform.getBundle("org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests"); | ||
| IPath defaultPath = new org.eclipse.core.runtime.Path("config/custom-execution-analysis.json"); //$NON-NLS-1$ |
There was a problem hiding this comment.
I noticed that the json file name (without the path "config/") is defined at the top of the file, and passed to this function, but still a hardcoded value is used here?
There was a problem hiding this comment.
Oh, there is a typo in the file name, as defined at the top of the file, so the json file would not have been found if used. See comment up there.
There was a problem hiding this comment.
Good catch. I'll use the constant and fix the typo.
| @@ -78,6 +90,11 @@ public class ConfigurationManagerServiceTest extends RestServerTest { | |||
| private static final String EXPECTED_CONFIG_DESCRIPTION = "XML Data-driven analysis: " + VALID_NAME; | |||
| private static final String PATH_TO_INVALID_PATH = getPath(PATH_INVALID + INVALID_XML_FILE); | |||
| private static final String PATH_TO_VALID_PATH = getPath(PATH_VALID + VALID_XML_FILE); | |||
| private static final String VALID_JSON_FILENAME = "custome-execution-analysis.json"; | |||
There was a problem hiding this comment.
I think there's a typo: "custome-" vs "custom-"?
Signed-off-by: Bernd Hufmann <[email protected]>
See eclipse-cdt-cloud/trace-server-protocol#103 Also, add test for TmfConfigurationSourceType with schema json object. [Added] Serialize TmfConfigurationSourceType schema as json object Signed-off-by: Bernd Hufmann <[email protected]>
bhufmann
force-pushed
the
json-schema-2-json-if
branch
2 times, most recently
from
3569358
to
897c200
Compare
This commit also includes the corresponding swagger updates. [Added] support json object in query parameters for configurations Signed-off-by: Bernd Hufmann <[email protected]>
bhufmann
force-pushed
the
json-schema-2-json-if
branch
from
897c200
to
81ddcd2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR based on PR #66, which commits are included.
An additional commit is added:
This commit also includes the corresponding swagger updates.
This needs change in Trace Compass: eclipse-tracecompass/org.eclipse.tracecompass#144
Signed-off-by: Bernd Hufmann [email protected]