SONAR-5007 - Reverted final modifier for base method because of legacy @Mock

diff --git a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
index f14365889f8c2eafc6560000155d4745b4f05cef..10cedfdfcc363dbbeb1cd468dffc1788f6dd79b1 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
@@ -146,7 +146,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
     return doGetNullableByKey(session, key);
   }
 
-  public final E getByKey(DbSession session, K key) {
+  public E getByKey(DbSession session, K key) {
     E value = doGetNullableByKey(session, key);
     if (value == null) {
       throw new NotFoundException(String.format("Key '%s' not found", key));
@@ -155,14 +155,14 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final E update(DbSession session, E item) {
+  public E update(DbSession session, E item) {
     Date now = new Date(system2.now());
     update(session, item, now);
     return item;
   }
 
   @Override
-  public final E update(DbSession session, E item, E... others) {
+  public E update(DbSession session, E item, E... others) {
     Date now = new Date(system2.now());
     update(session, item, now);
     for (E other : others) {
@@ -172,7 +172,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final Collection<E> update(DbSession session, Collection<E> items) {
+  public Collection<E> update(DbSession session, Collection<E> items) {
     Date now = new Date(system2.now());
     for (E item : items) {
       update(session, item, now);
@@ -189,13 +189,13 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final E insert(DbSession session, E item) {
+  public E insert(DbSession session, E item) {
     insert(session, item, new Date(system2.now()));
     return item;
   }
 
   @Override
-  public final Collection<E> insert(DbSession session, Collection<E> items) {
+  public Collection<E> insert(DbSession session, Collection<E> items) {
     Date now = new Date(system2.now());
     for (E item : items) {
       insert(session, item, now);
@@ -204,7 +204,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
   }
 
   @Override
-  public final E insert(DbSession session, E item, E... others) {
+  public E insert(DbSession session, E item, E... others) {
     Date now = new Date(system2.now());
     insert(session, item, now);
     for (E other : others) {