[netbeans] 01/07: [NETBEANS-2346] Fixed index out of bound exception in GAV parsing.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 0aa1185f2c9af595f9a6c4b368276b9dd613cc6b
Author: Laszlo Kishalmi
AuthorDate: Sat Apr 6 05:35:25 2019 -0700
[NETBEANS-2346] Fixed index out of bound exception in GAV parsing.
---
.../modules/gradle/api/GradleBaseProject.java | 2 +-
.../modules/gradle/api/GradleConfiguration.java| 2 +-
.../modules/gradle/api/GradleDependency.java | 15 -
.../modules/gradle/nodes/ConfigurationsNode.java | 4 +-
.../actions/ActionMappingPropertyReaderTest.java | 22 +++---
.../modules/gradle/api/GradleDepandencyTest.java | 78 ++
6 files changed, 105 insertions(+), 18 deletions(-)
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
index 8c16759..49a4f14 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
@@ -256,7 +256,7 @@ public final class GradleBaseProject implements
Serializable, ModuleSearchSuppor
@Override
public Set findModules(String gav) {
-String parts[] = gav.split(":");
+String parts[] = GradleDependency.gavSplit(gav);
if (parts.length != 3) {
throw new IllegalArgumentException("Invalid gav filter: " + gav);
}
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
index f269b5e..fe6b233 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
@@ -86,7 +86,7 @@ public final class GradleConfiguration implements
Serializable, ModuleSearchSupp
@Override
public Set findModules(String gav) {
-String parts[] = gav.split(":");
+String parts[] = GradleDependency.gavSplit(gav);
if (parts.length != 3) {
throw new IllegalArgumentException("Invalid gav filter: " + gav);
}
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
index 7d1decb..ab2b588 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
@@ -63,6 +63,19 @@ public abstract class GradleDependency implements
Serializable, Comparable artifacts) {
super(id);
this.artifacts = artifacts;
-String[] parts = id.split(":");
+String[] parts = gavSplit(id);
group = parts[0];
name = parts[1];
version = parts[2];
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
b/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
index e57077e..4300195 100644
---
a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
+++
b/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
@@ -290,7 +290,7 @@ public class ConfigurationsNode extends AbstractNode {
GradleProject gp = project.getGradleProject();
ArrayList ret = new ArrayList<>();
GradleConfiguration conf =
gp.getBaseProject().getConfigurations().get(configuration);
-// We can get null here ins ome extreme cases, e.g. when the
project is being deleted
+// We can get null here in some extreme cases, e.g. when the
project is being deleted
if (conf != null) {
ret.addAll(conf.getUnresolved());
ret.addAll(conf.getProjects());
@@ -370,7 +370,7 @@ public class ConfigurationsNode extends AbstractNode {
@Override
public String getDisplayName() {
-return module.getName() + ":" + module.getVersion();
+return module.getVersion().isEmpty() ? module.getName() :
module.getName() + ":" + module.getVersion();
}
@Override
diff --git
a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
b/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
index 99a7dfd..d6ad668 100644
---
a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
+++
b/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
@@ -22,10 +22,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import org.junit.After;
-import org.junit.AfterClass;
-import
[netbeans] 01/07: [NETBEANS-2346] Fixed index out of bound exception in GAV parsing.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110-gradle-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit aebe5f9bf438c7df73d5fdac1ce3b9c10c634796
Author: Laszlo Kishalmi
AuthorDate: Sat Apr 6 05:35:25 2019 -0700
[NETBEANS-2346] Fixed index out of bound exception in GAV parsing.
---
.../modules/gradle/api/GradleBaseProject.java | 2 +-
.../modules/gradle/api/GradleConfiguration.java| 2 +-
.../modules/gradle/api/GradleDependency.java | 15 -
.../modules/gradle/nodes/ConfigurationsNode.java | 4 +-
.../actions/ActionMappingPropertyReaderTest.java | 22 +++---
.../modules/gradle/api/GradleDepandencyTest.java | 78 ++
6 files changed, 105 insertions(+), 18 deletions(-)
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
index 8c16759..49a4f14 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProject.java
@@ -256,7 +256,7 @@ public final class GradleBaseProject implements
Serializable, ModuleSearchSuppor
@Override
public Set findModules(String gav) {
-String parts[] = gav.split(":");
+String parts[] = GradleDependency.gavSplit(gav);
if (parts.length != 3) {
throw new IllegalArgumentException("Invalid gav filter: " + gav);
}
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
index f269b5e..fe6b233 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
@@ -86,7 +86,7 @@ public final class GradleConfiguration implements
Serializable, ModuleSearchSupp
@Override
public Set findModules(String gav) {
-String parts[] = gav.split(":");
+String parts[] = GradleDependency.gavSplit(gav);
if (parts.length != 3) {
throw new IllegalArgumentException("Invalid gav filter: " + gav);
}
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
index 7d1decb..ab2b588 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
@@ -63,6 +63,19 @@ public abstract class GradleDependency implements
Serializable, Comparable artifacts) {
super(id);
this.artifacts = artifacts;
-String[] parts = id.split(":");
+String[] parts = gavSplit(id);
group = parts[0];
name = parts[1];
version = parts[2];
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
b/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
index e57077e..4300195 100644
---
a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
+++
b/groovy/gradle/src/org/netbeans/modules/gradle/nodes/ConfigurationsNode.java
@@ -290,7 +290,7 @@ public class ConfigurationsNode extends AbstractNode {
GradleProject gp = project.getGradleProject();
ArrayList ret = new ArrayList<>();
GradleConfiguration conf =
gp.getBaseProject().getConfigurations().get(configuration);
-// We can get null here ins ome extreme cases, e.g. when the
project is being deleted
+// We can get null here in some extreme cases, e.g. when the
project is being deleted
if (conf != null) {
ret.addAll(conf.getUnresolved());
ret.addAll(conf.getProjects());
@@ -370,7 +370,7 @@ public class ConfigurationsNode extends AbstractNode {
@Override
public String getDisplayName() {
-return module.getName() + ":" + module.getVersion();
+return module.getVersion().isEmpty() ? module.getName() :
module.getName() + ":" + module.getVersion();
}
@Override
diff --git
a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
b/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
index 99a7dfd..d6ad668 100644
---
a/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
+++
b/groovy/gradle/test/unit/src/org/netbeans/modules/gradle/actions/ActionMappingPropertyReaderTest.java
@@ -22,10 +22,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import org.junit.After;
-import org.junit.AfterClass;
-import
