From f9456b80f26bbc0a8bbe22c8985c3fdeb59a5454 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 6 Jan 2015 09:07:58 +0100 Subject: SONAR-5753 Update assertions isEqualTo("") -> isEmpty() --- .../org/sonar/batch/index/DefaultResourcePersisterTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java index 7f54b3d5ebb..9228e408737 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java @@ -122,7 +122,7 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { assertThat(newProject.uuid()).isNotNull(); assertThat(newProject.projectUuid()).isEqualTo(newProject.uuid()); assertThat(newProject.moduleUuid()).isNull(); - assertThat(newProject.moduleUuidPath()).isEqualTo(""); + assertThat(newProject.moduleUuidPath()).isEmpty(); // SONAR-3636 : created_at must be fed when inserting a new entry in the 'projects' table assertThat(newProject.getCreatedAt()).isNotNull(); } finally { @@ -147,7 +147,7 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { assertThat(newProject.uuid()).isNotNull(); assertThat(newProject.projectUuid()).isEqualTo(newProject.uuid()); assertThat(newProject.moduleUuid()).isNull(); - assertThat(newProject.moduleUuidPath()).isEqualTo(""); + assertThat(newProject.moduleUuidPath()).isEmpty(); } finally { MyBatis.closeQuietly(session); } @@ -183,7 +183,7 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { assertThat(root.uuid()).isNotNull(); assertThat(root.projectUuid()).isEqualTo(root.uuid()); assertThat(root.moduleUuid()).isNull(); - assertThat(root.moduleUuidPath()).isEqualTo(""); + assertThat(root.moduleUuidPath()).isEmpty(); ComponentDto a = session.getMapper(ComponentMapper.class).selectByKey("a"); assertThat(a.uuid()).isNotNull(); assertThat(a.projectUuid()).isEqualTo(root.uuid()); @@ -262,7 +262,7 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { assertThat(root.uuid()).isNotNull(); assertThat(root.projectUuid()).isEqualTo(root.uuid()); assertThat(root.moduleUuid()).isNull(); - assertThat(root.moduleUuidPath()).isEqualTo(""); + assertThat(root.moduleUuidPath()).isEmpty(); ComponentDto a = session.getMapper(ComponentMapper.class).selectByKey("a"); System.out.println("A: " + a.uuid()); assertThat(a.uuid()).isNotNull(); @@ -355,7 +355,7 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { assertThat(newLib.uuid()).isNotNull(); assertThat(newLib.projectUuid()).isEqualTo(newLib.uuid()); assertThat(newLib.moduleUuid()).isNull(); - assertThat(newLib.moduleUuidPath()).isEqualTo(""); + assertThat(newLib.moduleUuidPath()).isEmpty(); } finally { MyBatis.closeQuietly(session); } -- cgit v1.2.3 From 099f5133ceec1648c5dc96420c8cd0676e48df68 Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Tue, 6 Jan 2015 11:39:50 +0100 Subject: SONAR-6022 Update dead links pointing to documentation --- README.md | 2 +- .../src/main/java/org/sonar/server/component/ws/EventsWs.java | 2 +- .../src/main/java/org/sonar/server/component/ws/ResourcesWs.java | 2 +- .../src/main/java/org/sonar/server/config/ws/PropertiesWs.java | 2 +- .../src/main/java/org/sonar/server/measure/ws/ManualMeasuresWs.java | 2 +- .../src/main/java/org/sonar/server/measure/ws/MetricsWs.java | 2 +- .../src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java | 2 +- .../src/main/java/org/sonar/server/user/ws/FavoritesWs.java | 2 +- .../src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java | 2 +- server/sonar-web/src/main/hbs/design/design.hbs | 2 +- .../src/main/webapp/WEB-INF/app/models/database_migration_manager.rb | 2 +- .../app/views/encryption_configuration/generate_secret_form.html.erb | 2 +- .../webapp/WEB-INF/app/views/encryption_configuration/index.html.erb | 2 +- .../src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb | 2 +- .../src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb | 2 +- .../src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb | 2 +- .../webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb | 4 ++-- sonar-application/src/main/assembly/conf/sonar.properties | 2 +- .../src/main/assembly/extensions/jdbc-driver/oracle/README.txt | 2 +- sonar-deprecated/src/main/java/org/sonar/api/batch/SquidUtils.java | 2 +- sonar-deprecated/src/main/java/org/sonar/api/resources/JavaFile.java | 2 +- .../src/main/java/org/sonar/api/resources/JavaPackage.java | 2 +- sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java | 4 ++-- sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java | 4 ++-- .../src/main/java/org/sonar/api/web/NavigationSection.java | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 951fdb35bef..e3ea1a7ef08 100644 --- a/README.md +++ b/README.md @@ -35,4 +35,4 @@ Licensed under the GNU Lesser General Public License, Version 3.0: http://www.gn [1]: http://www.sonarqube.org/ [2]: http://jira.codehaus.org/browse/SONAR - [3]: http://docs.codehaus.org/display/SONAR + [3]: http://docs.sonarqube.org/display/SONAR diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/EventsWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/EventsWs.java index 629112cada7..8f566aff6d2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/EventsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/EventsWs.java @@ -38,7 +38,7 @@ public class EventsWs implements WebService { private void defineIndexAction(NewController controller) { controller.createAction("index") - .setDescription("Documentation of this web service is available here") + .setDescription("Documentation of this web service is available here") .setSince("2.6") .setHandler(RailsHandler.INSTANCE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java index 428cb6cef3e..d69bb9344ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ResourcesWs.java @@ -50,7 +50,7 @@ public class ResourcesWs implements WebService { .setExampleValue("org.codehaus.sonar:sonar"); action.createParam("metrics") - .setDescription("Comma-separated list of metric keys/ids. " + + .setDescription("Comma-separated list of metric keys/ids. " + "Load measures on selected metrics. If only one metric is set, then measures are ordered by value") .setExampleValue("lines,blocker_violations"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/config/ws/PropertiesWs.java b/server/sonar-server/src/main/java/org/sonar/server/config/ws/PropertiesWs.java index b90b1e18fb7..40d8a4f3201 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/config/ws/PropertiesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/config/ws/PropertiesWs.java @@ -38,7 +38,7 @@ public class PropertiesWs implements WebService { private void defineIndexAction(NewController controller) { controller.createAction("index") - .setDescription("Documentation of this web service is available here") + .setDescription("Documentation of this web service is available here") .setSince("2.6") .setHandler(RailsHandler.INSTANCE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ManualMeasuresWs.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ManualMeasuresWs.java index 66337c24d3a..d585104d646 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ManualMeasuresWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ManualMeasuresWs.java @@ -38,7 +38,7 @@ public class ManualMeasuresWs implements WebService { private void defineIndexAction(NewController controller) { controller.createAction("index") - .setDescription("Documentation of this web service is available here") + .setDescription("Documentation of this web service is available here") .setSince("2.10") .setHandler(RailsHandler.INSTANCE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java index 897d7c6f9f3..ed34355709b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java @@ -38,7 +38,7 @@ public class MetricsWs implements WebService { private void defineIndexAction(NewController controller) { controller.createAction("index") - .setDescription("Documentation of this web service is available here") + .setDescription("Documentation of this web service is available here") .setSince("2.6") .setHandler(RailsHandler.INSTANCE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java index 94f8f819a47..5bfd2bbbc6d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/TimeMachineWs.java @@ -50,7 +50,7 @@ public class TimeMachineWs implements WebService { .setExampleValue("org.codehaus.sonar:sonar"); action.createParam("metrics") - .setDescription("Comma-separated list of metric keys/ids") + .setDescription("Comma-separated list of metric keys/ids") .setRequired(true) .setExampleValue("coverage,violations"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java index 63e1036d563..52c3c89639f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/FavoritesWs.java @@ -38,7 +38,7 @@ public class FavoritesWs implements WebService { private void defineIndexAction(NewController controller) { controller.createAction("index") - .setDescription("Documentation of this web service is available here") + .setDescription("Documentation of this web service is available here") .setSince("2.6") .setHandler(RailsHandler.INSTANCE); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java index a05a9d2a752..f4db43de3e9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserPropertiesWs.java @@ -38,7 +38,7 @@ public class UserPropertiesWs implements WebService { private void defineIndexAction(NewController controller) { controller.createAction("index") - .setDescription("Documentation of this web service is available here") + .setDescription("Documentation of this web service is available here") .setSince("2.6") .setHandler(RailsHandler.INSTANCE); } diff --git a/server/sonar-web/src/main/hbs/design/design.hbs b/server/sonar-web/src/main/hbs/design/design.hbs index b81223774e7..e4b7a8b3033 100644 --- a/server/sonar-web/src/main/hbs/design/design.hbs +++ b/server/sonar-web/src/main/hbs/design/design.hbs @@ -1,5 +1,5 @@
- {{t 'design.help'}} + {{t 'design.help'}}