AbstractIndexTests: Provide default configureIndex method implementation
Provide a default implementation for that method so no longer make it
abstract. Remove the as-default overriding methods from sub-classes. No
longer declare that method as throwing the unused Exception type(s).
(cherry picked from commit f27975aaa5)
Change-Id: I1986c55e264d0ff505a167bad05c1dec1c3dd1bc
			
			
This commit is contained in:
		@@ -41,7 +41,7 @@ public class ElasticReindexIT extends AbstractReindexTests {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public void configureIndex(Injector injector) throws Exception {
 | 
			
		||||
  public void configureIndex(Injector injector) {
 | 
			
		||||
    createAllIndexes(injector);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -45,7 +45,7 @@ public abstract class AbstractIndexTests extends AbstractDaemonTest {
 | 
			
		||||
  private RegistrationHandle changeIndexedCounterHandle;
 | 
			
		||||
 | 
			
		||||
  /** @param injector injector */
 | 
			
		||||
  public abstract void configureIndex(Injector injector) throws Exception;
 | 
			
		||||
  public void configureIndex(Injector injector) {}
 | 
			
		||||
 | 
			
		||||
  @Before
 | 
			
		||||
  public void addChangeIndexedCounter() {
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,7 @@ public class ElasticIndexIT extends AbstractIndexTests {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public void configureIndex(Injector injector) throws Exception {
 | 
			
		||||
  public void configureIndex(Injector injector) {
 | 
			
		||||
    createAllIndexes(injector);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -14,10 +14,4 @@
 | 
			
		||||
 | 
			
		||||
package com.google.gerrit.acceptance.ssh;
 | 
			
		||||
 | 
			
		||||
import com.google.inject.Injector;
 | 
			
		||||
 | 
			
		||||
public class IndexIT extends AbstractIndexTests {
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public void configureIndex(Injector injector) throws Exception {}
 | 
			
		||||
}
 | 
			
		||||
public class IndexIT extends AbstractIndexTests {}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user