You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/02/13 14:55:30 UTC
[6/6] incubator-taverna-osgi git commit: java.net.URL -> java.net.URI
java.net.URL -> java.net.URI
.. we want to avoid those awkward .equals() errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/commit/c9bdfb59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/tree/c9bdfb59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/diff/c9bdfb59
Branch: refs/heads/master
Commit: c9bdfb59511ec60bc9c5525fec0d6fe0c1291e59
Parents: d01c5ae
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sat Feb 13 13:54:02 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sat Feb 13 13:54:02 2016 +0000
----------------------------------------------------------------------
.../taverna/plugin/PluginSiteManager.java | 4 +--
.../plugin/impl/PluginSiteManagerImpl.java | 8 ++---
.../plugin/impl/PluginSiteManagerImplTest.java | 5 ++-
.../taverna/update/impl/UpdateManagerImpl.java | 36 ++++++--------------
4 files changed, 16 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/c9bdfb59/taverna-plugin-api/src/main/java/org/apache/taverna/plugin/PluginSiteManager.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-api/src/main/java/org/apache/taverna/plugin/PluginSiteManager.java b/taverna-plugin-api/src/main/java/org/apache/taverna/plugin/PluginSiteManager.java
index ce8ad8e..f6c3d80 100644
--- a/taverna-plugin-api/src/main/java/org/apache/taverna/plugin/PluginSiteManager.java
+++ b/taverna-plugin-api/src/main/java/org/apache/taverna/plugin/PluginSiteManager.java
@@ -16,7 +16,7 @@
*/
package org.apache.taverna.plugin;
-import java.net.URL;
+import java.net.URI;
import java.util.List;
import org.apache.taverna.plugin.xml.jaxb.PluginVersions;
@@ -44,7 +44,7 @@ public interface PluginSiteManager {
* @param pluginSiteURL the plugin site URL
* @throws PluginException if there is a problem contacting the plugin site
*/
- public PluginSite createPluginSite(URL pluginSiteURL) throws PluginException;
+ public PluginSite createPluginSite(URI pluginSiteURL) throws PluginException;
/**
* Adds a plugin site.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/c9bdfb59/taverna-plugin-impl/src/main/java/org/apache/taverna/plugin/impl/PluginSiteManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-impl/src/main/java/org/apache/taverna/plugin/impl/PluginSiteManagerImpl.java b/taverna-plugin-impl/src/main/java/org/apache/taverna/plugin/impl/PluginSiteManagerImpl.java
index ef66bb0..30daae4 100644
--- a/taverna-plugin-impl/src/main/java/org/apache/taverna/plugin/impl/PluginSiteManagerImpl.java
+++ b/taverna-plugin-impl/src/main/java/org/apache/taverna/plugin/impl/PluginSiteManagerImpl.java
@@ -18,9 +18,7 @@ package org.apache.taverna.plugin.impl;
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -85,15 +83,13 @@ public class PluginSiteManagerImpl implements PluginSiteManager {
}
@Override
- public PluginSite createPluginSite(URL pluginSiteURL) throws PluginException {
+ public PluginSite createPluginSite(URI pluginSiteURL) throws PluginException {
try {
File tempFile = File.createTempFile("plugins", null);
tempFile.deleteOnExit();
URI pluginFileURL = URI.create(pluginSiteURL + "/").resolve(PLUGINS_FILE);
downloadManager.download(pluginFileURL, tempFile.toPath(), DIGEST_ALGORITHM);
- return new PluginSiteImpl("", pluginSiteURL.toExternalForm());
- } catch (MalformedURLException e) {
- throw new PluginException(String.format("Invalid plugin site URL %1$s", pluginSiteURL), e);
+ return new PluginSiteImpl("", pluginSiteURL.toString());
} catch (DownloadException e) {
throw new PluginException(String.format("Error contacting plugin site at %1$s", pluginSiteURL), e);
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/c9bdfb59/taverna-plugin-impl/src/test/java/org/apache/taverna/plugin/impl/PluginSiteManagerImplTest.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-impl/src/test/java/org/apache/taverna/plugin/impl/PluginSiteManagerImplTest.java b/taverna-plugin-impl/src/test/java/org/apache/taverna/plugin/impl/PluginSiteManagerImplTest.java
index 0e3279c..796ed1d 100644
--- a/taverna-plugin-impl/src/test/java/org/apache/taverna/plugin/impl/PluginSiteManagerImplTest.java
+++ b/taverna-plugin-impl/src/test/java/org/apache/taverna/plugin/impl/PluginSiteManagerImplTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import java.net.URI;
-import java.net.URL;
import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.apache.taverna.download.DownloadException;
@@ -81,7 +80,7 @@ public class PluginSiteManagerImplTest {
pluginSiteManager.setDownloadManager(downloadManager);
- pluginSiteManager.createPluginSite(new URL("file:///"));
+ pluginSiteManager.createPluginSite(URI.create("file:///"));
}
@@ -92,7 +91,7 @@ public class PluginSiteManagerImplTest {
pluginSiteManager.setDownloadManager(downloadManager);
- pluginSiteManager.createPluginSite(new URL("file:///"));
+ pluginSiteManager.createPluginSite(URI.create("file:///"));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/c9bdfb59/taverna-update-impl/src/main/java/org/apache/taverna/update/impl/UpdateManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-update-impl/src/main/java/org/apache/taverna/update/impl/UpdateManagerImpl.java b/taverna-update-impl/src/main/java/org/apache/taverna/update/impl/UpdateManagerImpl.java
index 6f6b4b5..136c15b 100644
--- a/taverna-update-impl/src/main/java/org/apache/taverna/update/impl/UpdateManagerImpl.java
+++ b/taverna-update-impl/src/main/java/org/apache/taverna/update/impl/UpdateManagerImpl.java
@@ -18,10 +18,9 @@ package org.apache.taverna.update.impl;
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
+import java.nio.file.Path;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -48,7 +47,6 @@ import org.osgi.service.event.EventAdmin;
/**
* Implementation of the Taverna Update Manager.
*
- * @author David Withers
*/
public class UpdateManagerImpl implements UpdateManager {
@@ -84,13 +82,10 @@ public class UpdateManagerImpl implements UpdateManager {
String version = applicationProfile.getVersion();
Updates updates = applicationProfile.getUpdates();
- URL updatesURL;
+ URI updatesURL;
try {
URI updateSiteURI = new URI(updates.getUpdateSite());
- updatesURL = updateSiteURI.resolve(updates.getUpdatesFile()).toURL();
- } catch (MalformedURLException e) {
- throw new UpdateException(String.format("Update site URL (%s) is not a valid URL",
- updates.getUpdateSite()), e);
+ updatesURL = updateSiteURI.resolve(updates.getUpdatesFile());
} catch (URISyntaxException e) {
throw new UpdateException(String.format("Update site URL (%s) is not a valid URL",
updates.getUpdateSite()), e);
@@ -99,7 +94,7 @@ public class UpdateManagerImpl implements UpdateManager {
updateDirectory.mkdirs();
File updatesFile = new File(updateDirectory, updates.getUpdatesFile());
try {
- downloadManager.download(updatesURL, updatesFile, DIGEST_ALGORITHM);
+ downloadManager.download(updatesURL, updatesFile.toPath(), DIGEST_ALGORITHM);
} catch (DownloadException e) {
throw new UpdateException(String.format("Error downloading %1$s",
updatesURL), e);
@@ -124,14 +119,10 @@ public class UpdateManagerImpl implements UpdateManager {
if (updateAvailable) {
ApplicationProfile applicationProfile = applicationConfiguration.getApplicationProfile();
Updates updates = applicationProfile.getUpdates();
- URL profileURL;
+ URI profileURL;
try {
URI updateSiteURI = new URI(updates.getUpdateSite());
- profileURL = updateSiteURI.resolve(latestVersion.getFile()).toURL();
- } catch (MalformedURLException e) {
- throw new UpdateException(String.format(
- "Application profile URL (%s) is not a valid URL",
- latestVersion.getFile()), e);
+ profileURL = updateSiteURI.resolve(latestVersion.getFile());
} catch (URISyntaxException e) {
throw new UpdateException(String.format("Update site URL (%s) is not a valid URL",
updates.getUpdateSite()), e);
@@ -143,7 +134,7 @@ public class UpdateManagerImpl implements UpdateManager {
File latestProfileFile = new File(updateDirectory, "ApplicationProfile-"
+ latestVersion.getVersion() + ".xml");
try {
- downloadManager.download(profileURL, latestProfileFile, DIGEST_ALGORITHM);
+ downloadManager.download(profileURL, latestProfileFile.toPath(), DIGEST_ALGORITHM);
} catch (DownloadException e) {
throw new UpdateException(String.format("Error downloading %1$s",
profileURL), e);
@@ -195,20 +186,13 @@ public class UpdateManagerImpl implements UpdateManager {
updates.getUpdateSite()), e);
}
for (BundleInfo bundle : requiredBundles) {
- URL bundleURL;
URI bundleURI = updateLibDirectory.resolve(bundle.getFileName());
+ Path bundleDestination = new File(file, bundle.getFileName()).toPath();
try {
- bundleURL = bundleURI.toURL();
- } catch (MalformedURLException e) {
- throw new UpdateException(String.format("Bundle URL (%s) is not a valid URL",
- bundleURI), e);
- }
- File bundleDestination = new File(file, bundle.getFileName());
- try {
- downloadManager.download(bundleURL, new File(file, bundle.getFileName()), DIGEST_ALGORITHM);
+ downloadManager.download(bundleURI, bundleDestination, DIGEST_ALGORITHM);
} catch (DownloadException e) {
throw new UpdateException(String.format("Error downloading %1$s to %2$s",
- bundleURL, bundleDestination), e);
+ bundleURI, bundleDestination), e);
}
}
}