Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
	sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java

9 files changed, 29 insertions, 15 deletions

diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaCommand.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaCommand.java
index 7750b6deb35..76abf52deba 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaCommand.java
+++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaCommand.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.process.monitor;
 
+import org.apache.commons.lang.StringUtils;
+
 import javax.annotation.Nullable;
 
 import java.io.File;
@@ -84,12 +86,16 @@ public class JavaCommand {
   }
 
   public JavaCommand addJavaOption(String s) {
-    javaOptions.add(s);
+    if (StringUtils.isNotBlank(s)) {
+      javaOptions.add(s);
+    }
     return this;
   }
 
   public JavaCommand addJavaOptions(String s) {
-    Collections.addAll(javaOptions, s.split(" "));
+    for (String opt : s.split(" ")) {
+      addJavaOption(opt);
+    }
     return this;
   }
 
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/JavaCommandTest.java b/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/JavaCommandTest.java
index fbfbad11b54..689f061ff06 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/JavaCommandTest.java
+++ b/server/sonar-process-monitor/src/test/java/org/sonar/process/monitor/JavaCommandTest.java
@@ -65,8 +65,13 @@ public class JavaCommandTest {
   }
 
   @Test
-  public void split_java_options() throws Exception {
+  public void add_java_options() throws Exception {
     JavaCommand command = new JavaCommand("foo");
+    assertThat(command.getJavaOptions()).isEmpty();
+
+    command.addJavaOptions("");
+    assertThat(command.getJavaOptions()).isEmpty();
+
     command.addJavaOptions("-Xmx512m -Xms256m -Dfoo");
     assertThat(command.getJavaOptions()).containsOnly("-Xmx512m", "-Xms256m", "-Dfoo");
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java b/server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java
index e2910b6c4ea..668b072dad9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/activity/ws/ActivityMapping.java
@@ -19,14 +19,12 @@
  */
 package org.sonar.server.activity.ws;
 
-import org.sonar.api.resources.Languages;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.activity.Activity;
 import org.sonar.server.activity.index.ActivityDoc;
 import org.sonar.server.activity.index.ActivityNormalizer;
 import org.sonar.server.search.ws.BaseMapping;
 import org.sonar.server.search.ws.SearchOptions;
-import org.sonar.server.text.MacroInterpreter;
 
 import java.util.Map;
 
@@ -35,7 +33,7 @@ import java.util.Map;
  */
 public class ActivityMapping extends BaseMapping<ActivityDoc, Object> {
 
-  public ActivityMapping(Languages languages, MacroInterpreter macroInterpreter) {
+  public ActivityMapping() {
     map("type", ActivityNormalizer.LogFields.TYPE.field());
     map("action", ActivityNormalizer.LogFields.ACTION.field());
     mapDateTime("createdAt", ActivityNormalizer.LogFields.CREATED_AT.field());
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index 968c9b46448..c008bd971d0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@ -56,7 +56,6 @@ import org.sonar.server.search.Result;
 import org.sonar.server.search.SearchClient;
 
 import javax.annotation.CheckForNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -158,7 +157,7 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
   }
 
   /* Build main query (search based) */
-  protected QueryBuilder getQuery(RuleQuery query, QueryContext options) {
+  protected QueryBuilder getQuery(RuleQuery query) {
 
     // No contextual query case
     String queryText = query.getQueryText();
@@ -413,7 +412,7 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
       esSearch.setScroll(TimeValue.timeValueMinutes(3));
     }
 
-    QueryBuilder qb = this.getQuery(query, options);
+    QueryBuilder qb = this.getQuery(query);
     HashMap<String, FilterBuilder> filters = this.getFilters(query, options);
 
     if (options.isFacet()) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java b/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
index 5cf1ba3dc72..de1234cd280 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
@@ -99,7 +99,7 @@ public class SearchClient extends TransportClient implements Startable {
       }
       return response;
     } catch (Exception e) {
-      LOGGER.error("could not execute request: " + response, e);
+      LOGGER.error("could not execute request: {}", request);
       throw new IllegalStateException("ES error: ", e);
     }
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java
index 0fbabca058e..cc96395bc62 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java
@@ -22,7 +22,9 @@ package org.sonar.server.startup;
 import org.apache.commons.io.FileUtils;
 import org.hamcrest.core.Is;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.sonar.api.platform.PluginMetadata;
 import org.sonar.api.platform.PluginRepository;
 import org.sonar.core.plugins.DefaultPluginMetadata;
@@ -40,6 +42,9 @@ import static org.mockito.Mockito.when;
 
 public class GeneratePluginIndexTest {
 
+  @Rule
+  public TemporaryFolder temp = new TemporaryFolder();
+
   private DefaultServerFileSystem fileSystem;
   private File index;
 
@@ -65,10 +70,11 @@ public class GeneratePluginIndexTest {
     assertThat(lines.get(1), containsString("checkstyle"));
   }
 
-  private PluginMetadata newMetadata(String pluginKey) {
+  private PluginMetadata newMetadata(String pluginKey) throws IOException {
     PluginMetadata plugin = mock(DefaultPluginMetadata.class);
     when(plugin.getKey()).thenReturn(pluginKey);
-    when(plugin.getFile()).thenReturn(new File(pluginKey + ".jar"));
+    File pluginFile = temp.newFile(pluginKey + ".jar");
+    when(plugin.getFile()).thenReturn(pluginFile);
     return plugin;
   }
 }
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
index 67776649b39..16ba0bb7925 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
@@ -152,7 +152,7 @@ define [
         @$(@qualityProfilesRegion.el).show()
         @qualityProfilesRegion.show @qualityProfilesView
 
-        if @options.app.getQualityProfile()
+        if @options.app.getQualityProfile() and (@options.app.canWrite or @contextProfile.has('severity'))
           @$(@contextRegion.el).show()
           @contextRegion.show @contextQualityProfileView
         else
diff --git a/server/sonar-web/src/main/coffee/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/component-viewer/main.coffee
index 15e2a13d138..e6da45caa2f 100644
--- a/server/sonar-web/src/main/coffee/component-viewer/main.coffee
+++ b/server/sonar-web/src/main/coffee/component-viewer/main.coffee
@@ -131,7 +131,7 @@ define [
 
       width = @elementToFit.width()
       height = @elementToFit.height()
-      availableWidth = width - workspace.outerWidth(true)
+      availableWidth = width - workspace.outerWidth(true) - 20
       availableHeight = height - @$(@headerRegion.$el).outerHeight(true)
 
       source.removeClass 'overflow'
diff --git a/server/sonar-web/src/main/js/issues/app.js b/server/sonar-web/src/main/js/issues/app.js
index 43411efffb2..861636f8089 100644
--- a/server/sonar-web/src/main/js/issues/app.js
+++ b/server/sonar-web/src/main/js/issues/app.js
@@ -371,7 +371,7 @@ requirejs(
 
           var detailsEl = jQuery('.navigator-details'),
               detailsWidth = jQuery(window).width() - detailsEl.offset().left -
-                  parseInt(detailsEl.css('margin-right'), 10),
+                  parseInt(detailsEl.css('margin-right'), 10) - 20,
               detailsHeight = jQuery(window).height() - detailsEl.offset().top -
                   parseInt(detailsEl.css('margin-bottom'), 10) - footerHeight;
           detailsEl.width(detailsWidth).height(detailsHeight);