From 31a65f34968937d01a7e6c64a117409f150b5c0f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 8 Oct 2014 11:52:59 +0200 Subject: [PATCH] Fix quality flaws --- .../server/activity/ws/ActivityMapping.java | 4 +-- .../index/ResourceNotIndexedException.java | 33 ------------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 sonar-batch/src/main/java/org/sonar/batch/index/ResourceNotIndexedException.java 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 { - 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/sonar-batch/src/main/java/org/sonar/batch/index/ResourceNotIndexedException.java b/sonar-batch/src/main/java/org/sonar/batch/index/ResourceNotIndexedException.java deleted file mode 100644 index 16b5ee32a90..00000000000 --- a/sonar-batch/src/main/java/org/sonar/batch/index/ResourceNotIndexedException.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.batch.index; - -import org.sonar.api.resources.Resource; -import org.sonar.api.utils.SonarException; - -/** - * @since 2.6 - */ -public class ResourceNotIndexedException extends SonarException { - - public ResourceNotIndexedException(final Resource reference) { - super(reference.toString()); - } -} -- 2.39.5