diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/OutputConfigurationQueryParameters.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/OutputConfigurationQueryParameters.java index e547bfc6..ce9db027 100644 --- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/OutputConfigurationQueryParameters.java +++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/OutputConfigurationQueryParameters.java @@ -24,7 +24,7 @@ public interface OutputConfigurationQueryParameters { * @return the typeId of the configuration according to the * {@link ConfigurationSourceType} */ - @Schema(required = true, description = "TypeId of the configuration according to the corresponding ConfigurationTypeDescriptor.") - @JsonProperty("typeId") - String getTypeId(); + @Schema(required = true, description = "The type ID of the corresponding ConfigurationSourceType defined by this output.") + @JsonProperty("sourceTypeId") + String getSourceTypeId(); } diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/views/OutputConfigurationQueryParameters.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/views/OutputConfigurationQueryParameters.java index 94453357..0fa908d0 100644 --- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/views/OutputConfigurationQueryParameters.java +++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/views/OutputConfigurationQueryParameters.java @@ -20,7 +20,7 @@ * Definition of a parameters object received by the server from a client for configurations. */ public class OutputConfigurationQueryParameters extends ConfigurationQueryParameters { - private @NonNull String typeId; + private @NonNull String sourceTypeId; /** * Constructor for Jackson @@ -28,7 +28,7 @@ public class OutputConfigurationQueryParameters extends ConfigurationQueryParame public OutputConfigurationQueryParameters() { // Default constructor for Jackson super(); - this.typeId = TmfConfiguration.UNKNOWN; + this.sourceTypeId = TmfConfiguration.UNKNOWN; } /** @@ -38,28 +38,28 @@ public OutputConfigurationQueryParameters() { * the name of the configuration * @param description * the description of the configuration - * @param typeId - * the typeId of the configuration + * @param sourceTypeId + * the typeId of the configuration source * * @param parameters * Map of parameters */ - public OutputConfigurationQueryParameters(String name, String description, String typeId, Map parameters) { + public OutputConfigurationQueryParameters(String name, String description, String sourceTypeId, Map parameters) { super(name, description, parameters); - this.typeId = typeId == null ? TmfConfiguration.UNKNOWN : typeId; + this.sourceTypeId = sourceTypeId == null ? TmfConfiguration.UNKNOWN : sourceTypeId; } /** * @return the type ID of configuration or {@link TmfConfiguration#UNKNOWN} if not provided */ - @NonNull public String getTypeId() { - return typeId; + @NonNull public String getSourceTypeId() { + return sourceTypeId; } @SuppressWarnings("nls") @Override public String toString() { return "OutputConfigurationQueryParameters [name=" + getName() + ", description=" + getDescription() - +", typeId=" + getTypeId() + ", parameters=" + getParameters() + "]"; + +", typeId=" + getSourceTypeId() + ", parameters=" + getParameters() + "]"; } } diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java index 1a5bfe9f..4a9b5e62 100644 --- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java +++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/services/DataProviderService.java @@ -1309,7 +1309,7 @@ public Response createProvider( ITmfConfiguration inputConfig = new TmfConfiguration.Builder() .setName(queryParameters.getName()) .setDescription(queryParameters.getDescription()) - .setSourceTypeId(queryParameters.getTypeId()) + .setSourceTypeId(queryParameters.getSourceTypeId()) .setParameters(queryParameters.getParameters()) .build(); String typeId = inputConfig.getSourceTypeId();