Skip to content

Commit aace8a0

Browse files
committed
refactor: Move UserDisplayName to shared api-model
`UserDisplayName` can then be used in components. Signed-off-by: Johanna Lamppu <[email protected]>
1 parent 30e0588 commit aace8a0

File tree

7 files changed

+32
-7
lines changed

7 files changed

+32
-7
lines changed

api/v1/mapping/src/commonMain/kotlin/ApiMappings.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.ShortestDependencyPath as Api
7878
import org.eclipse.apoapsis.ortserver.api.v1.model.SourceCodeOrigin as ApiSourceCodeOrigin
7979
import org.eclipse.apoapsis.ortserver.api.v1.model.SubmoduleFetchStrategy as ApiSubmoduleFetchStrategy
8080
import org.eclipse.apoapsis.ortserver.api.v1.model.User as ApiUser
81-
import org.eclipse.apoapsis.ortserver.api.v1.model.UserDisplayName as ApiUserDisplayName
8281
import org.eclipse.apoapsis.ortserver.api.v1.model.UserGroup as ApiUserGroup
8382
import org.eclipse.apoapsis.ortserver.api.v1.model.VcsInfo as ApiVcsInfo
8483
import org.eclipse.apoapsis.ortserver.api.v1.model.VcsInfoCurationData as ApiVcsInfoCurationData
@@ -126,7 +125,6 @@ import org.eclipse.apoapsis.ortserver.model.Severity
126125
import org.eclipse.apoapsis.ortserver.model.SourceCodeOrigin
127126
import org.eclipse.apoapsis.ortserver.model.SubmoduleFetchStrategy
128127
import org.eclipse.apoapsis.ortserver.model.User
129-
import org.eclipse.apoapsis.ortserver.model.UserDisplayName
130128
import org.eclipse.apoapsis.ortserver.model.UserGroup
131129
import org.eclipse.apoapsis.ortserver.model.VulnerabilityFilters
132130
import 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-
847843
fun ContentManagementSection.mapToApi() = ApiContentManagementSection(
848844
id = id,
849845
isEnabled = isEnabled,

api/v1/model/src/commonMain/kotlin/OrtRun.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ package org.eclipse.apoapsis.ortserver.api.v1.model
2222
import kotlinx.datetime.Instant
2323
import kotlinx.serialization.Serializable
2424

25+
import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
26+
2527
@Serializable
2628
data class OrtRun(
2729
/**

api/v1/model/src/commonMain/kotlin/OrtRunSummary.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ package org.eclipse.apoapsis.ortserver.api.v1.model
2222
import kotlinx.datetime.Instant
2323
import kotlinx.serialization.Serializable
2424

25+
import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
26+
2527
/**
2628
* The summary of an ORT run.
2729
*/

core/src/main/kotlin/apiDocs/RepositoriesDocs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.ScannerJob
5555
import org.eclipse.apoapsis.ortserver.api.v1.model.ScannerJobConfiguration
5656
import org.eclipse.apoapsis.ortserver.api.v1.model.SubmoduleFetchStrategy.FULLY_RECURSIVE
5757
import org.eclipse.apoapsis.ortserver.api.v1.model.User
58-
import org.eclipse.apoapsis.ortserver.api.v1.model.UserDisplayName
5958
import org.eclipse.apoapsis.ortserver.api.v1.model.UserGroup
6059
import org.eclipse.apoapsis.ortserver.api.v1.model.UserWithGroups
6160
import org.eclipse.apoapsis.ortserver.api.v1.model.Username
@@ -65,6 +64,7 @@ import org.eclipse.apoapsis.ortserver.shared.apimodel.PagedResponse
6564
import org.eclipse.apoapsis.ortserver.shared.apimodel.PagingData
6665
import org.eclipse.apoapsis.ortserver.shared.apimodel.SortDirection
6766
import org.eclipse.apoapsis.ortserver.shared.apimodel.SortProperty
67+
import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
6868
import org.eclipse.apoapsis.ortserver.shared.apimodel.asPresent
6969
import org.eclipse.apoapsis.ortserver.shared.ktorutils.jsonBody
7070
import org.eclipse.apoapsis.ortserver.shared.ktorutils.standardListQueryParameters

core/src/main/kotlin/apiDocs/RunsDocs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import org.eclipse.apoapsis.ortserver.api.v1.model.RuleViolation
5252
import org.eclipse.apoapsis.ortserver.api.v1.model.RuleViolationResolution
5353
import org.eclipse.apoapsis.ortserver.api.v1.model.Severity
5454
import org.eclipse.apoapsis.ortserver.api.v1.model.ShortestDependencyPath
55-
import org.eclipse.apoapsis.ortserver.api.v1.model.UserDisplayName
5655
import org.eclipse.apoapsis.ortserver.api.v1.model.VcsInfo
5756
import org.eclipse.apoapsis.ortserver.api.v1.model.Vulnerability
5857
import org.eclipse.apoapsis.ortserver.api.v1.model.VulnerabilityRating
@@ -64,6 +63,7 @@ import org.eclipse.apoapsis.ortserver.shared.apimodel.PagedSearchResponse
6463
import org.eclipse.apoapsis.ortserver.shared.apimodel.PagingData
6564
import org.eclipse.apoapsis.ortserver.shared.apimodel.SortDirection
6665
import org.eclipse.apoapsis.ortserver.shared.apimodel.SortProperty
66+
import org.eclipse.apoapsis.ortserver.shared.apimodel.UserDisplayName
6767
import org.eclipse.apoapsis.ortserver.shared.ktorutils.jsonBody
6868
import org.eclipse.apoapsis.ortserver.shared.ktorutils.standardListQueryParameters
6969

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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)

api/v1/model/src/commonMain/kotlin/UserDisplayName.kt renamed to shared/api-model/src/commonMain/kotlin/UserDisplayName.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.eclipse.apoapsis.ortserver.api.v1.model
20+
package org.eclipse.apoapsis.ortserver.shared.apimodel
2121

2222
import kotlinx.serialization.Serializable
2323

0 commit comments

Comments
 (0)