diff options
Diffstat (limited to 'sonar-ws-client/src/main/java/org/sonar')
7 files changed, 293 insertions, 5 deletions
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/source/Scm.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/Scm.java new file mode 100644 index 00000000000..cf420820659 --- /dev/null +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/Scm.java @@ -0,0 +1,37 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.wsclient.source; + +import javax.annotation.CheckForNull; + +import java.util.Date; + +public interface Scm { + + long index(); + + @CheckForNull + String author(); + + @CheckForNull + Date date(); + +} diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/source/Source.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/Source.java new file mode 100644 index 00000000000..f1d1cf7b032 --- /dev/null +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/Source.java @@ -0,0 +1,32 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.wsclient.source; + +/** + * @since 4.4 + */ +public interface Source { + + long index(); + + String line(); + +} diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/source/SourceClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/SourceClient.java new file mode 100644 index 00000000000..36b65251bd4 --- /dev/null +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/SourceClient.java @@ -0,0 +1,37 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.wsclient.source; + +import javax.annotation.Nullable; + +import java.util.List; + +/** + * Display sources information + * @since 4.4 + */ +public interface SourceClient { + + List<Source> show(String key, @Nullable String from, @Nullable String to); + + List<Scm> scm(String key, @Nullable String from, @Nullable String to, @Nullable Boolean groupCommits); + +} diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultScm.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultScm.java new file mode 100644 index 00000000000..b563f5ec39a --- /dev/null +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultScm.java @@ -0,0 +1,56 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.wsclient.source.internal; + +import org.sonar.wsclient.source.Scm; +import org.sonar.wsclient.unmarshallers.JsonUtils; + +import javax.annotation.CheckForNull; + +import java.util.Date; +import java.util.List; + +public class DefaultScm implements Scm { + + private final List json; + + public DefaultScm(List json) { + this.json = json; + } + + @Override + public long index() { + return (Long) json.get(0); + } + + @Override + @CheckForNull + public String author() { + return (String) json.get(1); + } + + @Override + @CheckForNull + public Date date() { + return JsonUtils.parseDate((String) json.get(2)); + } + +} diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultSource.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultSource.java new file mode 100644 index 00000000000..8794a5f8bff --- /dev/null +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultSource.java @@ -0,0 +1,44 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.wsclient.source.internal; + +import org.sonar.wsclient.source.Source; + +import java.util.List; + +public class DefaultSource implements Source { + + private final List json; + + public DefaultSource(List json) { + this.json = json; + } + + @Override + public long index() { + return (Long) json.get(0); + } + + @Override + public String line() { + return (String) json.get(1); + } +} diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultSourceClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultSourceClient.java new file mode 100644 index 00000000000..d5e0acffe26 --- /dev/null +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/source/internal/DefaultSourceClient.java @@ -0,0 +1,77 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.wsclient.source.internal; + +import org.json.simple.JSONValue; +import org.sonar.wsclient.internal.EncodingUtils; +import org.sonar.wsclient.internal.HttpRequestFactory; +import org.sonar.wsclient.source.Scm; +import org.sonar.wsclient.source.Source; +import org.sonar.wsclient.source.SourceClient; + +import javax.annotation.Nullable; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class DefaultSourceClient implements SourceClient { + + private final HttpRequestFactory requestFactory; + + public DefaultSourceClient(HttpRequestFactory requestFactory) { + this.requestFactory = requestFactory; + } + + @Override + public List<Source> show(String key, @Nullable String from, @Nullable String to) { + Map<String, Object> params = EncodingUtils.toMap("key", key, "from", from, "to", to); + String json = requestFactory.get("/api/sources/show", params); + + List<Source> sources = new ArrayList<Source>(); + Map jRoot = (Map) JSONValue.parse(json); + List<List> jsonSources = (List) jRoot.get("sources"); + if (jsonSources != null) { + for (List jSource : jsonSources) { + sources.add(new DefaultSource(jSource)); + } + } + return sources; + } + + @Override + public List<Scm> scm(String key, @Nullable String from, @Nullable String to, @Nullable Boolean groupCommits) { + Map<String, Object> params = EncodingUtils.toMap("key", key, "from", from, "to", to); + params.put("group_commits", groupCommits); + String json = requestFactory.get("/api/sources/scm", params); + + List<Scm> result = new ArrayList<Scm>(); + Map jRoot = (Map) JSONValue.parse(json); + List<List> jsonResult = (List) jRoot.get("scm"); + if (jsonResult != null) { + for (List line : jsonResult) { + result.add(new DefaultScm(line)); + } + } + return result; + } + +} diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java index cd24c301dcf..6843ec8c9b3 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java @@ -22,6 +22,7 @@ package org.sonar.wsclient.unmarshallers; import org.json.simple.JSONArray; import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -94,24 +95,28 @@ public final class JsonUtils { @CheckForNull public static Date getDateTime(Map obj, String field) { - return parseDate(obj, field, "yyyy-MM-dd'T'HH:mm:ssZ"); + return parseDate(getString(obj, field), "yyyy-MM-dd'T'HH:mm:ssZ"); } @CheckForNull public static Date getDate(Map obj, String field) { - return parseDate(obj, field, "yyyy-MM-dd"); + return parseDate(getString(obj, field)); } @CheckForNull - private static Date parseDate(Map obj, String field, String format) { - String value = getString(obj, field); + public static Date parseDate(@Nullable String value) { + return parseDate(value, "yyyy-MM-dd"); + } + + @CheckForNull + private static Date parseDate(@Nullable String value, String format) { if (value != null) { try { SimpleDateFormat dateFormat = new SimpleDateFormat(format); return dateFormat.parse(value); } catch (ParseException e) { - throw new IllegalArgumentException("Fail to parse date property '" + field + "': " + format, e); + throw new IllegalArgumentException("Fail to parse date '" + value + "': " + format, e); } } return null; |