From 2f3258cc28482d744c14caa8109cecd3316db659 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 9 Jan 2020 18:06:05 +0100
Subject: [PATCH] Move ConnectivityChecker to fix API leak

Protected field ReceivePack.connectivityChecker is of type
ConnectivityChecker which was located in internal package
org.eclipse.jgit.transport and was thus leaking an internal type.

In order to fix this move ConnectivityChecker to package
org.eclipse.jgit.transport.

Change-Id: Idc0af75502faf39f13a56157bbb6964d24720eb8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 .../jgit/transport/{internal => }/ConnectivityChecker.java  | 6 +++---
 .../src/org/eclipse/jgit/transport/ReceivePack.java         | 3 +--
 .../jgit/transport/internal/FullConnectivityChecker.java    | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename org.eclipse.jgit/src/org/eclipse/jgit/transport/{internal => }/ConnectivityChecker.java (95%)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/ConnectivityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ConnectivityChecker.java
similarity index 95%
rename from org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/ConnectivityChecker.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/transport/ConnectivityChecker.java
index d6efada65..dcffe48be 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/ConnectivityChecker.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ConnectivityChecker.java
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-package org.eclipse.jgit.transport.internal;
+package org.eclipse.jgit.transport;
 
 import java.io.IOException;
 import java.util.List;
@@ -18,12 +18,12 @@
 import org.eclipse.jgit.lib.ProgressMonitor;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.transport.PackParser;
-import org.eclipse.jgit.transport.ReceiveCommand;
 
 /**
  * Checks that a received pack only depends on objects which are reachable from
  * a defined set of references.
+ *
+ * @since 5.7
  */
 public interface ConnectivityChecker {
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 0b55203f9..8ca09f8ad 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -68,11 +68,10 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.transport.ConnectivityChecker.ConnectivityCheckInfo;
 import org.eclipse.jgit.transport.PacketLineIn.InputOverLimitIOException;
 import org.eclipse.jgit.transport.ReceiveCommand.Result;
 import org.eclipse.jgit.transport.RefAdvertiser.PacketLineOutRefAdvertiser;
-import org.eclipse.jgit.transport.internal.ConnectivityChecker.ConnectivityCheckInfo;
-import org.eclipse.jgit.transport.internal.ConnectivityChecker;
 import org.eclipse.jgit.transport.internal.FullConnectivityChecker;
 import org.eclipse.jgit.util.io.InterruptTimer;
 import org.eclipse.jgit.util.io.LimitedInputStream;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java
index 4adddf087..60d8f452b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java
@@ -26,6 +26,7 @@
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevSort;
 import org.eclipse.jgit.revwalk.RevTree;
+import org.eclipse.jgit.transport.ConnectivityChecker;
 import org.eclipse.jgit.transport.ReceiveCommand;
 import org.eclipse.jgit.transport.ReceiveCommand.Result;