DOC-435: backport standalone tidy to 5.5 (#1673)

Author: oliverhowell

docs/modules/clients/pages/java.adoc

@@ -1,34 +1,19 @@
 = Java Client
+:page-api-reference: https://docs.hazelcast.org/docs/{os-version}/javadoc
 :page-toclevels: 1
 :page-aliases: security:native-client-security.adoc
-:description: Hazelcast provides a {java-client} within the standard distribution you can start using right away, and also a lightweight {java-client-new} that is available in Beta.
+:description: Hazelcast provides a {java-client} within the standard distribution you can start using right away.
 [[java-client]]
 
 == Overview
 
-Hazelcast provides a {java-client} which you can use to connect to a Hazelcast cluster. `hazelcast-<VERSION>.jar` is bundled in the Hazelcast standard package, so just add `hazelcast-<VERSION>.jar` to your classpath and you can start using this client as if you are using the Hazelcast API.
+This topic is aimed at developers and describes basic usage, configuration, and advanced features.
 
-If you are interested in using a standalone or lightweight Java client, you can try the {java-client-new}. This client is currently available as Beta functionality but can interact with a Hazelcast cluster without being a full member. Please note that the {java-client-new} doesn't have full feature parity with the {java-client} yet and is not recommended for production environments. For more info, see xref:java#java-client-standalone-beta[].
-
-NOTE: Where there are specific differences between {java-client} and {java-client-new}, this documentation will specify the appropriate client. Otherwise you can assume that generic references to client refer to both versions of the Java client.
-
-// check production recommendation
-
-Both clients enable you to use the Hazelcast API, with this page explaining any differences or technical details that affect usage. This page should be read alongside the respective Javadoc-generated API documentation available from within your IDE and the following links:
-
-* https://docs.hazelcast.org/hazelcast-ee-docs/{ee-version}/javadoc[Hazelcast {java-client} {enterprise-product-name} API documentation]
-* https://docs.hazelcast.org/docs/{os-version}/javadoc[Hazelcast {java-client} {open-source-product-name} API documentation]
-* https://docs.hazelcast.org/hazelcast-java-client/{page-latest-supported-java-client-new}/javadoc[Hazelcast {java-client-new} API documentation]
+Hazelcast provides a {java-client} which you can use to connect to a Hazelcast cluster. `hazelcast-<VERSION>.jar` is bundled in the Hazelcast standard package, so you simply add this file to your classpath to begin using the client as if you are using the Hazelcast API.
 
 == Get started
 
-* xref:java#get-started-with-java-client-and-embedded-server[]
-* xref:java#get-started-with-java-client-standalone-beta[]
-
-=== Get started with {java-client}
-
-To get started using the {java-client}, you need to include the `hazelcast.jar` dependency in your classpath. You can then start using this client as if
-you are using the Hazelcast API. 
+To get started using the {java-client}, you need to include the `hazelcast.jar` dependency in your classpath. You can then start using this client as if you are using the Hazelcast API. 
 
 NOTE: If you have a Hazelcast {enterprise-product-name} license, you don't need to set the license key in your Hazelcast Java clients to use the xref:getting-started:editions.adoc#features-in-hazelcast-enterprise[{enterprise-product-name} features]. You only have to set it on the member side, and include the `hazelcast-enterprise-<VERSION>.jar` dependency in your classpath.
 
@@ -72,57 +57,6 @@ You can find {java-client} code samples in the https://github.com/hazelcast/haze
 
 TIP: For a tutorial on getting started with Java in an embedded topology, see xref:getting-started:get-started-java.adoc[].
 
-=== Get started with {java-client-new} (BETA)
-
-To get started using the {java-client-new}, you need to add the `hazelcast-java-client` dependency to your pom.xml, as shown below. You can then start using this client as if
-you are using the Hazelcast API.
-[source,xml,subs="attributes+"]
-----
-<dependency>
-    <groupId>com.hazelcast</groupId>
-    <artifactId>hazelcast-java-client</artifactId>
-    <version>{java-client-standalone-version}</version>
-</dependency>
-----
-
-If you are using `hazelcast-enterprise-java-client`, you need to add the `hazelcast-enterprise-java-client` dependency and private hazelcast repository to your pom.xml file, as shown below:
-[source,xml,subs="attributes+"]
-----
-<dependency>
-    <groupId>com.hazelcast</groupId>
-    <artifactId>hazelcast-enterprise-java-client</artifactId>
-    <version>{java-client-standalone-version}</version>
-</dependency>
-
-<repositories>
-    <repository>
-        <id>private-repository</id>
-        <name>Hazelcast Private Repository</name>
-        <url>https://repository.hazelcast.com/release/</url>
-        <releases>
-            <enabled>true</enabled>
-        </releases>
-        <snapshots>
-            <enabled>false</enabled>
-        </snapshots>
-    </repository>
-</repositories>
-----
-
-==== Migrate to {java-client-new} (BETA)
-To migrate an application from the {java-client} to the {java-client-new}, you only have to update the dependency as described above.
-
-[java-client-standalone]
-==== {java-client-new} (BETA)
-
-The {java-client-new} is only available as a BETA release and does not have full feature parity with the {java-client}. Please note the following differences and restrictions:
-
-* Hazelcast Cloud is not supported
-* You cannot use the {java-client} and the {java-client-new} on the same JVM
-* Any methods that raise the`UnsupportedOperationException` exception are not available e.g. `addLocalEntryListener(@Nonnull MapListener listener)`
-* MultiMap and Set are not supported data structures
-* Some client system properties are not supported (see individual notes)
-
 === Client API
 The Client API is your gateway to access your Hazelcast cluster, including distributed objects and data pipelines (jobs).
 
@@ -138,18 +72,14 @@ clientConfig.setClusterName("dev");
 clientConfig.getNetworkConfig().addAddress("10.90.0.1", "10.90.0.2:5702");
 ----
 
-For further information on client configuration, see <<configure-java-client, Configure the client>>.
 For further information on client configuration, see <<configure-java-client, Configure the client>>.
 
-After completing the client configuration, you must create an `HazelcastClient` instance that will initialize and connect to the client based on the specified configuration:
 After completing the client configuration, you must create an `HazelcastClient` instance that will initialize and connect to the client based on the specified configuration:
 
-```java
 ```java
 HazelcastInstance client = HazelcastClient.newHazelcastClient(clientConfig);
 ```
 
-You can create a distributed map and populate it with some data as follows:
 You can create a distributed map and populate it with some data as follows:
 
 [source,java]
@@ -175,7 +105,7 @@ This command releases all used resources and closes all connections to the clust
 
 === Supported data structures
 
-Hazelcast offers distributed implementations of many common data structures, most of which are supported by the {java-client} and {java-client-new}.
+Hazelcast offers distributed implementations of many common data structures, most of which are supported by the {java-client}.
 
 When you use clients in other languages, you should review the appropriate client documentation for exceptions and details. As a general rule, you should configure these data structures on the server side and
 access them through a proxy on the client side.
@@ -197,8 +127,6 @@ The `addLocalEntryListener()` and `localKeySet()` methods are not supported beca
 
 === Use MultiMap
 
-NOTE: This section is only applicable to the {java-client}.
-
 You can use a distributed multiMap object with the {java-client}, as follows:
 
 [source,java]
@@ -238,7 +166,7 @@ The logic is the same for both member and client side, so see the specific secti
 
 * xref:data-structures:replicated-map.adoc[Replicated Map]
 * xref:data-structures:list.adoc[List]
-* xref:data-structures:set.adoc[Set] (not supported by {java-client-new})
+* xref:data-structures:set.adoc[Set] 
 * xref:data-structures:iatomiclong.adoc[IAtomicLong]
 * xref:data-structures:iatomicreference.adoc[IAtomicReference]
 * xref:data-structures:icountdownlatch.adoc[ICountDownLatch]
@@ -507,10 +435,7 @@ security:
 ----
 ====
 
-For more information, see the appropriate API documentation for your client:
-
-* https://docs.hazelcast.org/docs/{os-version}/javadoc/com/hazelcast/client/config/ClientSecurityConfig.html[{java-client-new} ClientSecurityConfig API documentation]  
-* https://docs.hazelcast.org/hazelcast-java-client/{page-latest-supported-java-client-new}/javadoc/com/hazelcast/client/config/ClientSecurityConfig.html[{java-client} ClientSecurityConfig API documentation]
+For more information, see https://docs.hazelcast.org/docs/{os-version}/javadoc/com/hazelcast/client/config/ClientSecurityConfig.html[ClientSecurityConfig API documentation].  
 
 [[classloader]]
 === Configure ClassLoader
@@ -1116,6 +1041,8 @@ When an operation with sync backup is sent by a client to the Hazelcast member(s
 the acknowledgment of the operation's backup is sent to the client by the backup
 replica member(s). This improves the performance of the client operations.
 
+NOTE: Backup acknowledgement is sometimes referred to as _boomerang backups_.
+
 If using the `ALL_MEMBERS` cluster routing mode, backup acknowledgement to the client is enabled by default.
 However, neither the `MULTI_MEMBER` nor the `SINGLE_MEMBER` cluster routing modes support backup acknowledgement to the client.
 
@@ -1661,8 +1588,6 @@ For a programmatic example, see this xref:java#programmatic-configuration-5[code
 
 === Configure Hazelcast {hazelcast-cloud}
 
-NOTE: This section is only applicable to the {java-client}.
-
 You can connect the {java-client} to a {hazelcast-cloud} Standard cluster which is hosted on link:{url-cloud-signup}[{hazelcast-cloud}].
 For this, you need to enable {hazelcast-cloud} and specify the cluster's discovery token provided while creating the cluster; this allows the cluster to discover your clients.
 See the following example configurations:
@@ -1988,8 +1913,6 @@ NOTE: You need to restart clients after modifying system properties.
 |long
 |Token to use when discovering the cluster via {hazelcast-cloud}. 
 
-NOTE: Not supported by {java-client-new}.
-
 |`hazelcast.client.concurrent.window.ms`
 |100
 |int
@@ -2001,8 +1924,6 @@ Setting it too high effectively disables the optimization because once concurren
 it will keep that way. Setting it too low could lead to suboptimal performance because the system
 will try to use write-through and other optimizations even though the system is concurrent.
 
-NOTE: Not supported by {java-client-new}.
-
 |`hazelcast.discovery.enabled`
 |false
 |bool
@@ -2168,8 +2089,6 @@ increased performance and reduced memory usage.
 to the same member when this property is `true`. When it is set to `false`,
 the client tries to connect to the members in the given order.
 
-NOTE: Not supported by {java-client-new}.
-
 |`hazelcast.client.connectivity.logging.delay.seconds`
 |10
 |int