HSEARCH-3759 Rename PushSchemaCall to SchemaDefinitionCall

To remove any confusion between schema definition and schema management.
hibernate · Mar 6, 2020 · a292898 · a292898
1 parent 76926d2
commit a292898
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/...ibernate/search/integrationtest/mapper/orm/bootstrap/HibernateOrmIntegrationBooterIT.java b/...ibernate/search/integrationtest/mapper/orm/bootstrap/HibernateOrmIntegrationBooterIT.java
@@ -61,7 +61,7 @@ public void twoPhaseBoot() {
 		HibernateOrmIntegrationBooter booter = createBooter( IndexedEntity.class );
 		Map<String, Object> booterGeneratedProperties = new LinkedHashMap<>();
 
-		// Pre-booting should lead to a schema creation in the backend.
+		// Pre-booting should lead to a schema definition in the backend.
 		backendMock.expectSchema( INDEX_NAME, b -> { } );
 		booter.preBoot( booterGeneratedProperties::put );
 		backendMock.verifyExpectationsMet();

diff --git a/...src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/BackendMock.java b/...src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/BackendMock.java
@@ -126,16 +126,16 @@ public BackendMock expectSchema(String indexName, Consumer<StubIndexSchemaNode.B
 
 	public BackendMock expectSchema(String indexName, Consumer<StubIndexSchemaNode.Builder> contributor,
 			Capture<StubIndexSchemaNode> capture) {
-		CallQueue<PushSchemaCall> callQueue = behaviorMock.getPushSchemaCalls( indexName );
+		CallQueue<SchemaDefinitionCall> callQueue = behaviorMock.getSchemaDefinitionCalls( indexName );
 		StubIndexSchemaNode.Builder builder = StubIndexSchemaNode.schema();
 		contributor.accept( builder );
-		callQueue.expectOutOfOrder( new PushSchemaCall( indexName, builder.build(), capture ) );
+		callQueue.expectOutOfOrder( new SchemaDefinitionCall( indexName, builder.build(), capture ) );
 		return this;
 	}
 
 	public BackendMock expectAnySchema(String indexName) {
-		CallQueue<PushSchemaCall> callQueue = behaviorMock.getPushSchemaCalls( indexName );
-		callQueue.expectOutOfOrder( new PushSchemaCall( indexName, null ) );
+		CallQueue<SchemaDefinitionCall> callQueue = behaviorMock.getSchemaDefinitionCalls( indexName );
+		callQueue.expectOutOfOrder( new SchemaDefinitionCall( indexName, null ) );
 		return this;
 	}
 

diff --git a/...ationtest/common/rule/PushSchemaCall.java → ...est/common/rule/SchemaDefinitionCall.java b/...ationtest/common/rule/PushSchemaCall.java → ...est/common/rule/SchemaDefinitionCall.java
@@ -13,25 +13,25 @@
 
 import org.easymock.Capture;
 
-class PushSchemaCall extends Call<PushSchemaCall> {
+class SchemaDefinitionCall extends Call<SchemaDefinitionCall> {
 
 	private final String indexName;
 	private final StubIndexSchemaNode schemaNode;
 	private final Capture<StubIndexSchemaNode> capture;
 
-	PushSchemaCall(String indexName, StubIndexSchemaNode schemaNode) {
+	SchemaDefinitionCall(String indexName, StubIndexSchemaNode schemaNode) {
 		this.indexName = indexName;
 		this.schemaNode = schemaNode;
 		this.capture = null;
 	}
 
-	PushSchemaCall(String indexName, StubIndexSchemaNode schemaNode, Capture<StubIndexSchemaNode> capture) {
+	SchemaDefinitionCall(String indexName, StubIndexSchemaNode schemaNode, Capture<StubIndexSchemaNode> capture) {
 		this.indexName = indexName;
 		this.schemaNode = schemaNode;
 		this.capture = capture;
 	}
 
-	public CallBehavior<Void> verify(PushSchemaCall actualCall) {
+	public CallBehavior<Void> verify(SchemaDefinitionCall actualCall) {
 		if ( schemaNode != null ) {
 			StubTreeNodeAssert.assertThat( actualCall.schemaNode )
 					.as( "Schema for index '" + indexName + "' did not match:\n" )
@@ -48,13 +48,13 @@ public CallBehavior<Void> verify(PushSchemaCall actualCall) {
 	}
 
 	@Override
-	protected boolean isSimilarTo(PushSchemaCall other) {
+	protected boolean isSimilarTo(SchemaDefinitionCall other) {
 		return Objects.equals( indexName, other.indexName );
 	}
 
 	@Override
 	public String toString() {
-		return "push schema to index '" + indexName + "'; schema = " + schemaNode;
+		return "schema definition for index '" + indexName + "'; schema = " + schemaNode;
 	}
 
 }
diff --git a/.../hibernate/search/util/impl/integrationtest/common/rule/VerifyingStubBackendBehavior.java b/.../hibernate/search/util/impl/integrationtest/common/rule/VerifyingStubBackendBehavior.java
@@ -42,7 +42,7 @@ class VerifyingStubBackendBehavior extends StubBackendBehavior {
 
 	private final List<CallBehavior<Void>> stopBackendBehaviors = new ArrayList<>();
 
-	private final Map<String, CallQueue<PushSchemaCall>> pushSchemaCalls = new HashMap<>();
+	private final Map<String, CallQueue<SchemaDefinitionCall>> schemaDefinitionCalls = new HashMap<>();
 
 	private final Map<String, CallQueue<SchemaManagementWorkCall>> schemaManagementWorkCall = new HashMap<>();
 
@@ -72,8 +72,8 @@ void setIndexFieldAddBehavior(String indexName, String absoluteFieldPath, CallBe
 		indexFieldAddBehaviors.put( new IndexFieldKey( indexName, absoluteFieldPath ), behavior );
 	}
 
-	CallQueue<PushSchemaCall> getPushSchemaCalls(String indexName) {
-		return pushSchemaCalls.computeIfAbsent( indexName, ignored -> new CallQueue<>() );
+	CallQueue<SchemaDefinitionCall> getSchemaDefinitionCalls(String indexName) {
+		return schemaDefinitionCalls.computeIfAbsent( indexName, ignored -> new CallQueue<>() );
 	}
 
 	CallQueue<SchemaManagementWorkCall> getSchemaManagementWorkCalls(String indexName) {
@@ -100,14 +100,14 @@ void resetExpectations() {
 		createBackendBehaviors.clear();
 		stopBackendBehaviors.clear();
 		indexFieldAddBehaviors.clear();
-		pushSchemaCalls.clear();
+		schemaDefinitionCalls.clear();
 		documentWorkCalls.clear();
 		searchCalls.reset();
 	}
 
 	void verifyExpectationsMet() {
 		// We don't check anything for the various behaviors (createBackendBehaviors, ...): they are ignored if they are not executed.
-		pushSchemaCalls.values().forEach( CallQueue::verifyExpectationsMet );
+		schemaDefinitionCalls.values().forEach( CallQueue::verifyExpectationsMet );
 		documentWorkCalls.values().forEach( CallQueue::verifyExpectationsMet );
 		searchCalls.verifyExpectationsMet();
 	}
@@ -135,11 +135,11 @@ public void onAddField(String indexName, String absoluteFieldPath) {
 	}
 
 	@Override
-	public void pushSchema(String indexName, StubIndexSchemaNode rootSchemaNode) {
-		getPushSchemaCalls( indexName )
+	public void defineSchema(String indexName, StubIndexSchemaNode rootSchemaNode) {
+		getSchemaDefinitionCalls( indexName )
 				.verify(
-						new PushSchemaCall( indexName, rootSchemaNode ),
-						PushSchemaCall::verify,
+						new SchemaDefinitionCall( indexName, rootSchemaNode ),
+						SchemaDefinitionCall::verify,
 						noExpectationsBehavior( () -> null )
 				);
 	}

diff --git a/...g/hibernate/search/util/impl/integrationtest/common/stub/backend/StubBackendBehavior.java b/...g/hibernate/search/util/impl/integrationtest/common/stub/backend/StubBackendBehavior.java
@@ -43,7 +43,7 @@ public void onAddField(String indexName, String absoluteFieldPath) {
 		}
 
 		@Override
-		public void pushSchema(String indexName, StubIndexSchemaNode rootSchemaNode) {
+		public void defineSchema(String indexName, StubIndexSchemaNode rootSchemaNode) {
 			throw new IllegalStateException( "The stub backend behavior was not set when a schema was pushed for index '"
 					+ indexName + "': " + rootSchemaNode );
 		}
@@ -123,7 +123,7 @@ protected StubBackendBehavior() {
 
 	public abstract void onAddField(String indexName, String absoluteFieldPath);
 
-	public abstract void pushSchema(String indexName, StubIndexSchemaNode rootSchemaNode);
+	public abstract void defineSchema(String indexName, StubIndexSchemaNode rootSchemaNode);
 
 	public abstract CompletableFuture<?> executeSchemaManagementWork(String indexName, StubSchemaManagementWork work,
 			ContextualFailureCollector failureCollector);

diff --git a/...ate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubIndexManager.java b/...ate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubIndexManager.java
@@ -45,7 +45,7 @@ public class StubIndexManager implements IndexManagerImplementor, IndexManager {
 		this.name = name;
 		this.mappedTypeName = mappedTypeName;
 		this.rootSchemaNode = rootSchemaNode;
-		backend.getBehavior().pushSchema( name, rootSchemaNode );
+		backend.getBehavior().defineSchema( name, rootSchemaNode );
 	}
 
 	@Override