This class is considered an internal implementation detail and not meant to be used by - * applications. - * - * @deprecated Please migrate to using the google-cloud-bigtable artifact - */ -@Deprecated -public final class DeprecationMarker {} diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java index 94d05f97ac72..ccee1af06efb 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java +++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java @@ -29,7 +29,6 @@ import com.google.cloud.Policy.DefaultMarshaller; import com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPage; import com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClient.ListAppProfilesPagedResponse; -import com.google.cloud.bigtable.admin.v2.internal.ArtifactDeprecationChecker; import com.google.cloud.bigtable.admin.v2.internal.NameUtil; import com.google.cloud.bigtable.admin.v2.models.AppProfile; import com.google.cloud.bigtable.admin.v2.models.Cluster; @@ -100,10 +99,6 @@ * } */ public final class BigtableInstanceAdminClient implements AutoCloseable { - static { - ArtifactDeprecationChecker.checkDeprecatedArtifactUse(); - } - private final String projectId; private final BigtableInstanceAdminStub stub; diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java index 8f5185a19396..65cebdb0f62f 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java +++ b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java @@ -27,7 +27,6 @@ import com.google.bigtable.admin.v2.ListTablesRequest; import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPage; import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClient.ListTablesPagedResponse; -import com.google.cloud.bigtable.admin.v2.internal.ArtifactDeprecationChecker; import com.google.cloud.bigtable.admin.v2.internal.NameUtil; import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest; import com.google.cloud.bigtable.admin.v2.models.ModifyColumnFamiliesRequest; @@ -94,11 +93,6 @@ * } */ public final class BigtableTableAdminClient implements AutoCloseable { - - static { - ArtifactDeprecationChecker.checkDeprecatedArtifactUse(); - } - private final EnhancedBigtableTableAdminStub stub; private final String projectId; private final String instanceId; diff --git a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java b/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java deleted file mode 100644 index ff239d13cd26..000000000000 --- a/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/internal/ArtifactDeprecationChecker.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2019 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.cloud.bigtable.admin.v2.internal; - -import com.google.api.core.InternalApi; -import java.util.logging.Logger; - -/** - * This class detects usage of and notifies users that the google-cloud-bigtable-admin artifact has - * been deprecated in favor of the merged google-cloud-bigtable artifact. - * - *
This class is considered an internal implementation detail and not meant to be used by
- * applications.
- */
-@InternalApi
-public final class ArtifactDeprecationChecker {
- private static final Logger LOGGER = Logger.getLogger(ArtifactDeprecationChecker.class.getName());
-
- public static void checkDeprecatedArtifactUse() {
- if (isDeprecationMarkerPresent()) {
- LOGGER.warning(
- "google-cloud-bigtable-admin has been merged into google-cloud-bigtable."
- + " Please update your build file to stop depending on google-cloud-bigtable-admin"
- + " and use google-cloud-bigtable directly.");
- }
- }
-
- private static boolean isDeprecationMarkerPresent() {
- try {
- ArtifactDeprecationChecker.class
- .getClassLoader()
- .loadClass("com.google.cloud.bigtable.admin.v2.internal.DeprecationMarker");
- return true;
- } catch (ClassNotFoundException e) {
- return false;
- }
- }
-}
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 8a3298c9f468..4132e5974179 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -423,7 +423,6 @@