File tree Expand file tree Collapse file tree 7 files changed +32
-7
lines changed
mapping/src/commonMain/kotlin
model/src/commonMain/kotlin
core/src/main/kotlin/apiDocs
api-mappings/src/commonMain/kotlin
api-model/src/commonMain/kotlin Expand file tree Collapse file tree 7 files changed +32
-7
lines changed Original file line number Diff line number Diff line change @@ -78,7 +78,6 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.ShortestDependencyPath as Api
7878import org.eclipse.apoapsis.ortserver.api.v1.model.SourceCodeOrigin as ApiSourceCodeOrigin
7979import org.eclipse.apoapsis.ortserver.api.v1.model.SubmoduleFetchStrategy as ApiSubmoduleFetchStrategy
8080import org.eclipse.apoapsis.ortserver.api.v1.model.User as ApiUser
81- import org.eclipse.apoapsis.ortserver.api.v1.model.UserDisplayName as ApiUserDisplayName
8281import org.eclipse.apoapsis.ortserver.api.v1.model.UserGroup as ApiUserGroup
8382import org.eclipse.apoapsis.ortserver.api.v1.model.VcsInfo as ApiVcsInfo
8483import org.eclipse.apoapsis.ortserver.api.v1.model.VcsInfoCurationData as ApiVcsInfoCurationData
@@ -126,7 +125,6 @@ import org.eclipse.apoapsis.ortserver.model.Severity
126125import org.eclipse.apoapsis.ortserver.model.SourceCodeOrigin
127126import org.eclipse.apoapsis.ortserver.model.SubmoduleFetchStrategy
128127import org.eclipse.apoapsis.ortserver.model.User
129- import org.eclipse.apoapsis.ortserver.model.UserDisplayName
130128import org.eclipse.apoapsis.ortserver.model.UserGroup
131129import org.eclipse.apoapsis.ortserver.model.VulnerabilityFilters
132130import org.eclipse.apoapsis.ortserver.model.VulnerabilityForRunsFilters
@@ -842,8 +840,6 @@ fun Project.mapToApi() = ApiProject(
842840 scopeNames = scopeNames
843841)
844842
845- fun UserDisplayName.mapToApi () = ApiUserDisplayName (username = username, fullName = fullName)
846-
847843fun ContentManagementSection.mapToApi () = ApiContentManagementSection (
848844 id = id,
849845 isEnabled = isEnabled,
Original file line number Diff line number Diff line change @@ -22,6 +22,8 @@ package org.eclipse.apoapsis.ortserver.api.v1.model
2222import kotlinx.datetime.Instant
2323import kotlinx.serialization.Serializable
2424
25+ import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
26+
2527@Serializable
2628data class OrtRun (
2729 /* *
Original file line number Diff line number Diff line change @@ -22,6 +22,8 @@ package org.eclipse.apoapsis.ortserver.api.v1.model
2222import kotlinx.datetime.Instant
2323import kotlinx.serialization.Serializable
2424
25+ import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
26+
2527/* *
2628 * The summary of an ORT run.
2729 */
Original file line number Diff line number Diff line change @@ -55,7 +55,6 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.ScannerJob
5555import org.eclipse.apoapsis.ortserver.api.v1.model.ScannerJobConfiguration
5656import org.eclipse.apoapsis.ortserver.api.v1.model.SubmoduleFetchStrategy.FULLY_RECURSIVE
5757import org.eclipse.apoapsis.ortserver.api.v1.model.User
58- import org.eclipse.apoapsis.ortserver.api.v1.model.UserDisplayName
5958import org.eclipse.apoapsis.ortserver.api.v1.model.UserGroup
6059import org.eclipse.apoapsis.ortserver.api.v1.model.UserWithGroups
6160import org.eclipse.apoapsis.ortserver.api.v1.model.Username
@@ -65,6 +64,7 @@ import org.eclipse.apoapsis.ortserver.shared.apimodel.PagedResponse
6564import org.eclipse.apoapsis.ortserver.shared.apimodel.PagingData
6665import org.eclipse.apoapsis.ortserver.shared.apimodel.SortDirection
6766import org.eclipse.apoapsis.ortserver.shared.apimodel.SortProperty
67+ import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
6868import org.eclipse.apoapsis.ortserver.shared.apimodel.asPresent
6969import org.eclipse.apoapsis.ortserver.shared.ktorutils.jsonBody
7070import org.eclipse.apoapsis.ortserver.shared.ktorutils.standardListQueryParameters
Original file line number Diff line number Diff line change @@ -52,7 +52,6 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.RuleViolation
5252import org.eclipse.apoapsis.ortserver.api.v1.model.RuleViolationResolution
5353import org.eclipse.apoapsis.ortserver.api.v1.model.Severity
5454import org.eclipse.apoapsis.ortserver.api.v1.model.ShortestDependencyPath
55- import org.eclipse.apoapsis.ortserver.api.v1.model.UserDisplayName
5655import org.eclipse.apoapsis.ortserver.api.v1.model.VcsInfo
5756import org.eclipse.apoapsis.ortserver.api.v1.model.Vulnerability
5857import org.eclipse.apoapsis.ortserver.api.v1.model.VulnerabilityRating
@@ -64,6 +63,7 @@ import org.eclipse.apoapsis.ortserver.shared.apimodel.PagedSearchResponse
6463import org.eclipse.apoapsis.ortserver.shared.apimodel.PagingData
6564import org.eclipse.apoapsis.ortserver.shared.apimodel.SortDirection
6665import org.eclipse.apoapsis.ortserver.shared.apimodel.SortProperty
66+ import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
6767import org.eclipse.apoapsis.ortserver.shared.ktorutils.jsonBody
6868import org.eclipse.apoapsis.ortserver.shared.ktorutils.standardListQueryParameters
6969
Original file line number Diff line number Diff line change 1+ /*
2+ * Copyright (C) 2025 The ORT Server Authors (See <https://github.com/eclipse-apoapsis/ort-server/blob/main/NOTICE>)
3+ *
4+ * Licensed under the Apache License, Version 2.0 (the "License");
5+ * you may not use this file except in compliance with the License.
6+ * You may obtain a copy of the License at
7+ *
8+ * https://www.apache.org/licenses/LICENSE-2.0
9+ *
10+ * Unless required by applicable law or agreed to in writing, software
11+ * distributed under the License is distributed on an "AS IS" BASIS,
12+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ * See the License for the specific language governing permissions and
14+ * limitations under the License.
15+ *
16+ * SPDX-License-Identifier: Apache-2.0
17+ * License-Filename: LICENSE
18+ */
19+
20+ package org.eclipse.apoapsis.ortserver.shared.apimappings
21+
22+ import org.eclipse.apoapsis.ortserver.model.UserDisplayName
23+ import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName as ApiUserDisplayName
24+
25+ fun UserDisplayName.mapToApi () = ApiUserDisplayName (username = username, fullName = fullName)
Original file line number Diff line number Diff line change 1717 * License-Filename: LICENSE
1818 */
1919
20- package org.eclipse.apoapsis.ortserver.api.v1.model
20+ package org.eclipse.apoapsis.ortserver.shared.apimodel
2121
2222import kotlinx.serialization.Serializable
2323
You can’t perform that action at this time.
0 commit comments