Attachment 158623 Details for Bug 272066 – Remove unused validation API

[patch] Remove unused validation API

patch.txt (text/plain), 13.28 KB, created by John Arthorne

on 2010-02-09 14:54:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2010-02-09 14:54:17 EST

Size: 13.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.operations
>Index: src/org/eclipse/equinox/p2/operations/RepositoryTracker.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RepositoryTracker.java,v
>retrieving revision 1.2
>diff -u -r1.2 RepositoryTracker.java
>--- src/org/eclipse/equinox/p2/operations/RepositoryTracker.java	13 Jan 2010 17:21:48 -0000	1.2
>+++ src/org/eclipse/equinox/p2/operations/RepositoryTracker.java	9 Feb 2010 19:53:57 -0000
>@@ -10,8 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.equinox.p2.operations;
> 
>-import org.eclipse.equinox.p2.core.ProvisionException;
>-
> import java.io.File;
> import java.net.URI;
> import java.net.URISyntaxException;
>@@ -20,6 +18,7 @@
> import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
> import org.eclipse.equinox.internal.p2.operations.*;
> import org.eclipse.equinox.internal.p2.repository.helpers.RepositoryHelper;
>+import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.repository.IRepositoryManager;
> import org.eclipse.osgi.util.NLS;
> 
>@@ -116,27 +115,10 @@
> 				break;
> 			}
> 		}
>-
>-		if (!localValidationStatus.isOK())
>-			return localValidationStatus;
>-
>-		if (contactRepositories)
>-			return validateRepositoryLocationWithManager(session, location, monitor);
>-
> 		return localValidationStatus;
> 	}
> 
> 	/**
>-	 * Validate the specified repository location using the appropriate repository manager.
>-	 * 
>-	 * @param session the provisioning session providing the repository services
>-	 * @param location the location in question
>-	 * @param monitor the progress monitor
>-	 * @return a status indicating the current status of the repository
>-	 */
>-	protected abstract IStatus validateRepositoryLocationWithManager(ProvisioningSession session, URI location, IProgressMonitor monitor);
>-
>-	/**
> 	 * Add the specified location to the list of "not found" repositories.
> 	 * This list is used to ensure that errors are not reported multiple times
> 	 * for the same repository.
>#P org.eclipse.equinox.p2.tests
>Index: src/org/eclipse/equinox/p2/tests/FailingMetadataRepositoryFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/FailingMetadataRepositoryFactory.java,v
>retrieving revision 1.4
>diff -u -r1.4 FailingMetadataRepositoryFactory.java
>--- src/org/eclipse/equinox/p2/tests/FailingMetadataRepositoryFactory.java	13 Jan 2010 17:28:24 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/FailingMetadataRepositoryFactory.java	9 Feb 2010 19:53:58 -0000
>@@ -38,11 +38,4 @@
> 		throw new ProvisionException(new Status(IStatus.ERROR, TestActivator.PI_PROV_TESTS, ProvisionException.REPOSITORY_NOT_FOUND, "", null));
> 	}
> 
>-	@Override
>-	public IStatus validate(URI location, IProgressMonitor monitor) {
>-		if (FAIL)
>-			throw new RuntimeException("Exception thrown deliberately as part of test");
>-		return new Status(IStatus.ERROR, TestActivator.PI_PROV_TESTS, ProvisionException.REPOSITORY_NOT_FOUND, "", null);
>-	}
>-
> }
>Index: src/org/eclipse/equinox/p2/tests/engine/ProfileMetadataRepositoryTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileMetadataRepositoryTest.java,v
>retrieving revision 1.16
>diff -u -r1.16 ProfileMetadataRepositoryTest.java
>--- src/org/eclipse/equinox/p2/tests/engine/ProfileMetadataRepositoryTest.java	5 Feb 2010 22:06:48 -0000	1.16
>+++ src/org/eclipse/equinox/p2/tests/engine/ProfileMetadataRepositoryTest.java	9 Feb 2010 19:53:58 -0000
>@@ -11,7 +11,6 @@
> package org.eclipse.equinox.p2.tests.engine;
> 
> import java.io.File;
>-import org.eclipse.core.runtime.IStatus;
> import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepositoryFactory;
> import org.eclipse.equinox.internal.p2.engine.*;
> import org.eclipse.equinox.p2.core.ProvisionException;
>@@ -44,23 +43,6 @@
> 		}
> 	}
> 
>-	public void testValidate() {
>-		File testData = getTestData("0.1", "testData/sdkpatchingtest");
>-		File tempFolder = getTempFolder();
>-		copy("0.2", testData, tempFolder);
>-
>-		File simpleProfileFolder = new File(tempFolder, "SDKPatchingTest.profile");
>-		assertTrue("0.3", simpleProfileFolder.exists());
>-
>-		ProfileMetadataRepositoryFactory factory = new ProfileMetadataRepositoryFactory();
>-		factory.setAgent(getAgent());
>-		IStatus status = factory.validate(simpleProfileFolder.toURI(), getMonitor());
>-		assertOK("1.0", status);
>-
>-		status = factory.validate(tempFolder.toURI(), getMonitor());
>-		assertNotOK("2.0", status);
>-	}
>-
> 	public void testLoad() {
> 		File testData = getTestData("0.1", "testData/sdkpatchingtest");
> 		//assert that test data is intact (see bug 285158)
>Index: src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java,v
>retrieving revision 1.16
>diff -u -r1.16 CompositeMetadataRepositoryTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java	13 Jan 2010 17:28:23 -0000	1.16
>+++ src/org/eclipse/equinox/p2/tests/metadata/repository/CompositeMetadataRepositoryTest.java	9 Feb 2010 19:53:58 -0000
>@@ -12,13 +12,12 @@
>  *******************************************************************************/
> package org.eclipse.equinox.p2.tests.metadata.repository;
> 
>-import org.eclipse.equinox.p2.metadata.Version;
>-
> import java.io.File;
> import java.net.URI;
> import java.net.URISyntaxException;
> import java.util.*;
>-import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.URIUtil;
> import org.eclipse.equinox.internal.p2.metadata.query.LatestIUVersionQuery;
> import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
> import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepositoryFactory;
>@@ -27,6 +26,7 @@
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
> import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>+import org.eclipse.equinox.p2.metadata.Version;
> import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
> import org.eclipse.equinox.p2.query.*;
> import org.eclipse.equinox.p2.repository.IRepository;
>@@ -306,12 +306,6 @@
> 		assertEquals("Children size after removeAllChildren", 0, compRepo.getChildren().size());
> 	}
> 
>-	public void testValidate() {
>-		//Setup: create an uncompressed repository
>-		createRepo(false);
>-		assertEquals("Verifying repository's status is OK", Status.OK_STATUS, (new CompositeMetadataRepositoryFactory()).validate(repoLocation.toURI(), null));
>-	}
>-
> 	public void testLoadingRepositoryRemote() {
> 		File knownGoodRepoLocation = getTestData("0.1", "/testData/metadataRepo/composite/good.remote");
> 
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java,v
>retrieving revision 1.2
>diff -u -r1.2 ColocatedRepositoryTracker.java
>--- src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java	13 Jan 2010 17:28:45 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/ui/ColocatedRepositoryTracker.java	9 Feb 2010 19:54:00 -0000
>@@ -10,12 +10,11 @@
>  *******************************************************************************/
> package org.eclipse.equinox.internal.p2.ui;
> 
>-import org.eclipse.equinox.p2.core.ProvisionException;
>-
> import java.net.URI;
> import org.eclipse.core.runtime.*;
> import org.eclipse.equinox.internal.p2.ui.dialogs.RepositoryNameAndLocationDialog;
> import org.eclipse.equinox.internal.provisional.p2.repository.RepositoryEvent;
>+import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.operations.ProvisioningSession;
> import org.eclipse.equinox.p2.operations.RepositoryTracker;
> import org.eclipse.equinox.p2.repository.IRepository;
>@@ -58,10 +57,6 @@
> 		return session.getMetadataRepositoryManager().getKnownRepositories(getMetadataRepositoryFlags());
> 	}
> 
>-	protected IStatus validateRepositoryLocationWithManager(ProvisioningSession session, URI location, IProgressMonitor monitor) {
>-		return session.getMetadataRepositoryManager().validateRepositoryLocation(location, monitor);
>-	}
>-
> 	public void addRepository(URI repoLocation, String nickname, ProvisioningSession session) {
> 		ui.signalRepositoryOperationStart();
> 		try {
>Index: src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java,v
>retrieving revision 1.3
>diff -u -r1.3 RepositoryManipulationPage.java
>--- src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java	14 Jan 2010 22:48:30 -0000	1.3
>+++ src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java	9 Feb 2010 19:54:00 -0000
>@@ -812,10 +812,6 @@
> 					RepositoryManipulationPage.this.removeRepositories();
> 				}
> 
>-				protected IStatus validateRepositoryLocationWithManager(ProvisioningSession session, URI location, IProgressMonitor monitor) {
>-					return session.getMetadataRepositoryManager().validateRepositoryLocation(location, monitor);
>-				}
>-
> 				public void refreshRepositories(URI[] locations, ProvisioningSession session, IProgressMonitor monitor) {
> 					// Nothing to refresh in the local cache
> 				}
>#P org.eclipse.equinox.p2.updatesite
>Index: src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java,v
>retrieving revision 1.21
>diff -u -r1.21 UpdateSiteMetadataRepositoryFactory.java
>--- src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java	13 Jan 2010 17:29:41 -0000	1.21
>+++ src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java	9 Feb 2010 19:54:00 -0000
>@@ -12,24 +12,18 @@
>  *******************************************************************************/
> package org.eclipse.equinox.internal.p2.updatesite.metadata;
> 
>-import org.eclipse.equinox.internal.p2.metadata.repository.SimpleMetadataRepositoryFactory;
>-
>-import org.eclipse.equinox.p2.repository.metadata.spi.MetadataRepositoryFactory;
>-
>-import org.eclipse.equinox.p2.core.ProvisionException;
>-
> import java.io.File;
>-import java.io.FileNotFoundException;
> import java.net.URI;
> import java.util.Map;
> import org.eclipse.core.runtime.*;
>-import org.eclipse.ecf.filetransfer.UserCancelledException;
> import org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository;
>-import org.eclipse.equinox.internal.p2.repository.AuthenticationFailedException;
>+import org.eclipse.equinox.internal.p2.metadata.repository.SimpleMetadataRepositoryFactory;
> import org.eclipse.equinox.internal.p2.updatesite.*;
>+import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.publisher.*;
> import org.eclipse.equinox.p2.repository.IRepositoryManager;
> import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
>+import org.eclipse.equinox.p2.repository.metadata.spi.MetadataRepositoryFactory;
> import org.eclipse.osgi.util.NLS;
> 
> public class UpdateSiteMetadataRepositoryFactory extends MetadataRepositoryFactory {
>@@ -49,23 +43,6 @@
> 		return null;
> 	}
> 
>-	public IStatus validate(URI location, IProgressMonitor monitor) {
>-		try {
>-			UpdateSite.validate(location, monitor);
>-		} catch (ProvisionException e) {
>-			return e.getStatus();
>-		} catch (UserCancelledException e) {
>-			return Status.CANCEL_STATUS;
>-		} catch (AuthenticationFailedException e) {
>-			return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_AUTHENTICATION, NLS.bind(Messages.AuthenticationFailedFor_0, location.toString()), e);
>-		} catch (FileNotFoundException e) {
>-			return new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_NOT_FOUND, NLS.bind(Messages.RepositoryNotFound_0, location.toString()), e);
>-		} catch (CoreException e) {
>-			return e.getStatus();
>-		}
>-		return Status.OK_STATUS;
>-	}
>-
> 	public IMetadataRepository load(URI location, int flags, IProgressMonitor monitor) throws ProvisionException {
> 		//return null if the caller wanted a modifiable repo
> 		if ((flags & IRepositoryManager.REPOSITORY_HINT_MODIFIABLE) > 0) {

Actions: View | Diff

Attachments on bug 272066: 158623