aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrreich <rainer.reich@coremedia.com>2020-09-28 21:15:03 +0200
committerGitHub <noreply@github.com>2020-09-28 22:15:03 +0300
commit597192ba5b041b29dc68e0181e13648f2cdcbb36 (patch)
treec6b43b3b5dfe9aee1b6348fd213512bba221c687
parentf1724a2205c036080ecadbfc9a7da971b2713a09 (diff)
downloadpf4j-597192ba5b041b29dc68e0181e13648f2cdcbb36.tar.gz
pf4j-597192ba5b041b29dc68e0181e13648f2cdcbb36.zip
Make DefaultPluginDescriptor#addDependency usable (#398)
Thanks!
-rw-r--r--pf4j/src/main/java/org/pf4j/DefaultPluginDescriptor.java13
-rw-r--r--pf4j/src/test/java/org/pf4j/DefaultPluginDescriptorTest.java42
2 files changed, 45 insertions, 10 deletions
diff --git a/pf4j/src/main/java/org/pf4j/DefaultPluginDescriptor.java b/pf4j/src/main/java/org/pf4j/DefaultPluginDescriptor.java
index 5903662..bd6b297 100644
--- a/pf4j/src/main/java/org/pf4j/DefaultPluginDescriptor.java
+++ b/pf4j/src/main/java/org/pf4j/DefaultPluginDescriptor.java
@@ -16,7 +16,6 @@
package org.pf4j;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -167,12 +166,11 @@ public class DefaultPluginDescriptor implements PluginDescriptor {
}
protected PluginDescriptor setDependencies(String dependencies) {
+ this.dependencies = new ArrayList<>();
+
if (dependencies != null) {
dependencies = dependencies.trim();
- if (dependencies.isEmpty()) {
- this.dependencies = Collections.emptyList();
- } else {
- this.dependencies = new ArrayList<>();
+ if (!dependencies.isEmpty()) {
String[] tokens = dependencies.split(",");
for (String dependency : tokens) {
dependency = dependency.trim();
@@ -180,12 +178,7 @@ public class DefaultPluginDescriptor implements PluginDescriptor {
this.dependencies.add(new PluginDependency(dependency));
}
}
- if (this.dependencies.isEmpty()) {
- this.dependencies = Collections.emptyList();
- }
}
- } else {
- this.dependencies = Collections.emptyList();
}
return this;
diff --git a/pf4j/src/test/java/org/pf4j/DefaultPluginDescriptorTest.java b/pf4j/src/test/java/org/pf4j/DefaultPluginDescriptorTest.java
new file mode 100644
index 0000000..0cbbad6
--- /dev/null
+++ b/pf4j/src/test/java/org/pf4j/DefaultPluginDescriptorTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pf4j;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DefaultPluginDescriptorTest {
+
+ @Test
+ void addDependency() {
+ // Given a descriptor with empty dependencies
+ DefaultPluginDescriptor descriptor = new DefaultPluginDescriptor();
+ descriptor.setDependencies("");
+ PluginDependency newDependency = new PluginDependency("test");
+
+ // When I add a dependency
+ descriptor.addDependency(newDependency);
+
+ // Then the dependency is added
+ List<PluginDependency> expected = new ArrayList<>();
+ expected.add(newDependency);
+ assertEquals(expected, descriptor.getDependencies());
+ }
+}