From 7d5701e0a327448484ccee968e12ae3d9162d407 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 12 May 2015 10:42:31 +0200 Subject: [PATCH] Useless code --- .../org/sonar/xoo/scm/XooBlameCommand.java | 2 +- .../sonar/process/monitor/JavaCommand.java | 8 +- .../process/monitor/JavaProcessLauncher.java | 2 +- .../org/sonar/process/monitor/Monitor.java | 4 +- .../java/org/sonar/process/Encryption.java | 2 +- .../sonar/process/MinimumViableSystem.java | 2 +- .../org/sonar/search/script/ListUpdate.java | 4 +- .../search/script/UpdateListScriptTest.java | 16 +-- .../java/org/sonar/server/db/BaseDao.java | 10 +- .../server/db/migrations/SelectImpl.java | 2 +- .../db/migrations/v36/Referentials.java | 2 +- .../db/migrations/v50/FileSourceDto.java | 4 +- .../java/org/sonar/server/es/NewIndex.java | 6 +- .../server/issue/IssueBulkChangeQuery.java | 2 +- .../org/sonar/server/issue/IssueService.java | 2 +- .../java/org/sonar/server/issue/Result.java | 2 +- .../qualityprofile/QProfileExporters.java | 4 +- .../server/qualityprofile/QProfileLoader.java | 2 +- .../qualityprofile/QProfileService.java | 2 +- .../qualityprofile/index/ActiveRuleDoc.java | 2 +- .../qualityprofile/index/ActiveRuleIndex.java | 14 +-- .../index/ActiveRuleNormalizer.java | 6 +- .../ws/QProfileChangelogAction.java | 2 +- .../org/sonar/server/rule/RegisterRules.java | 6 +- .../org/sonar/server/rule/index/RuleDoc.java | 2 +- .../sonar/server/rule/index/RuleIndex.java | 16 +-- .../server/rule/index/RuleNormalizer.java | 6 +- .../org/sonar/server/search/BaseIndex.java | 16 +-- .../sonar/server/search/BaseNormalizer.java | 2 +- .../java/org/sonar/server/search/Facets.java | 2 +- .../org/sonar/server/search/IndexClient.java | 2 +- .../org/sonar/server/search/IndexQueue.java | 4 +- .../java/org/sonar/server/search/Result.java | 2 +- .../sonar/server/search/action/DeleteKey.java | 2 +- .../search/action/DeleteNestedItem.java | 2 +- .../sonar/server/search/action/InsertDto.java | 2 +- .../search/action/UpsertNestedItem.java | 2 +- .../sonar/server/source/CharactersReader.java | 2 +- .../charts/deprecated/BarChartTest.java | 6 +- .../charts/deprecated/CustomBarChartTest.java | 4 +- .../charts/deprecated/PieChartTest.java | 2 +- .../deprecated/SparkLinesChartTest.java | 2 +- .../db/migrations/BaseDataChangeTest.java | 10 +- .../ProxyPutMappingRequestBuilderTest.java | 2 +- .../rule/index/RuleIndexMediumTest.java | 2 +- .../server/search/action/DeleteKeyTest.java | 2 +- .../java/org/sonar/wsclient/SonarClient.java | 2 +- .../wsclient/internal/EncodingUtils.java | 2 +- .../sonar/wsclient/issue/ActionPlanQuery.java | 2 +- .../sonar/wsclient/issue/BulkChangeQuery.java | 2 +- .../org/sonar/wsclient/issue/IssueQuery.java | 2 +- .../sonar/wsclient/issue/NewActionPlan.java | 2 +- .../org/sonar/wsclient/issue/NewIssue.java | 2 +- .../wsclient/issue/UpdateActionPlan.java | 2 +- .../internal/DefaultActionPlanClient.java | 2 +- .../issue/internal/DefaultBulkChange.java | 2 +- .../wsclient/issue/internal/DefaultIssue.java | 2 +- .../issue/internal/DefaultIssueChange.java | 2 +- .../issue/internal/DefaultIssues.java | 14 +-- .../issue/internal/IssueJsonParser.java | 6 +- .../permissions/PermissionParameters.java | 2 +- .../sonar/wsclient/project/NewProject.java | 2 +- .../internal/DefaultQProfileResult.java | 4 +- .../wsclient/qualitygate/NewCondition.java | 2 +- .../wsclient/qualitygate/UpdateCondition.java | 2 +- .../internal/DefaultQualityGateClient.java | 6 +- .../internal/DefaultQualityGates.java | 2 +- .../org/sonar/wsclient/services/Measure.java | 2 +- .../org/sonar/wsclient/services/Profile.java | 4 +- .../org/sonar/wsclient/services/Source.java | 2 +- .../unmarshallers/AbstractUnmarshaller.java | 2 +- .../ResourceSearchUnmarshaller.java | 2 +- .../unmarshallers/ResourceUnmarshaller.java | 2 +- .../sonar/wsclient/user/UserParameters.java | 2 +- .../org/sonar/wsclient/user/UserQuery.java | 2 +- .../user/internal/DefaultUserClient.java | 4 +- .../org/sonar/application/JdbcSettings.java | 2 +- .../batch/protocol/output/BatchReport.java | 114 ++++++++---------- .../sonar/server/source/db/FileSourceDb.java | 26 ++-- .../server/source/db/FileSourceTestDb.java | 20 ++- .../batch/protocol/input/ActiveRule.java | 2 +- .../protocol/input/GlobalRepositories.java | 4 +- .../protocol/input/ProjectRepositories.java | 8 +- .../bootstrap/BatchExtensionDictionnary.java | 4 +- .../batch/bootstrap/JdbcLeakPrevention.java | 4 +- .../org/sonar/batch/debt/DebtDecorator.java | 4 +- .../decorator/DecoratorsSelector.java | 2 +- .../batch/design/DirectoryDsmDecorator.java | 4 +- .../org/sonar/batch/design/DsmDecorator.java | 4 +- .../batch/design/MavenDependenciesSensor.java | 2 +- .../batch/design/ProjectDsmDecorator.java | 2 +- .../batch/design/SubProjectDsmDecorator.java | 4 +- .../org/sonar/batch/index/BatchResource.java | 2 +- .../java/org/sonar/batch/index/Cache.java | 16 +-- .../java/org/sonar/batch/index/Caches.java | 2 +- .../org/sonar/batch/index/DefaultIndex.java | 6 +- .../batch/index/ResourceKeyMigration.java | 8 +- .../batch/mediumtest/BatchMediumTester.java | 2 +- .../sonar/batch/mediumtest/TaskResult.java | 2 +- .../batch/phases/PhasesTimeProfiler.java | 2 +- .../profiling/AbstractTimeProfiling.java | 4 +- .../batch/profiling/ModuleProfiling.java | 4 +- .../sonar/batch/profiling/PhaseProfiling.java | 2 +- .../profiling/PhasesSumUpTimeProfiler.java | 4 +- .../language/DefaultLanguagesRepository.java | 2 +- .../sonar/batch/rule/RulesProfileWrapper.java | 6 +- .../org/sonar/batch/rule/UsedQProfiles.java | 2 +- .../batch/scan/ProjectReactorBuilder.java | 10 +- .../batch/scan/ProjectReactorValidator.java | 2 +- .../filesystem/DefaultModuleFileSystem.java | 2 +- .../batch/scan/filesystem/FileIndexer.java | 2 +- .../sonar/batch/scan/report/IssuesReport.java | 4 +- .../sonar/batch/scan/report/JSONReport.java | 2 +- .../batch/scan/report/ReportSummary.java | 2 +- .../batch/scan/report/ResourceReport.java | 4 +- .../batch/scan/report/SourceProvider.java | 2 +- .../sonar/batch/scm/DefaultBlameOutput.java | 2 +- .../org/sonar/batch/scm/ScmConfiguration.java | 2 +- .../java/org/sonar/batch/scm/ScmSensor.java | 2 +- .../sonar/batch/source/CodeColorizers.java | 2 +- .../batch/source/DefaultSymbolTable.java | 6 +- .../batch/source/HighlightingRenderer.java | 2 +- .../design/DirectoryDsmDecoratorTest.java | 2 +- .../sonar/batch/design/DsmSerializerTest.java | 6 +- .../batch/scan/ProjectReactorBuilderTest.java | 18 +-- .../org/sonar/colorizer/HtmlRenderer.java | 2 +- .../sonar/colorizer/KeywordsTokenizer.java | 2 +- .../sonar/colorizer/CodeColorizerTest.java | 2 +- .../org/sonar/core/component/ScanGraph.java | 2 +- .../java/org/sonar/core/graph/BeanVertex.java | 4 +- .../core/graph/graphson/GraphsonUtil.java | 4 +- .../core/permission/PermissionFacade.java | 2 +- .../org/sonar/core/persistence/DbSession.java | 2 +- .../java/org/sonar/core/purge/PurgeDao.java | 2 +- .../org/sonar/core/purge/PurgeProfiler.java | 6 +- .../qualityprofile/db/ActiveRuleParamDto.java | 2 +- .../org/sonar/core/rule/CacheRuleFinder.java | 2 +- .../java/org/sonar/core/rule/RuleDto.java | 4 +- .../java/org/sonar/jpa/dao/MeasuresDao.java | 2 +- .../sonar/jpa/session/JpaDatabaseSession.java | 2 +- .../ThreadLocalDatabaseSessionFactory.java | 2 +- .../graph/graphson/GraphsonReaderTest.java | 4 +- .../core/graph/graphson/GraphsonUtilTest.java | 36 +++--- .../org/sonar/api/charts/ChartParameters.java | 2 +- .../org/sonar/api/rules/XMLRuleParser.java | 2 +- .../sonar/api/checks/NoSonarFilterTest.java | 4 +- .../net/sourceforge/pmd/cpd/SourceCode.java | 4 +- .../net/sourceforge/pmd/cpd/TokenEntry.java | 2 +- .../detector/suffixtree/AbstractText.java | 2 +- .../detector/suffixtree/Node.java | 2 +- .../sonar/duplications/index/CloneGroup.java | 2 +- .../statement/StatementChannel.java | 2 +- .../statement/StatementChunker.java | 4 +- .../statement/matcher/UptoTokenMatcher.java | 2 +- .../sonar/duplications/token/TokenQueue.java | 4 +- .../detector/suffixtree/StringSuffixTree.java | 2 +- .../duplications/token/TokenQueueTest.java | 4 +- .../java/org/sonar/graph/CycleDetector.java | 10 +- .../java/org/sonar/graph/DirectedGraph.java | 16 +-- .../java/org/sonar/graph/DsmManualSorter.java | 2 +- .../main/java/org/sonar/graph/DsmScanner.java | 4 +- .../org/sonar/graph/DsmTopologicalSorter.java | 2 +- .../java/org/sonar/graph/FeedbackCycle.java | 4 +- .../graph/IncrementalCyclesAndFESSolver.java | 6 +- .../graph/MinimumFeedbackEdgeSetSolver.java | 8 +- .../org/sonar/graph/CycleDetectorTest.java | 24 ++-- .../org/sonar/graph/DsmManualSorterTest.java | 2 +- .../java/org/sonar/graph/DsmPrinterTest.java | 2 +- .../sonar/graph/DsmTopologicalSorterTest.java | 4 +- .../org/sonar/graph/FeedbackCycleTest.java | 2 +- .../IncrementalCyclesAndFESSolverTest.java | 6 +- .../MinimumFeedbackEdgeSetSolverTest.java | 10 +- .../batch/bootstrap/ProjectDefinition.java | 2 +- .../fs/internal/DefaultFilePredicates.java | 4 +- .../batch/fs/internal/DefaultFileSystem.java | 8 +- .../api/batch/fs/internal/FileMetadata.java | 2 +- .../sonar/api/batch/rule/CheckFactory.java | 2 +- .../rule/internal/DefaultActiveRules.java | 4 +- .../batch/rule/internal/NewActiveRule.java | 2 +- .../api/batch/rule/internal/NewRule.java | 2 +- .../api/batch/rule/internal/RulesBuilder.java | 2 +- .../internal/DefaultDuplication.java | 2 +- .../sensor/internal/SensorContextTester.java | 2 +- .../sonar/api/config/PropertyDefinitions.java | 8 +- .../sonar/api/measures/MeasuresFilters.java | 4 +- .../java/org/sonar/api/measures/Metric.java | 2 +- .../sonar/api/measures/PropertiesBuilder.java | 6 +- .../measures/RangeDistributionBuilder.java | 2 +- .../sonar/api/profiles/XMLProfileParser.java | 2 +- .../org/sonar/api/resources/Languages.java | 2 +- .../java/org/sonar/api/resources/Project.java | 2 +- .../java/org/sonar/api/rules/ActiveRule.java | 2 +- .../main/java/org/sonar/api/rules/Rule.java | 2 +- .../server/rule/RulesDefinitionXmlLoader.java | 4 +- .../sonar/api/utils/LocalizedMessages.java | 4 +- .../org/sonar/api/utils/ManifestUtils.java | 2 +- .../sonar/api/utils/ValidationMessages.java | 6 +- .../org/sonar/api/utils/WildcardPattern.java | 2 +- .../java/org/sonar/api/utils/XpathParser.java | 4 +- .../api/utils/dag/DirectAcyclicGraph.java | 4 +- .../java/org/sonar/api/utils/dag/Node.java | 2 +- .../api/measures/PropertiesBuilderTest.java | 8 +- .../org/sonar/api/user/UserQueryTest.java | 2 +- 203 files changed, 466 insertions(+), 486 deletions(-) diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java index b78deb2812c..0d1c978e0de 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java @@ -54,7 +54,7 @@ public class XooBlameCommand extends BlameCommand { try { List lines = FileUtils.readLines(scmDataFile, Charsets.UTF_8.name()); - List blame = new ArrayList(lines.size()); + List blame = new ArrayList<>(lines.size()); int lineNumber = 0; for (String line : lines) { lineNumber++; 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 d4b774cb851..baeb769d337 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 @@ -39,18 +39,18 @@ public class JavaCommand { private File workDir; // for example -Xmx1G - private final List javaOptions = new ArrayList(); + private final List javaOptions = new ArrayList<>(); // entry point private String className; // relative path to JAR files - private final List classpath = new ArrayList(); + private final List classpath = new ArrayList<>(); // program arguments (parameters of main(String[]) - private final Map arguments = new LinkedHashMap(); + private final Map arguments = new LinkedHashMap<>(); - private final Map envVariables = new HashMap(System.getenv()); + private final Map envVariables = new HashMap<>(System.getenv()); private File tempDir = null; diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaProcessLauncher.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaProcessLauncher.java index dd67a10489d..1e3ee06648e 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaProcessLauncher.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/JavaProcessLauncher.java @@ -64,7 +64,7 @@ public class JavaProcessLauncher { } private ProcessBuilder create(JavaCommand javaCommand) { - List commands = new ArrayList(); + List commands = new ArrayList<>(); commands.add(buildJavaPath()); commands.addAll(javaCommand.getJavaOptions()); // TODO warning - does it work if temp dir contains a whitespace ? diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java index fd546b9df5d..df3d53518ee 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java @@ -30,7 +30,7 @@ import java.util.concurrent.CopyOnWriteArrayList; public class Monitor { - private final List processes = new CopyOnWriteArrayList(); + private final List processes = new CopyOnWriteArrayList<>(); private final TerminatorThread terminator; private final JavaProcessLauncher launcher; private final Lifecycle lifecycle = new Lifecycle(); @@ -39,7 +39,7 @@ public class Monitor { private Thread shutdownHook = new Thread(new MonitorShutdownHook(), "Monitor Shutdown Hook"); // used by awaitStop() to block until all processes are shutdown - private final List watcherThreads = new CopyOnWriteArrayList(); + private final List watcherThreads = new CopyOnWriteArrayList<>(); static int nextProcessId = 0; Monitor(JavaProcessLauncher launcher, SystemExit exit, TerminatorThread terminator) { diff --git a/server/sonar-process/src/main/java/org/sonar/process/Encryption.java b/server/sonar-process/src/main/java/org/sonar/process/Encryption.java index cca05e6c780..fe9d66ec08f 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/Encryption.java +++ b/server/sonar-process/src/main/java/org/sonar/process/Encryption.java @@ -37,7 +37,7 @@ public final class Encryption { private static final String AES_ALGORITHM = "aes"; private final AesCipher aesCipher; - private final Map ciphers = new HashMap(); + private final Map ciphers = new HashMap<>(); private static final Pattern ENCRYPTED_PATTERN = Pattern.compile("\\{(.*?)\\}(.*)"); public Encryption(@Nullable String pathToSecretKey) { diff --git a/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java b/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java index 2389fa5aa18..fdbc7217611 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java +++ b/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java @@ -29,7 +29,7 @@ import java.util.Map; public class MinimumViableSystem { - private final Map requiredJavaOptions = new HashMap(); + private final Map requiredJavaOptions = new HashMap<>(); public MinimumViableSystem setRequiredJavaOption(String propertyKey, String expectedValue) { requiredJavaOptions.put(propertyKey, expectedValue); diff --git a/server/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java b/server/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java index 587825f60f5..d93ae29b515 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java +++ b/server/sonar-search/src/main/java/org/sonar/search/script/ListUpdate.java @@ -99,7 +99,7 @@ public class ListUpdate extends AbstractExecutableScript { if (fieldValue == null && value != null) { // 0. The field does not exist (this is a upsert then) - List values = new ArrayList(1); + List values = new ArrayList<>(1); values.add(value); source.put(field, values); } else if (!XContentMapValues.isArray(fieldValue) && value != null) { @@ -108,7 +108,7 @@ public class ListUpdate extends AbstractExecutableScript { if (XContentMapValues.nodeStringValue(currentFieldValue.get(idField), null).equals(idValue)) { source.put(field, value); } else { - List values = new ArrayList(2); + List values = new ArrayList<>(2); values.add(fieldValue); values.add(value); source.put(field, values); diff --git a/server/sonar-search/src/test/java/org/sonar/search/script/UpdateListScriptTest.java b/server/sonar-search/src/test/java/org/sonar/search/script/UpdateListScriptTest.java index 06c2c355c73..360f8a4d021 100644 --- a/server/sonar-search/src/test/java/org/sonar/search/script/UpdateListScriptTest.java +++ b/server/sonar-search/src/test/java/org/sonar/search/script/UpdateListScriptTest.java @@ -43,7 +43,7 @@ public class UpdateListScriptTest { @Test public void fail_missing_attributes_field() { - Map params = new HashMap(); + Map params = new HashMap<>(); // Missing everything try { @@ -105,11 +105,11 @@ public class UpdateListScriptTest { String listField = "listField"; Collection> mapFields; - Map source = new HashMap(); + Map source = new HashMap<>(); source.put("field1", "value1"); // 0 Create list when field does not exists - Map params = new HashMap(); + Map params = new HashMap<>(); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key"); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1"); @@ -124,7 +124,7 @@ public class UpdateListScriptTest { assertThat(mapFields).hasSize(1); // Add item to existing list - params = new HashMap(); + params = new HashMap<>(); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key"); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "2"); @@ -136,7 +136,7 @@ public class UpdateListScriptTest { assertThat(mapFields).hasSize(2); // updated first item in list - params = new HashMap(); + params = new HashMap<>(); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key"); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1"); @@ -148,7 +148,7 @@ public class UpdateListScriptTest { assertThat(mapFields).hasSize(2); // updated second item in list - params = new HashMap(); + params = new HashMap<>(); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key"); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "2"); @@ -160,7 +160,7 @@ public class UpdateListScriptTest { assertThat(mapFields).hasSize(2); // delete first item - params = new HashMap(); + params = new HashMap<>(); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_FIELD, listField); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_FIELD, "key"); params.put(ProcessProperties.ES_PLUGIN_LISTUPDATE_ID_VALUE, "1"); @@ -173,7 +173,7 @@ public class UpdateListScriptTest { } private Map mapOf(String k, String v, String k1, String v1) { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(k, v); map.put(k1, v1); return map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java index 1fe29ad23c4..e0875201856 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java @@ -251,7 +251,7 @@ public abstract class BaseDao, KEY extends Serializ try { doInsert(session, item); if (hasIndex()) { - session.enqueue(new UpsertDto(getIndexType(), item)); + session.enqueue(new UpsertDto<>(getIndexType(), item)); } } catch (Exception e) { throw new IllegalStateException("Fail to insert item in db: " + item, e); @@ -281,7 +281,7 @@ public abstract class BaseDao, KEY extends Serializ try { doDeleteByKey(session, key); if (hasIndex()) { - session.enqueue(new DeleteKey(getIndexType(), key)); + session.enqueue(new DeleteKey<>(getIndexType(), key)); } } catch (Exception e) { throw new IllegalStateException("Fail to delete item from db: " + key, e); @@ -290,14 +290,14 @@ public abstract class BaseDao, KEY extends Serializ protected final void enqueueUpdate(Object nestedItem, KEY key, DbSession session) { if (hasIndex()) { - session.enqueue(new UpsertNestedItem( + session.enqueue(new UpsertNestedItem<>( this.getIndexType(), key, nestedItem)); } } public void enqueueDelete(Object nestedItem, KEY key, DbSession session) { if (hasIndex()) { - session.enqueue(new DeleteNestedItem( + session.enqueue(new DeleteNestedItem<>( this.getIndexType(), key, nestedItem)); session.commit(); } @@ -329,7 +329,7 @@ public abstract class BaseDao, KEY extends Serializ public void handleResult(ResultContext resultContext) { DTO dto = (DTO) resultContext.getResultObject(); // session.enqueue(new UpsertDto(getIndexType(), dto, false)); - getSession().enqueue(new InsertDto(getIndexType(), dto, false)); + getSession().enqueue(new InsertDto<>(getIndexType(), dto, false)); count++; if (count % 100000 == 0) { LOGGER.info("Synchronized {} {}", count, getIndexType()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java index a433b473e4a..62ad570ded6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/SelectImpl.java @@ -40,7 +40,7 @@ class SelectImpl extends BaseSqlStatement