From 275ca49f716670ef5f89a2e8cfa3878a2e470cbc Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Fri, 27 Nov 2020 13:30:01 +0100 Subject: [PATCH] Mark old import handler api as deprecated --- .../scm/repository/AbstactImportHandler.java | 4 ++- .../scm/repository/AdvancedImportHandler.java | 4 ++- .../sonia/scm/repository/ImportHandler.java | 14 ++++---- .../sonia/scm/repository/ImportResult.java | 4 ++- .../scm/repository/RepositoryHandler.java | 3 +- .../scm/repository/GitImportHandler.java | 33 +++++++++---------- .../sonia/scm/repository/HgImportHandler.java | 3 ++ .../scm/repository/SvnImportHandler.java | 3 ++ 8 files changed, 40 insertions(+), 28 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java index 9b5450144f..e19ee21942 100644 --- a/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java +++ b/scm-core/src/main/java/sonia/scm/repository/AbstactImportHandler.java @@ -41,8 +41,10 @@ import java.util.List; * {@link AdvancedImportHandler}. * * @author Sebastian Sdorra - * @since 1.12 + * @deprecated + * @since 2.11.0 */ +@Deprecated public abstract class AbstactImportHandler implements AdvancedImportHandler { diff --git a/scm-core/src/main/java/sonia/scm/repository/AdvancedImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/AdvancedImportHandler.java index 2996270f15..b9d1aaa0fd 100644 --- a/scm-core/src/main/java/sonia/scm/repository/AdvancedImportHandler.java +++ b/scm-core/src/main/java/sonia/scm/repository/AdvancedImportHandler.java @@ -30,8 +30,10 @@ package sonia.scm.repository; * {@link ImportHandler}. * * @author Sebastian Sdorra - * @since 1.43 + * @deprecated + * @since 2.11.0 */ +@Deprecated public interface AdvancedImportHandler extends ImportHandler { diff --git a/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java index f9ac2214b8..2802449d1b 100644 --- a/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java +++ b/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository; //~--- JDK imports ------------------------------------------------------------ @@ -33,20 +33,20 @@ import java.util.List; * Searches and import existing repositories. * * @author Sebastian Sdorra - * @since 1.12 + * @since 2.11.0 + * @deprecated */ -public interface ImportHandler -{ +@Deprecated +public interface ImportHandler { /** * Import existing and non managed repositories. * - * * @param manager The global {@link RepositoryManager} - * - * * @return a {@link List} names of imported repositories * @throws IOException + * @since 2.11.0 + * @deprecated */ public List importRepositories(RepositoryManager manager) throws IOException; } diff --git a/scm-core/src/main/java/sonia/scm/repository/ImportResult.java b/scm-core/src/main/java/sonia/scm/repository/ImportResult.java index d86c4b4e96..6d4c62ac8d 100644 --- a/scm-core/src/main/java/sonia/scm/repository/ImportResult.java +++ b/scm-core/src/main/java/sonia/scm/repository/ImportResult.java @@ -38,11 +38,13 @@ import static com.google.common.base.Preconditions.checkNotNull; * Import result of the {@link AdvancedImportHandler}. * * @author Sebastian Sdorra - * @since 1.43 + * @deprecated + * @since 2.11.0 */ @EqualsAndHashCode @ToString @Getter +@Deprecated public final class ImportResult { /** diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java index f577993056..a7257a0b04 100644 --- a/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java +++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryHandler.java @@ -48,7 +48,8 @@ public interface RepositoryHandler * * * @return {@link ImportHandler} for the repository type of this handler - * @since 1.12 + * @deprecated + * @since 2.11.0 * * @throws FeatureNotSupportedException */ diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java index afaace217d..e3b355bc13 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitImportHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.repository; //~--- non-JDK imports -------------------------------------------------------- @@ -30,16 +30,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * * @author Sebastian Sdorra */ -public class GitImportHandler extends AbstactImportHandler -{ +@Deprecated +public class GitImportHandler extends AbstactImportHandler { - /** Field description */ + /** + * Field description + */ public static final String GIT_DIR = ".git"; - /** Field description */ + /** + * Field description + */ public static final String GIT_DIR_REFS = "refs"; /** @@ -53,11 +56,9 @@ public class GitImportHandler extends AbstactImportHandler /** * Constructs ... * - * * @param handler */ - public GitImportHandler(GitRepositoryHandler handler) - { + public GitImportHandler(GitRepositoryHandler handler) { this.handler = handler; } @@ -66,29 +67,27 @@ public class GitImportHandler extends AbstactImportHandler /** * Method description * - * * @return */ @Override - protected String[] getDirectoryNames() - { - return new String[] { GIT_DIR, GIT_DIR_REFS }; + protected String[] getDirectoryNames() { + return new String[]{GIT_DIR, GIT_DIR_REFS}; } /** * Method description * - * * @return */ @Override - protected AbstractRepositoryHandler getRepositoryHandler() - { + protected AbstractRepositoryHandler getRepositoryHandler() { return handler; } //~--- fields --------------------------------------------------------------- - /** Field description */ + /** + * Field description + */ private GitRepositoryHandler handler; } diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java index 6273505cf9..1c8618fc49 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgImportHandler.java @@ -41,7 +41,10 @@ import java.io.IOException; /** * * @author Sebastian Sdorra + * @deprecated + * @since 2.11.0 */ +@Deprecated public class HgImportHandler extends AbstactImportHandler { diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnImportHandler.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnImportHandler.java index 000e62fbd1..117fa88f13 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnImportHandler.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnImportHandler.java @@ -27,7 +27,10 @@ package sonia.scm.repository; /** * * @author Sebastian Sdorra + * @deprecated + * @since 2.11.0 */ +@Deprecated public class SvnImportHandler extends AbstactImportHandler {