Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-05 03:40:56 +01:00
Code Issues Packages Projects Releases Activity

Rename creationContext to contextEntries

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-09-10 08:36:07 +02:00
parent 04eb3ade7c
commit e64ddccb13
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.api.v2.resources;
import io.swagger.v3.oas.annotations.Operation;
@@ -156,7 +156,7 @@ public class RepositoryCollectionResource {
return resourceLinks.repository().self(r.getNamespace(), r.getName());
});
if (initialize) {
repositoryInitializer.initialize(reference.get(), repository.getCreationContext());
repositoryInitializer.initialize(reference.get(), repository.getContextEntries());
}
return response;
}

8
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCreationDto.java
View File

@@ -36,12 +36,12 @@ import java.util.Map;
@Getter
@Setter
public class RepositoryCreationDto extends RepositoryDto {
private Map<String, JsonNode> creationContext;
private Map<String, JsonNode> contextEntries;
public Map<String, JsonNode> getCreationContext() {
if (creationContext == null) {
public Map<String, JsonNode> getContextEntries() {
if (contextEntries == null) {
return Collections.emptyMap();
}
return creationContext;
return contextEntries;
}
}

14
scm-webapp/src/main/java/sonia/scm/repository/RepositoryInitializer.java
View File

@@ -58,11 +58,11 @@ public class RepositoryInitializer {
this.contentInitializers = Priorities.sortInstances(contentInitializerSet);
}
public void initialize(Repository repository, Map<String, JsonNode> creationContext) {
public void initialize(Repository repository, Map<String, JsonNode> contextEntries) {
try (RepositoryService service = serviceFactory.create(repository)) {
ModifyCommandBuilder modifyCommandBuilder = service.getModifyCommand();
InitializerContextImpl initializerContext = new InitializerContextImpl(repository, modifyCommandBuilder, creationContext);
InitializerContextImpl initializerContext = new InitializerContextImpl(repository, modifyCommandBuilder, contextEntries);
for (RepositoryContentInitializer initializer : contentInitializers) {
initializer.initialize(initializerContext);
@@ -81,14 +81,14 @@ public class RepositoryInitializer {
private final Repository repository;
private final ModifyCommandBuilder builder;
private final Map<String, JsonNode> creationContext;
private final Map<String, JsonNode> contextEntries;
private static final ObjectMapper mapper = new ObjectMapper();
InitializerContextImpl(Repository repository, ModifyCommandBuilder builder, Map<String, JsonNode> creationContext) {
InitializerContextImpl(Repository repository, ModifyCommandBuilder builder, Map<String, JsonNode> contextEntries) {
this.repository = repository;
this.builder = builder;
this.creationContext = creationContext;
this.contextEntries = contextEntries;
}
@Override
@@ -97,8 +97,8 @@ public class RepositoryInitializer {
}
@Override
public <T> Optional<T> oneByType(String key, Class<T> type) {
JsonNode node = creationContext.get(key);
public <T> Optional<T> getEntry(String key, Class<T> type) {
JsonNode node = contextEntries.get(key);
if (node != null) {
return Optional.of(mapper.convertValue(node, type));
}