hide constructor and throw exception if the version could not be parsed

This commit is contained in:
Sebastian Sdorra
2014-02-19 21:47:45 +01:00
parent b6c65e085b
commit 269178f0a2
11 changed files with 162 additions and 82 deletions

View File

@@ -35,6 +35,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.version.Version;
import com.github.legman.Subscribe;
import com.google.common.collect.Sets;
@@ -721,7 +722,7 @@ public class DefaultPluginManager implements PluginManager
PluginInformation installed)
{
boolean result = false;
PluginVersion version = PluginVersion.createVersion(available.getVersion());
Version version = Version.parse(available.getVersion());
if (version != null)
{

View File

@@ -44,7 +44,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import sonia.scm.SCMContext;
import sonia.scm.plugin.PluginVersion;
import sonia.scm.version.Version;
//~--- JDK imports ------------------------------------------------------------
@@ -79,7 +79,7 @@ public class ClientDateFormatUpgradeHandler extends XmlUpgradeHandler
*/
@Override
public void doUpgrade(File homeDirectory, File configDirectory,
PluginVersion oldVersion, PluginVersion newVersion)
Version oldVersion, Version newVersion)
{
if (oldVersion.isOlder("1.23"))
{

View File

@@ -46,7 +46,7 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import sonia.scm.SCMContext;
import sonia.scm.plugin.PluginVersion;
import sonia.scm.version.Version;
import sonia.scm.util.IOUtil;
import sonia.scm.util.Util;
@@ -90,7 +90,7 @@ public class TimestampUpgradeHandler extends XmlUpgradeHandler
*/
@Override
public void doUpgrade(File homeDirectory, File configDirectory,
PluginVersion oldVersion, PluginVersion newVersion)
Version oldVersion, Version newVersion)
{
if (oldVersion.isOlder("1.2"))
{

View File

@@ -44,7 +44,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext;
import sonia.scm.plugin.PluginVersion;
import sonia.scm.version.Version;
import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -164,8 +164,8 @@ public class UpgradeManager
try
{
PluginVersion oldVersion = PluginVersion.createVersion(oldVersionString);
PluginVersion newVersion = PluginVersion.createVersion(newVersionString);
Version oldVersion = Version.parse(oldVersionString);
Version newVersion = Version.parse(newVersionString);
doUpgradesForOldVersion(baseDirectory, configDirectory, oldVersion,
newVersion);
@@ -190,7 +190,7 @@ public class UpgradeManager
* @param newVersion
*/
private void doUpgradesForOldVersion(File baseDirectory,
File configDirectory, PluginVersion oldVersion, PluginVersion newVersion)
File configDirectory, Version oldVersion, Version newVersion)
{
List<UpgradeHandler> upgradeHandlers = collectUpgradeHandlers();