package com.google.sps.utilities;

import com.google.cloud.spanner.DatabaseClient;
import com.google.cloud.spanner.DatabaseId;
import com.google.cloud.spanner.Spanner;
import com.google.cloud.spanner.SpannerOptions;

public class WrapperDatabaseService implements DatabaseService {
  public static final String INSTANCE_ID = "step-188-instance";
  public static final String DATABASE_ID = "event-organizer-db";
  private final Spanner spanner;
  private final DatabaseClient databaseClient;

  public WrapperDatabaseService() {
    SpannerOptions options = SpannerOptions.newBuilder().build();
    spanner = options.getService();
    DatabaseId database = DatabaseId.of(options.getProjectId(), INSTANCE_ID, DATABASE_ID);
    databaseClient = spanner.getDatabaseClient(database);
  }

  @Override
  public Spanner getSpanner() {
    return spanner;
  }

  @Override
  public DatabaseClient getDatabaseClient() {
    return databaseClient;
  }
}

@@ -279,137 +279,8 @@
 e %7B%0A
-  public static final String INSTANCE_ID = %22step-188-instance%22;%0A  public static final String DATABASE_ID = %22event-organizer-db%22;%0A
   pr
@@ -519,16 +519,24 @@
 tabase =
+%0A       
  Databas
@@ -570,21 +570,57 @@
 (), 
-INSTANCE_ID, 
+DatabaseConstants.INSTANCE_ID, DatabaseConstants.
 DATA

Fix from code review.