diff --git a/src/main/java/com/google/api/pathtemplate/PathTemplate.java b/src/main/java/com/google/api/pathtemplate/PathTemplate.java index a27f6fbcc..9ed440bcf 100644 --- a/src/main/java/com/google/api/pathtemplate/PathTemplate.java +++ b/src/main/java/com/google/api/pathtemplate/PathTemplate.java @@ -31,7 +31,6 @@ package com.google.api.pathtemplate; -import com.google.api.core.BetaApi; import com.google.auto.value.AutoValue; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; @@ -122,7 +121,6 @@ * For the representation of a resource name see {@link TemplatedResourceName}, which is * based on path templates. */ -@BetaApi public class PathTemplate { /** diff --git a/src/main/java/com/google/api/pathtemplate/TemplatedResourceName.java b/src/main/java/com/google/api/pathtemplate/TemplatedResourceName.java index db49858d8..bbbedeaeb 100644 --- a/src/main/java/com/google/api/pathtemplate/TemplatedResourceName.java +++ b/src/main/java/com/google/api/pathtemplate/TemplatedResourceName.java @@ -65,7 +65,6 @@ * assert resourceName.parentName().toString().equals("shelves/s1/books"); * */ -@BetaApi public class TemplatedResourceName implements Map { // ResourceName Resolver diff --git a/src/main/java/com/google/api/pathtemplate/ValidationException.java b/src/main/java/com/google/api/pathtemplate/ValidationException.java index 7ecba91ef..13057ca33 100644 --- a/src/main/java/com/google/api/pathtemplate/ValidationException.java +++ b/src/main/java/com/google/api/pathtemplate/ValidationException.java @@ -31,7 +31,6 @@ package com.google.api.pathtemplate; -import com.google.api.core.BetaApi; import java.util.Stack; /** @@ -39,7 +38,6 @@ * framework methods. Comes as an illegal argument exception subclass. Allows to globally set a * thread-local validation context description which each exception inherits. */ -@BetaApi public class ValidationException extends IllegalArgumentException { public interface Supplier { diff --git a/src/main/java/com/google/api/resourcenames/ResourceName.java b/src/main/java/com/google/api/resourcenames/ResourceName.java index 751f1fa77..8442f4fdd 100644 --- a/src/main/java/com/google/api/resourcenames/ResourceName.java +++ b/src/main/java/com/google/api/resourcenames/ResourceName.java @@ -31,11 +31,9 @@ package com.google.api.resourcenames; -import com.google.api.core.BetaApi; import java.util.Map; /** An interface that generated resource name types must implement. */ -@BetaApi public interface ResourceName { /** diff --git a/src/main/java/com/google/api/resourcenames/ResourceNameFactory.java b/src/main/java/com/google/api/resourcenames/ResourceNameFactory.java index 13e18d0c5..13c1967af 100644 --- a/src/main/java/com/google/api/resourcenames/ResourceNameFactory.java +++ b/src/main/java/com/google/api/resourcenames/ResourceNameFactory.java @@ -30,9 +30,6 @@ */ package com.google.api.resourcenames; -import com.google.api.core.BetaApi; - -@BetaApi public interface ResourceNameFactory { /* Create a new ResourceName from a formatted String representing a ResourceName. */ diff --git a/src/main/java/com/google/api/resourcenames/ResourceNameType.java b/src/main/java/com/google/api/resourcenames/ResourceNameType.java deleted file mode 100644 index 2cfe42ca4..000000000 --- a/src/main/java/com/google/api/resourcenames/ResourceNameType.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2016, Google Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package com.google.api.resourcenames; - -import com.google.api.core.BetaApi; - -/** - * An interface that resource name types used to have to implement. A ResourceNameType class was - * required for any class that implements {@link ResourceName}. - * - * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary. - */ -@BetaApi -@Deprecated -public interface ResourceNameType {} diff --git a/src/main/java/com/google/api/resourcenames/UntypedResourceName.java b/src/main/java/com/google/api/resourcenames/UntypedResourceName.java index 4e2da19c3..19a6e1e9d 100644 --- a/src/main/java/com/google/api/resourcenames/UntypedResourceName.java +++ b/src/main/java/com/google/api/resourcenames/UntypedResourceName.java @@ -31,7 +31,6 @@ package com.google.api.resourcenames; -import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import java.util.Map; @@ -41,7 +40,6 @@ * support the case of a resource name string in an unexpected format - generated resource name * classes with known formats should be preferred where possible. */ -@BetaApi public class UntypedResourceName implements ResourceName { private final String rawValue;