Remove deprecated code; add arch unit tests.

Original Pull Request #2832
Closes #2831

Author: sothawo

pom.xml

@@ -324,6 +324,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.tngtech.archunit</groupId>
+			<artifactId>archunit-junit5</artifactId>
+			<version>${archunit}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.2-5.3.adoc

@@ -9,3 +9,7 @@ This section describes breaking changes from version 5.2.x to 5.3.x and how remo
 
 [[elasticsearch-migration-guide-5.2-5.3.deprecations]]
 == Deprecations
+
+=== Removals
+The deprecated classes `org.springframework.data.elasticsearch.ELCQueries`
+ and `org.springframework.data.elasticsearch.client.elc.QueryBuilders` have been removed, use `org.springframework.data.elasticsearch.client.elc.Queries` instead.

src/main/java/org/springframework/data/elasticsearch/client/elc/QueryBuilders.java

@@ -0,0 +1,23 @@
+package org.springframework.data.elasticsearch;
+
+import com.tngtech.archunit.core.importer.ImportOption;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.lang.ArchRule;
+import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
+
+@AnalyzeClasses(
+		packages = { "org.springframework.data.elasticsearch", "co.elastic" },
+		importOptions = ImportOption.DoNotIncludeTests.class)
+class ClientArchitectureTests {
+
+	@ArchTest public static final ArchRule elasticLibrariesShouldOnlyBeUsedInClientElc = ArchRuleDefinition
+			.noClasses()
+			.that()
+			.resideInAPackage("org.springframework.data.elasticsearch..")
+			.and()
+			.resideOutsideOfPackage("org.springframework.data.elasticsearch.client.elc..")
+			.should()
+			.dependOnClassesThat()
+			.resideInAnyPackage("co.elastic.clients..", "org.elasticsearch.client..");
+}