mirror of https://github.com/apache/archiva.git
Refactoring - consolidating package names
This commit is contained in:
Martin Stockhammer
parent
d8455593b1
commit
5e8ae2434d
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -9,7 +9,6 @@ package org.apache.archiva.rest.api.model.v2;
|
|||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -18,8 +18,6 @@ package org.apache.archiva.rest.api.model.v2;
|
|||
*/
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
|
||||
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -37,13 +37,11 @@ package org.apache.archiva.rest.api.model.v2;/*
|
|||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.repository.Repository;
|
||||
import org.apache.archiva.repository.features.IndexCreationFeature;
|
||||
import org.apache.archiva.repository.features.RepositoryFeature;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -19,8 +19,6 @@ package org.apache.archiva.rest.api.model.v2;
|
|||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.admin.model.beans.MetadataScanTask;
|
||||
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
|
||||
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -19,7 +19,6 @@ package org.apache.archiva.rest.api.model.v2;
|
|||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.admin.model.beans.MetadataScanTask;
|
||||
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.model;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2;
|
||||
package org.apache.archiva.rest.api.v2.model;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2.repository;/*
|
||||
package org.apache.archiva.rest.api.v2.model.repository;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2.repository;/*
|
||||
package org.apache.archiva.rest.api.v2.model.repository;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -35,10 +35,6 @@ package org.apache.archiva.rest.api.model.v2.repository;/*
|
|||
*/
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.repository.Repository;
|
||||
import org.apache.archiva.repository.storage.StorageAsset;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
/**
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2.repository;/*
|
||||
package org.apache.archiva.rest.api.v2.model.repository;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -36,8 +36,6 @@ package org.apache.archiva.rest.api.model.v2.repository;/*
|
|||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
/**
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
*/
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.model.v2.repository;/*
|
||||
package org.apache.archiva.rest.api.v2.model.repository;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -35,7 +35,6 @@ package org.apache.archiva.rest.api.model.v2.repository;/*
|
|||
*/
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.repository.ManagedRepository;
|
||||
|
||||
/**
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -8,8 +8,7 @@ package org.apache.archiva.rest.api.services.v2;
|
|||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
|
|
@ -19,7 +18,7 @@ package org.apache.archiva.rest.api.services.v2;
|
|||
*/
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import org.apache.archiva.rest.api.model.v2.ValidationError;
|
||||
import org.apache.archiva.rest.api.v2.model.ValidationError;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.svc;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -34,10 +34,6 @@ package org.apache.archiva.rest.api.services.v2;/*
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorMessage;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
*/
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -8,8 +8,7 @@ package org.apache.archiva.rest.api.services.v2;
|
|||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -8,8 +8,7 @@ package org.apache.archiva.rest.api.services.v2;
|
|||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
|
|
@ -28,7 +27,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
|||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.redback.authorization.RedbackAuthorization;
|
||||
import org.apache.archiva.rest.api.model.v2.RepositoryGroup;
|
||||
import org.apache.archiva.rest.api.v2.model.RepositoryGroup;
|
||||
import org.apache.archiva.security.common.ArchivaRoleConstants;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
|
|
@ -45,7 +44,7 @@ import javax.ws.rs.core.Response;
|
|||
import java.util.List;
|
||||
|
||||
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
|
||||
import static org.apache.archiva.rest.api.services.v2.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
import static org.apache.archiva.rest.api.v2.svc.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
|
||||
/**
|
||||
* Endpoint for repository groups that combine multiple repositories into a single virtual repository.
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -26,9 +26,9 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
|||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.redback.authorization.RedbackAuthorization;
|
||||
import org.apache.archiva.rest.api.model.v2.Repository;
|
||||
import org.apache.archiva.rest.api.model.v2.RepositoryStatistics;
|
||||
import org.apache.archiva.rest.api.model.v2.ScanStatus;
|
||||
import org.apache.archiva.rest.api.v2.model.Repository;
|
||||
import org.apache.archiva.rest.api.v2.model.RepositoryStatistics;
|
||||
import org.apache.archiva.rest.api.v2.model.ScanStatus;
|
||||
import org.apache.archiva.security.common.ArchivaRoleConstants;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
|
|
@ -46,7 +46,7 @@ import javax.ws.rs.core.UriInfo;
|
|||
import java.util.List;
|
||||
|
||||
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
|
||||
import static org.apache.archiva.rest.api.services.v2.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
import static org.apache.archiva.rest.api.v2.svc.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
|
||||
/**
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;/*
|
||||
package org.apache.archiva.rest.api.v2.svc;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -29,10 +29,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.components.rest.model.PropertyEntry;
|
||||
import org.apache.archiva.redback.authorization.RedbackAuthorization;
|
||||
import org.apache.archiva.rest.api.model.v2.BeanInformation;
|
||||
import org.apache.archiva.rest.api.model.v2.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.LdapConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.SecurityConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.BeanInformation;
|
||||
import org.apache.archiva.rest.api.v2.model.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.LdapConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.SecurityConfiguration;
|
||||
import org.apache.archiva.security.common.ArchivaRoleConstants;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
|
|
@ -48,7 +48,7 @@ import javax.ws.rs.core.Response;
|
|||
import java.util.List;
|
||||
|
||||
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
|
||||
import static org.apache.archiva.rest.api.services.v2.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
import static org.apache.archiva.rest.api.v2.svc.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -19,14 +19,13 @@ package org.apache.archiva.rest.api.services.v2;
|
|||
|
||||
import org.apache.archiva.repository.Repository;
|
||||
import org.apache.archiva.repository.validation.ValidationResponse;
|
||||
import org.apache.archiva.rest.api.model.v2.ValidationError;
|
||||
import org.apache.archiva.rest.api.v2.model.ValidationError;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* Exception is thrown
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.api.services.v2.maven;
|
||||
package org.apache.archiva.rest.api.v2.svc.maven;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -23,16 +23,15 @@ import io.swagger.v3.oas.annotations.headers.Header;
|
|||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.security.OAuthScope;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.redback.authorization.RedbackAuthorization;
|
||||
import org.apache.archiva.rest.api.model.v2.FileInfo;
|
||||
import org.apache.archiva.rest.api.model.v2.MavenManagedRepository;
|
||||
import org.apache.archiva.rest.api.model.v2.MavenManagedRepositoryUpdate;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestError;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.v2.model.FileInfo;
|
||||
import org.apache.archiva.rest.api.v2.model.MavenManagedRepository;
|
||||
import org.apache.archiva.rest.api.v2.model.MavenManagedRepositoryUpdate;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestError;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestServiceException;
|
||||
import org.apache.archiva.security.common.ArchivaRoleConstants;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
|
|
@ -50,7 +49,7 @@ import javax.ws.rs.core.Response;
|
|||
import java.util.List;
|
||||
|
||||
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
|
||||
import static org.apache.archiva.rest.api.services.v2.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
import static org.apache.archiva.rest.api.v2.svc.RestConfiguration.DEFAULT_PAGE_LIMIT;
|
||||
|
||||
/**
|
||||
* Service interface for managing managed maven repositories
|
||||
|
|
@ -7,8 +7,7 @@
|
|||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
|
|
@ -16,7 +15,6 @@
|
|||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
/**
|
||||
* <p>This is the V2 REST API of Archiva. It uses JAX-RS annotations for defining the endpoints.
|
||||
* The API is documented with OpenApi annotations.</p>
|
||||
|
|
@ -92,11 +90,11 @@
|
|||
* <h4>Errors</h4>
|
||||
* <ul>
|
||||
* <li>A error uses a return code <code>>=400</code> </li>
|
||||
* <li>All errors use the same result object ({@link org.apache.archiva.rest.api.services.v2.ArchivaRestError}</li>
|
||||
* <li>All errors use the same result object ({@link org.apache.archiva.rest.api.v2.svc.ArchivaRestError}</li>
|
||||
* <li>Error messages are returned as keys. Translation is part of the client application.</li>
|
||||
* </ul>
|
||||
*
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
* @since 3.0
|
||||
*/
|
||||
package org.apache.archiva.rest.api.services.v2;
|
||||
package org.apache.archiva.rest.api.v2.svc;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
resourcePackages:
|
||||
- org.apache.archiva.rest.api.services.v2
|
||||
- org.apache.archiva.rest.api.model.v2
|
||||
- org.apache.archiva.rest.api.v2.svc
|
||||
- org.apache.archiva.rest.api.v2.model
|
||||
|
||||
prettyPrint: true
|
||||
cacheTTL: 0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.interceptors.v2;
|
||||
package org.apache.archiva.rest.v2.interceptor;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -8,8 +8,7 @@ package org.apache.archiva.rest.services.interceptors.v2;
|
|||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
|
|
@ -18,8 +17,8 @@ package org.apache.archiva.rest.services.interceptors.v2;
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestError;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestError;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestServiceException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.ws.rs.core.Response;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -40,13 +40,13 @@ import org.apache.archiva.repository.RepositoryType;
|
|||
import org.apache.archiva.repository.content.ContentItem;
|
||||
import org.apache.archiva.repository.content.LayoutException;
|
||||
import org.apache.archiva.repository.storage.fs.FsStorageUtil;
|
||||
import org.apache.archiva.rest.api.model.v2.FileInfo;
|
||||
import org.apache.archiva.rest.api.model.v2.MavenManagedRepository;
|
||||
import org.apache.archiva.rest.api.model.v2.MavenManagedRepositoryUpdate;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.services.v2.maven.MavenManagedRepositoryService;
|
||||
import org.apache.archiva.rest.api.v2.model.FileInfo;
|
||||
import org.apache.archiva.rest.api.v2.model.MavenManagedRepository;
|
||||
import org.apache.archiva.rest.api.v2.model.MavenManagedRepositoryUpdate;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.v2.svc.maven.MavenManagedRepositoryService;
|
||||
import org.apache.archiva.security.common.ArchivaRoleConstants;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;/*
|
||||
package org.apache.archiva.rest.v2.svc;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -43,13 +43,13 @@ import org.apache.archiva.repository.RepositoryRegistry;
|
|||
import org.apache.archiva.repository.base.ConfigurationHandler;
|
||||
import org.apache.archiva.repository.validation.CheckedResult;
|
||||
import org.apache.archiva.repository.validation.ValidationError;
|
||||
import org.apache.archiva.rest.api.model.v2.MergeConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.RepositoryGroup;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.services.v2.RepositoryGroupService;
|
||||
import org.apache.archiva.rest.api.services.v2.ValidationException;
|
||||
import org.apache.archiva.rest.api.v2.model.MergeConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.RepositoryGroup;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.v2.svc.RepositoryGroupService;
|
||||
import org.apache.archiva.rest.api.v2.svc.ValidationException;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
@ -287,7 +287,7 @@ public class DefaultRepositoryGroupService implements RepositoryGroupService
|
|||
}
|
||||
|
||||
@Override
|
||||
public RepositoryGroup deleteRepositoryFromGroup( final String repositoryGroupId, final String repositoryId ) throws org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException
|
||||
public RepositoryGroup deleteRepositoryFromGroup( final String repositoryGroupId, final String repositoryId ) throws ArchivaRestServiceException
|
||||
{
|
||||
if ( StringUtils.isEmpty( repositoryGroupId ) )
|
||||
{
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
|
|
@ -28,13 +28,13 @@ import org.apache.archiva.repository.RemoteRepository;
|
|||
import org.apache.archiva.repository.RepositoryRegistry;
|
||||
import org.apache.archiva.repository.scanner.RepositoryScanner;
|
||||
import org.apache.archiva.repository.scanner.RepositoryScannerException;
|
||||
import org.apache.archiva.rest.api.model.v2.Repository;
|
||||
import org.apache.archiva.rest.api.model.v2.RepositoryStatistics;
|
||||
import org.apache.archiva.rest.api.model.v2.ScanStatus;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.services.v2.RepositoryService;
|
||||
import org.apache.archiva.rest.api.v2.model.Repository;
|
||||
import org.apache.archiva.rest.api.v2.model.RepositoryStatistics;
|
||||
import org.apache.archiva.rest.api.v2.model.ScanStatus;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.v2.svc.RepositoryService;
|
||||
import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexException;
|
||||
import org.apache.archiva.scheduler.indexing.DownloadRemoteIndexScheduler;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;/*
|
||||
package org.apache.archiva.rest.v2.svc;/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
|
|
@ -51,14 +51,14 @@ import org.apache.archiva.redback.policy.PasswordRule;
|
|||
import org.apache.archiva.redback.rbac.RBACManager;
|
||||
import org.apache.archiva.redback.role.RoleManager;
|
||||
import org.apache.archiva.redback.users.UserManager;
|
||||
import org.apache.archiva.rest.api.model.v2.BeanInformation;
|
||||
import org.apache.archiva.rest.api.model.v2.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.LdapConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.SecurityConfiguration;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.services.v2.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.services.v2.SecurityConfigurationService;
|
||||
import org.apache.archiva.rest.api.v2.model.BeanInformation;
|
||||
import org.apache.archiva.rest.api.v2.model.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.LdapConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.SecurityConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestServiceException;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorKeys;
|
||||
import org.apache.archiva.rest.api.v2.svc.ErrorMessage;
|
||||
import org.apache.archiva.rest.api.v2.svc.SecurityConfigurationService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -88,8 +88,8 @@ import java.util.ResourceBundle;
|
|||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.apache.archiva.rest.api.services.v2.ErrorKeys.INVALID_RESULT_SET_ERROR;
|
||||
import static org.apache.archiva.rest.api.services.v2.ErrorKeys.REPOSITORY_ADMIN_ERROR;
|
||||
import static org.apache.archiva.rest.api.v2.svc.ErrorKeys.INVALID_RESULT_SET_ERROR;
|
||||
import static org.apache.archiva.rest.api.v2.svc.ErrorKeys.REPOSITORY_ADMIN_ERROR;
|
||||
|
||||
/**
|
||||
* @author Martin Stockhammer <martin_s@apache.org>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
<context:annotation-config/>
|
||||
<context:component-scan
|
||||
base-package="org.apache.archiva.rest.services,org.apache.archiva.redback.rest.services"/>
|
||||
base-package="org.apache.archiva.rest.services,org.apache.archiva.redback.rest.services,org.apache.archiva.rest.v2"/>
|
||||
|
||||
<!-- CXF OpenApiFeature -->
|
||||
<bean id="archivaOpenApiFeature" class="org.apache.cxf.jaxrs.openapi.OpenApiFeature">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
|
|
@ -20,14 +20,8 @@ package org.apache.archiva.rest.services.v2;
|
|||
|
||||
import io.restassured.path.json.JsonPath;
|
||||
import io.restassured.response.Response;
|
||||
import io.restassured.response.ResponseBody;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.components.rest.model.PropertyEntry;
|
||||
import org.apache.archiva.rest.api.model.v2.BeanInformation;
|
||||
import org.apache.archiva.rest.api.model.v2.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.LdapConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.MavenManagedRepository;
|
||||
import org.apache.archiva.rest.api.services.v2.RestConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.MavenManagedRepository;
|
||||
import org.apache.archiva.rest.api.v2.svc.RestConfiguration;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
@ -38,10 +32,7 @@ import org.junit.jupiter.api.Test;
|
|||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.junit.jupiter.api.TestMethodOrder;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static io.restassured.RestAssured.given;
|
||||
import static io.restassured.http.ContentType.JSON;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
|
|
@ -20,8 +20,8 @@ package org.apache.archiva.rest.services.v2;
|
|||
|
||||
import io.restassured.response.Response;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.rest.api.model.v2.RepositoryGroup;
|
||||
import org.apache.archiva.rest.api.services.v2.ArchivaRestError;
|
||||
import org.apache.archiva.rest.api.v2.model.RepositoryGroup;
|
||||
import org.apache.archiva.rest.api.v2.svc.ArchivaRestError;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
@ -39,7 +39,6 @@ import java.util.Map;
|
|||
|
||||
import static io.restassured.RestAssured.given;
|
||||
import static io.restassured.http.ContentType.JSON;
|
||||
import static org.easymock.EasyMock.contains;
|
||||
import static org.hamcrest.Matchers.endsWith;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
|
|
@ -20,7 +20,7 @@ package org.apache.archiva.rest.services.v2;
|
|||
|
||||
import io.restassured.response.Response;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.rest.api.model.v2.Repository;
|
||||
import org.apache.archiva.rest.api.v2.model.Repository;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.apache.archiva.rest.services.v2;
|
||||
package org.apache.archiva.rest.v2.svc;
|
||||
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
|
|
@ -21,9 +21,9 @@ package org.apache.archiva.rest.services.v2;
|
|||
import io.restassured.response.Response;
|
||||
import org.apache.archiva.components.rest.model.PagedResult;
|
||||
import org.apache.archiva.components.rest.model.PropertyEntry;
|
||||
import org.apache.archiva.rest.api.model.v2.BeanInformation;
|
||||
import org.apache.archiva.rest.api.model.v2.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.model.v2.LdapConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.BeanInformation;
|
||||
import org.apache.archiva.rest.api.v2.model.CacheConfiguration;
|
||||
import org.apache.archiva.rest.api.v2.model.LdapConfiguration;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
@ -32,9 +32,6 @@ import org.junit.jupiter.api.Tag;
|
|||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.junit.jupiter.api.TestMethodOrder;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit.jupiter.SpringExtension;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
Loading…
Reference in New Issue