HSEARCH-4526 Remove unnecessary uses of StaticCounters

hibernate · Apr 4, 2022 · 33f024b · 33f024b
1 parent 2a443af
commit 33f024b
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 52 deletions.
diff --git a/...envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java b/...envers/src/test/java/org/hibernate/search/integrationtest/mapper/orm/envers/EnversIT.java
@@ -31,7 +31,6 @@
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
 import org.hibernate.search.util.impl.test.annotation.PortedFromSearch5;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -47,9 +46,6 @@ public class EnversIT {
 	@Rule
 	public OrmSetupHelper ormSetupHelper = OrmSetupHelper.withBackendMock( backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SessionFactory sessionFactory;
 
 	@Before

diff --git a/...te/search/integrationtest/mapper/orm/mapping/definition/AnnotationMappingDiscoveryIT.java b/...te/search/integrationtest/mapper/orm/mapping/definition/AnnotationMappingDiscoveryIT.java
@@ -36,7 +36,6 @@
 import org.hibernate.search.mapper.pojo.model.PojoModelProperty;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -49,9 +48,6 @@ public class AnnotationMappingDiscoveryIT {
 	@Rule
 	public OrmSetupHelper ormSetupHelper = OrmSetupHelper.withBackendMock( backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	@Test
 	public void discoveryEnabled() {
 		backendMock.expectSchema( IndexedEntity.INDEX, b -> b

diff --git a/...rc/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java b/...rc/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java
@@ -21,7 +21,6 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -36,9 +35,6 @@ public class GenericPropertyIT {
 	@Rule
 	public OrmSetupHelper ormSetupHelper = OrmSetupHelper.withBackendMock( backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SessionFactory sessionFactory;
 
 	@Before

diff --git a/...est/java/org/hibernate/search/integrationtest/mapper/orm/model/PropertyInheritanceIT.java b/...est/java/org/hibernate/search/integrationtest/mapper/orm/model/PropertyInheritanceIT.java
@@ -20,7 +20,6 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -35,9 +34,6 @@ public class PropertyInheritanceIT {
 	@Rule
 	public OrmSetupHelper ormSetupHelper = OrmSetupHelper.withBackendMock( backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SessionFactory sessionFactory;
 
 	@Before

diff --git a/.../test/java/org/hibernate/search/integrationtest/mapper/orm/model/TransientPropertyIT.java b/.../test/java/org/hibernate/search/integrationtest/mapper/orm/model/TransientPropertyIT.java
@@ -31,7 +31,6 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -44,9 +43,6 @@ public class TransientPropertyIT {
 	@Rule
 	public OrmSetupHelper ormSetupHelper = OrmSetupHelper.withBackendMock( backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	@Test
 	public void withoutDerivedFrom() {
 		assertThatThrownBy(

diff --git a/.../java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java b/.../java/org/hibernate/search/integrationtest/mapper/orm/smoke/AnnotationMappingSmokeIT.java
@@ -43,7 +43,6 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.StubSearchWorkBehavior;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -61,9 +60,6 @@ public class AnnotationMappingSmokeIT {
 	@Rule
 	public MethodRule setupHolderMethodRule = setupHolder.methodRule();
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	@ReusableOrmSetupHolder.Setup
 	public void setup(OrmSetupHelper.SetupContext setupContext) {
 		backendMock.expectSchema( OtherIndexedEntity.NAME, b -> b

diff --git a/...ava/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java b/...ava/org/hibernate/search/integrationtest/mapper/orm/smoke/ProgrammaticMappingSmokeIT.java
@@ -41,7 +41,6 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.StubSearchWorkBehavior;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -60,9 +59,6 @@ public class ProgrammaticMappingSmokeIT {
 	@Rule
 	public MethodRule setupHolderMethodRule = setupHolder.methodRule();
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	@ReusableOrmSetupHolder.Setup
 	public void setup(OrmSetupHelper.SetupContext setupContext) {
 		backendMock.expectSchema( OtherIndexedEntity.NAME, b -> b

diff --git a/...search/integrationtest/mapper/orm/workspace/AbstractSearchWorkspaceSimpleOperationIT.java b/...search/integrationtest/mapper/orm/workspace/AbstractSearchWorkspaceSimpleOperationIT.java
@@ -23,7 +23,6 @@
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.mapper.orm.ReusableOrmSetupHolder;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -51,9 +50,6 @@ public abstract class AbstractSearchWorkspaceSimpleOperationIT {
 	@Rule
 	public MethodRule setupHolderMethodRule = setupHolder.methodRule();
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	@ReusableOrmSetupHolder.Setup
 	public void setup(OrmSetupHelper.SetupContext setupContext) {
 		defaultBackendMock.expectAnySchema( IndexedEntity1.INDEX_NAME );

diff --git a/...e/search/integrationtest/mapper/pojo/mapping/definition/AnnotationMappingDiscoveryIT.java b/...e/search/integrationtest/mapper/pojo/mapping/definition/AnnotationMappingDiscoveryIT.java
@@ -30,7 +30,6 @@
 import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.ProgrammaticMappingConfigurationContext;
 import org.hibernate.search.mapper.pojo.model.PojoModelProperty;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,9 +42,6 @@ public class AnnotationMappingDiscoveryIT {
 	@Rule
 	public JavaBeanMappingSetupHelper setupHelper = JavaBeanMappingSetupHelper.withBackendMock( MethodHandles.lookup(), backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	@Test
 	public void discoveryEnabled() {
 		backendMock.expectSchema( IndexedEntity.INDEX, b -> b

diff --git a/...c/test/java/org/hibernate/search/integrationtest/mapper/pojo/model/GenericPropertyIT.java b/...c/test/java/org/hibernate/search/integrationtest/mapper/pojo/model/GenericPropertyIT.java
@@ -19,7 +19,6 @@
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.PropertyValue;
 import org.hibernate.search.integrationtest.mapper.pojo.testsupport.util.rule.JavaBeanMappingSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -34,9 +33,6 @@ public class GenericPropertyIT {
 	@Rule
 	public JavaBeanMappingSetupHelper setupHelper = JavaBeanMappingSetupHelper.withBackendMock( MethodHandles.lookup(), backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SearchMapping mapping;
 
 	@Before

diff --git a/...st/java/org/hibernate/search/integrationtest/mapper/pojo/model/PropertyInheritanceIT.java b/...st/java/org/hibernate/search/integrationtest/mapper/pojo/model/PropertyInheritanceIT.java
@@ -19,7 +19,6 @@
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.PropertyValue;
 import org.hibernate.search.integrationtest.mapper.pojo.testsupport.util.rule.JavaBeanMappingSetupHelper;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -34,9 +33,6 @@ public class PropertyInheritanceIT {
 	@Rule
 	public JavaBeanMappingSetupHelper setupHelper = JavaBeanMappingSetupHelper.withBackendMock( MethodHandles.lookup(), backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SearchMapping mapping;
 
 	@Before

diff --git a/...java/org/hibernate/search/integrationtest/mapper/pojo/smoke/AnnotationMappingSmokeIT.java b/...java/org/hibernate/search/integrationtest/mapper/pojo/smoke/AnnotationMappingSmokeIT.java
@@ -44,7 +44,6 @@
 import org.hibernate.search.util.common.impl.CollectionHelper;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.common.rule.StubSearchWorkBehavior;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -59,9 +58,6 @@ public class AnnotationMappingSmokeIT {
 	@Rule
 	public JavaBeanMappingSetupHelper setupHelper = JavaBeanMappingSetupHelper.withBackendMock( MethodHandles.lookup(), backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SearchMapping mapping;
 
 	@Before

diff --git a/...va/org/hibernate/search/integrationtest/mapper/pojo/smoke/ProgrammaticMappingSmokeIT.java b/...va/org/hibernate/search/integrationtest/mapper/pojo/smoke/ProgrammaticMappingSmokeIT.java
@@ -36,7 +36,6 @@
 import org.hibernate.search.util.common.impl.CollectionHelper;
 import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock;
 import org.hibernate.search.util.impl.integrationtest.common.rule.StubSearchWorkBehavior;
-import org.hibernate.search.util.impl.test.rule.StaticCounters;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -51,9 +50,6 @@ public class ProgrammaticMappingSmokeIT {
 	@Rule
 	public JavaBeanMappingSetupHelper setupHelper = JavaBeanMappingSetupHelper.withBackendMock( MethodHandles.lookup(), backendMock );
 
-	@Rule
-	public StaticCounters counters = new StaticCounters();
-
 	private SearchMapping mapping;
 
 	@Before