Browse Source

Resolve #199

tags/release-2.3.0
Decebal Suiu 6 years ago
parent
commit
9b6d4a3efb

+ 0
- 4
pf4j/src/main/java/org/pf4j/AbstractPluginManager.java View File

@@ -887,10 +887,6 @@ public abstract class AbstractPluginManager implements PluginManager {
throw new PluginException("Field 'id' cannot be empty");
}

if (StringUtils.isNullOrEmpty(descriptor.getPluginClass())) {
throw new PluginException("Field 'class' cannot be empty");
}

if (descriptor.getVersion() == null) {
throw new PluginException("Field 'version' cannot be empty");
}

+ 1
- 10
pf4j/src/main/java/org/pf4j/DefaultPluginDescriptor.java View File

@@ -26,7 +26,7 @@ public class DefaultPluginDescriptor implements PluginDescriptor {

private String pluginId;
private String pluginDescription;
private String pluginClass;
private String pluginClass = Plugin.class.getName();
private String version;
private String requires = "*"; // SemVer format
private String provider;
@@ -37,15 +37,6 @@ public class DefaultPluginDescriptor implements PluginDescriptor {
dependencies = new ArrayList<>();
}

/**
* @param pluginId
* @param pluginDescription
* @param pluginClass
* @param version
* @param requires
* @param provider
* @param license
*/
public DefaultPluginDescriptor(String pluginId, String pluginDescription, String pluginClass, String version, String requires, String provider, String license) {
this();
this.pluginId = pluginId;

+ 3
- 1
pf4j/src/main/java/org/pf4j/ManifestPluginDescriptorFinder.java View File

@@ -103,7 +103,9 @@ public class ManifestPluginDescriptorFinder implements PluginDescriptorFinder {
}

String clazz = attributes.getValue("Plugin-Class");
pluginDescriptor.setPluginClass(clazz);
if (StringUtils.isNotNullOrEmpty(clazz)) {
pluginDescriptor.setPluginClass(clazz);
}

String version = attributes.getValue("Plugin-Version");
if (StringUtils.isNotNullOrEmpty(version)) {

+ 1
- 1
pf4j/src/main/java/org/pf4j/Plugin.java View File

@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
*
* @author Decebal Suiu
*/
public abstract class Plugin {
public class Plugin {

/**
* Makes logging service available for descending classes.

+ 3
- 1
pf4j/src/main/java/org/pf4j/PropertiesPluginDescriptorFinder.java View File

@@ -109,7 +109,9 @@ public class PropertiesPluginDescriptorFinder implements PluginDescriptorFinder
}

String clazz = properties.getProperty("plugin.class");
pluginDescriptor.setPluginClass(clazz);
if (StringUtils.isNotNullOrEmpty(clazz)) {
pluginDescriptor.setPluginClass(clazz);
}

String version = properties.getProperty("plugin.version");
if (StringUtils.isNotNullOrEmpty(version)) {

Loading…
Cancel
Save