Drop dead code

diff --git a/sonar-batch/src/main/java/org/sonar/batch/ResourceDatabaseConfiguration.java b/sonar-batch/src/main/java/org/sonar/batch/ResourceDatabaseConfiguration.java
deleted file mode 100644 (file)
index 842b2fb..0000000
--- a/sonar-batch/src/main/java/org/sonar/batch/ResourceDatabaseConfiguration.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 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;
-
-import org.apache.commons.configuration.BaseConfiguration;
-
-import org.sonar.api.database.DatabaseSession;
-import org.sonar.api.database.configuration.Property;
-import org.sonar.api.database.model.ResourceModel;
-
-import java.util.List;
-
-/**
- * @deprecated in 3.7. Replaced by {@link org.sonar.api.config.Settings}
- */
-@Deprecated
-public class ResourceDatabaseConfiguration extends BaseConfiguration {
-  private final DatabaseSession session;
-  private Integer resourceId = null;
-
-  public ResourceDatabaseConfiguration(DatabaseSession session, ResourceModel resource) {
-    this.session = session;
-    if (resource != null) {
-      this.resourceId = resource.getId();
-    }
-    load();
-  }
-
-  public ResourceDatabaseConfiguration(DatabaseSession session, Integer resourceId) {
-    this.session = session;
-    this.resourceId = resourceId;
-    load();
-  }
-
-  public ResourceDatabaseConfiguration(DatabaseSession session, String resourceKey) {
-    this.session = session;
-
-    ResourceModel resource = session.getSingleResult(ResourceModel.class, "key", resourceKey);
-    if (resource != null) {
-      this.resourceId = resource.getId();
-    }
-    load();
-  }
-
-  public void load() {
-    clear();
-
-    loadResourceProperties();
-  }
-
-  private void loadResourceProperties() {
-    if (resourceId != null) {
-      List<Property> properties = session
-        .createQuery("from " + Property.class.getSimpleName() + " p where p.resourceId=:resourceId")
-        .setParameter("resourceId", resourceId)
-        .getResultList();
-
-      registerProperties(properties);
-    }
-  }
-
-  private void registerProperties(List<Property> properties) {
-    if (properties != null) {
-      for (Property property : properties) {
-        setProperty(property.getKey(), property.getValue());
-      }
-    }
-  }
-
-}

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java b/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java
index 414363748b6a0beffcac3f147fa3dab6d451a4e9..d90aa39929800758a08ad2f216e7e6c18cdeb8fa 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DefaultDatabase.java
@@ -162,7 +162,7 @@ public class DefaultDatabase implements Database {
       props.put(StringUtils.removeStart(hibernateKey, "sonar."), settings.getString(hibernateKey));
     }
     props.put(Environment.DIALECT, getDialect().getHibernateDialectClass().getName());
-    props.put("hibernate.generate_statistics", settings.getBoolean(DatabaseProperties.PROP_HIBERNATE_GENERATE_STATISTICS));
+    props.put("hibernate.generate_statistics", "false");
     props.put("hibernate.hbm2ddl.auto", VALIDATE);
     props.put(Environment.CONNECTION_PROVIDER, CustomHibernateConnectionProvider.class.getName());
 
@@ -210,7 +210,7 @@ public class DefaultDatabase implements Database {
     completeDefaultProperty(props, DatabaseProperties.PROP_URL, DEFAULT_URL);
     completeDefaultProperty(props, DatabaseProperties.PROP_USER, props.getProperty(DatabaseProperties.PROP_USER_DEPRECATED, DatabaseProperties.PROP_USER_DEFAULT_VALUE));
     completeDefaultProperty(props, DatabaseProperties.PROP_PASSWORD, DatabaseProperties.PROP_PASSWORD_DEFAULT_VALUE);
-    completeDefaultProperty(props, DatabaseProperties.PROP_HIBERNATE_HBM2DLL, VALIDATE);
+    completeDefaultProperty(props, "sonar.jdbc.hibernate.hbm2ddl", VALIDATE);
   }
 
   private static void completeDefaultProperty(Properties props, String key, String defaultValue) {

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java
index 05adcabfaeadc93cfd84d50e7ba0b9784f3ad9d2..399ec9ffe1b340cbc09f0d457a211bc9b9191199 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/DatabaseProperties.java
@@ -31,8 +31,6 @@ public interface DatabaseProperties {
   String PROP_USER_DEFAULT_VALUE = "sonar";
   String PROP_PASSWORD = "sonar.jdbc.password";
   String PROP_PASSWORD_DEFAULT_VALUE = "sonar";
-  String PROP_HIBERNATE_HBM2DLL = "sonar.jdbc.hibernate.hbm2ddl";
-  String PROP_HIBERNATE_GENERATE_STATISTICS = "sonar.jdbc.hibernate.generate_statistics";
   String PROP_DIALECT = "sonar.jdbc.dialect";
 
   /**