You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/11/11 18:34:53 UTC
marmotta git commit: cleanups
Repository: marmotta
Updated Branches:
refs/heads/develop 0b1db3700 -> e0f279cbd
cleanups
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e0f279cb
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e0f279cb
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e0f279cb
Branch: refs/heads/develop
Commit: e0f279cbd198d012e8686189e5725a3ad6dda109
Parents: 0b1db37
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Nov 11 18:35:33 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Nov 11 18:35:33 2014 +0100
----------------------------------------------------------------------
.../core/api/config/DependenciesService.java | 4 ++--
.../services/config/DependenciesServiceImpl.java | 18 +++++-------------
.../config/DependenciesWebService.java | 4 ++--
3 files changed, 9 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e0f279cb/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/DependenciesService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/DependenciesService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/DependenciesService.java
index f294890..0000a24 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/DependenciesService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/DependenciesService.java
@@ -33,9 +33,9 @@ public interface DependenciesService {
String ARTIFACT = "artifactId";
String VERSION = "version";
- List<Map<String, String>> getArtifacs();
+ List<Map<String, String>> getArtifacts();
- List<Map<String, String>> getArtifacs(String groupId);
+ List<Map<String, String>> getArtifacts(String groupId);
String getVersion(String groupId, String artifactId);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e0f279cb/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
index d004676..85dba9b 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/DependenciesServiceImpl.java
@@ -17,23 +17,15 @@
*/
package org.apache.marmotta.platform.core.services.config;
-import org.apache.marmotta.platform.core.api.config.DependenciesService;
import org.apache.commons.lang3.StringUtils;
+import org.apache.marmotta.platform.core.api.config.DependenciesService;
import org.slf4j.Logger;
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.util.*;
/**
* Provides meta information about the current dependencies
@@ -103,12 +95,12 @@ public class DependenciesServiceImpl implements DependenciesService {
}
@Override
- public List<Map<String, String>> getArtifacs() {
+ public List<Map<String, String>> getArtifacts() {
return Collections.unmodifiableList(this.dependencies);
}
@Override
- public List<Map<String, String>> getArtifacs(String groupId) {
+ public List<Map<String, String>> getArtifacts(String groupId) {
List<Map<String, String>> deps = new ArrayList<Map<String, String>>();
for (Map<String, String> dep : this.dependencies) {
if (groupId.equals(dep.get(DependenciesService.GROUP))) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e0f279cb/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/DependenciesWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/DependenciesWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/DependenciesWebService.java
index 09dc2f3..69404f2 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/DependenciesWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/DependenciesWebService.java
@@ -44,14 +44,14 @@ public class DependenciesWebService {
@Path("/")
@Produces("application/json")
public List<Map<String, String>> getArtifacs() {
- return dependenciesService.getArtifacs();
+ return dependenciesService.getArtifacts();
}
@GET
@Path("/{groupId: [a-z]+(\\.[a-z]+)*}")
@Produces("application/json")
public List<Map<String, String>> getArtifacs(@PathParam("groupId") String groupId) {
- return dependenciesService.getArtifacs(groupId);
+ return dependenciesService.getArtifacts(groupId);
}
@GET