Add IMetadataRepository.removeReferences()

And clean-up the affected classes at a few occasions.
eclipse-equinox · Sep 28, 2023 · dd1e28a · dd1e28a
1 parent 0c02412
commit dd1e28a
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 10 deletions.
diff --git a/.../src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java b/.../src/org/eclipse/equinox/internal/p2/metadata/repository/CompositeMetadataRepository.java
@@ -246,11 +246,7 @@ private static File getActualLocation(URI location, String extension) {
 			//			return new File(spec + extension);
 			return spec;
 		}
-		if (path.endsWith("/")) //$NON-NLS-1$
-			path += CompositeMetadataRepositoryFactory.CONTENT_FILENAME;
-		else
-			path += "/" + CompositeMetadataRepositoryFactory.CONTENT_FILENAME; //$NON-NLS-1$
-		return new File(path + extension);
+		return new File(path, CompositeMetadataRepositoryFactory.CONTENT_FILENAME + extension);
 	}
 
 	public static File getActualLocation(URI location) {
@@ -262,11 +258,17 @@ public synchronized void addReferences(Collection<? extends IRepositoryReference
 		throw new UnsupportedOperationException("Cannot add References to a composite repository"); //$NON-NLS-1$
 	}
 
+	@Override
+	public synchronized boolean removeReferences(Collection<? extends IRepositoryReference> references) {
+		throw new UnsupportedOperationException("Cannot remove References to a composite repository"); //$NON-NLS-1$
+	}
+
 	@Override
 	public Collection<IRepositoryReference> getReferences() {
-		HashSet<IRepositoryReference> allRefs = new HashSet<>();
-		for (IMetadataRepository child : loadedRepos)
+		Set<IRepositoryReference> allRefs = new HashSet<>();
+		for (IMetadataRepository child : loadedRepos) {
 			allRefs.addAll(child.getReferences());
+		}
 		return allRefs;
 	}
 

diff --git a/...tory/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java b/...tory/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
@@ -114,9 +114,19 @@ public synchronized void addInstallableUnits(Collection<IInstallableUnit> instal
 	@Override
 	public void addReferences(Collection<? extends IRepositoryReference> references) {
 		assertModifiable();
-		// only write out the repository if we made changes
-		if (repositories.addAll(references))
-			save();
+		if (repositories.addAll(references)) {
+			save(); // only write out the repository if we made changes
+		}
+	}
+
+	@Override
+	public boolean removeReferences(Collection<? extends IRepositoryReference> references) {
+		assertModifiable();
+		if (repositories.removeAll(references)) {
+			save(); // only write out the repository if we made changes
+			return true;
+		}
+		return false;
 	}
 
 	@Override

diff --git a/...nox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java b/...nox.p2.repository/src/org/eclipse/equinox/p2/repository/metadata/IMetadataRepository.java
@@ -58,6 +58,13 @@ public interface IMetadataRepository extends IRepository<IInstallableUnit> {
 	 */
 	Collection<IRepositoryReference> getReferences();
 
+	/**
+	 * Removes from this repository the given references to other repositories.
+	 *
+	 * @since 2.8
+	 */
+	boolean removeReferences(Collection<? extends IRepositoryReference> references);
+
 	/**
 	 * Removes all installable units in the given collection from this repository.
 	 *

diff --git a/...sitory/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java b/...sitory/src/org/eclipse/equinox/p2/repository/metadata/spi/AbstractMetadataRepository.java
@@ -123,6 +123,13 @@ public void addReferences(Collection<? extends IRepositoryReference> references)
 		assertModifiable();
 	}
 
+	@Override
+	public boolean removeReferences(Collection<? extends IRepositoryReference> references) {
+		assertModifiable();
+		return false;
+	}
+
+
 	@Override
 	public void removeAll() {
 		assertModifiable();

diff --git a/...org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java b/...org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
@@ -123,6 +123,12 @@ public synchronized void addReferences(Collection<? extends IRepositoryReference
 		repositories.addAll(references);
 	}
 
+	@Override
+	public synchronized boolean removeReferences(Collection<? extends IRepositoryReference> references) {
+		assertModifiable();
+		return repositories.removeAll(references);
+	}
+
 	/**
 	 * Returns a collection of {@link RepositoryReference}.
 	 */

diff --git a/...src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java b/...src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java
@@ -56,6 +56,11 @@ public void addReferences(Collection<? extends IRepositoryReference> references)
 		throw new UnsupportedOperationException("Repository not modifiable: " + location); //$NON-NLS-1$
 	}
 
+	@Override
+	public boolean removeReferences(Collection<? extends IRepositoryReference> references) {
+		throw new UnsupportedOperationException("Repository not modifiable: " + location); //$NON-NLS-1$
+	}
+
 	@Override
 	public Collection<IRepositoryReference> getReferences() {
 		return delegate.getReferences();