Skip to content
Permalink
Browse files
Refactoring - consolidating package names
  • Loading branch information
effrafax committed Dec 19, 2021
1 parent d845559 commit 5e8ae2434d547387b85d4822d49d37a78ad2bd20
Showing 45 changed files with 113 additions and 153 deletions.
@@ -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 @@
* 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 @@
*/

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 @@
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 @@

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 @@

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 @@
*/

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 @@

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 @@
*/

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 @@
* "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 @@
*/

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 @@
* 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 @@
* "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 @@
* "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.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 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.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 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 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 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 @@

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

0 comments on commit 5e8ae24

Please sign in to comment.