[fixup] prevent rebuilding startup options for each connection, clean up javadocs

Author: emerkle826

core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java

@@ -181,8 +181,6 @@ public class DefaultDriverContext implements InternalDriverContext {
   private final LazyReference<NodeStateListener> nodeStateListenerRef;
   private final LazyReference<SchemaChangeListener> schemaChangeListenerRef;
   private final LazyReference<RequestTracker> requestTrackerRef;
-  private final LazyReference<StartupOptionsBuilder> startupOptionsBuilderRef =
-      new LazyReference<>("startupOptionsBuilder", this::buildStartupOptions, cycleDetector);
 
   private final DriverConfig config;
   private final DriverConfigLoader configLoader;
@@ -194,6 +192,7 @@ public class DefaultDriverContext implements InternalDriverContext {
   private final RequestTracker requestTrackerFromBuilder;
   private final Map<String, Predicate<Node>> nodeFiltersFromBuilder;
   private final ClassLoader classLoader;
+  private final Map<String, String> startupOptions;
 
   public DefaultDriverContext(
       DriverConfigLoader configLoader,
@@ -230,6 +229,7 @@ public DefaultDriverContext(
             "requestTracker", () -> buildRequestTracker(requestTrackerFromBuilder), cycleDetector);
     this.nodeFiltersFromBuilder = nodeFilters;
     this.classLoader = classLoader;
+    this.startupOptions = buildStartupOptions().build();
   }
 
   /**
@@ -748,6 +748,6 @@ public ProtocolVersion getProtocolVersion() {
   @NonNull
   @Override
   public Map<String, String> getStartupOptions() {
-    return startupOptionsBuilderRef.get().build();
+    return startupOptions;
   }
 }

core/src/main/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilder.java

@@ -48,8 +48,6 @@ public StartupOptionsBuilder(InternalDriverContext context) {
    * constructor will add {@link
    * com.datastax.oss.protocol.internal.request.Startup#CQL_VERSION_KEY}.
    *
-   * <p>Additional options can be set via {@link #withAdditionalOptions(java.util.Map)}.
-   *
    * @return Map of Startup Options.
    */
   public Map<String, String> build() {
@@ -70,9 +68,6 @@ public Map<String, String> build() {
    *
    * <p>By default, this method will pull from the bundled Driver.properties file. Subclasses should
    * override this method if they need to report a different Driver name on Startup.
-   *
-   * <p><b>NOTE:</b> The Driver name can not be set via {@link
-   * #withAdditionalOptions(java.util.Map)}
    */
   protected String getDriverName() {
     return MAVEN_COORDINATES.getName();
@@ -83,9 +78,6 @@ protected String getDriverName() {
    *
    * <p>By default, this method will pull from the bundled Driver.properties file. Subclasses should
    * override this method if they need to report a different Driver version on Startup.
-   *
-   * <p><b>NOTE:</b> The Driver version can not be set via {@link
-   * #withAdditionalOptions(java.util.Map)}
    */
   protected String getDriverVersion() {
     return MAVEN_COORDINATES.getVersion().toString();

core/src/test/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilderTest.java

@@ -66,6 +66,9 @@ public void before() {
     MockitoAnnotations.initMocks(this);
     Mockito.when(configLoader.getInitialConfig()).thenReturn(driverConfig);
     Mockito.when(driverConfig.getDefaultProfile()).thenReturn(defaultProfile);
+  }
+
+  private void buildDriverContext() {
     defaultDriverContext =
         new DefaultDriverContext(
             configLoader,
@@ -88,6 +91,7 @@ private void assertDefaultStartupOptions(Startup startup) {
 
   @Test
   public void should_build_minimal_startup_options() {
+    buildDriverContext();
     Startup startup = new Startup(defaultDriverContext.getStartupOptions());
     assertThat(startup.options).doesNotContainKey(Startup.COMPRESSION_KEY);
     assertDefaultStartupOptions(startup);
@@ -99,6 +103,7 @@ public void should_build_startup_options_with_compression() {
         .thenReturn(Boolean.TRUE);
     Mockito.when(defaultProfile.getString(DefaultDriverOption.PROTOCOL_COMPRESSION))
         .thenReturn("lz4");
+    buildDriverContext();
     Startup startup = new Startup(defaultDriverContext.getStartupOptions());
     // assert the compression option is present
     assertThat(startup.options).containsEntry(Startup.COMPRESSION_KEY, "lz4");