Skip to content

Commit eaa63cd

Browse files
tcoffee-googletcoffee-google
committed
Merge branch 'master' into string_enum_resourcemanager
2 parents fef3a14 + 97b0629 commit eaa63cd

File tree

148 files changed

+239
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+239
-381
lines changed

‎google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ protected static String getServiceAccountProjectId() {
422422

423423
/**
424424
* Returns a Service object for the current service. For instance, when using Google Cloud
425-
* Storage, it returns a {@link com.google.cloud.storage.Storage} object.
425+
* Storage, it returns a Storage object.
426426
*/
427427
@SuppressWarnings("unchecked")
428428
public ServiceT getService() {
@@ -435,7 +435,7 @@ public ServiceT getService() {
435435

436436
/**
437437
* Returns a Service RPC object for the current service. For instance, when using Google Cloud
438-
* Storage, it returns a {@link com.google.cloud.storage.spi.StorageRpc} object.
438+
* Storage, it returns a StorageRpc object.
439439
*/
440440
@SuppressWarnings("unchecked")
441441
public ServiceRpc getRpc() {

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

1818
import com.google.api.gax.grpc.ChannelAndExecutor;
1919
import com.google.api.gax.grpc.UnaryCallable;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

1818
import com.google.api.gax.core.GoogleCredentialsProvider;
1919
import com.google.api.gax.core.PropertiesProvider;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

18-
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse;
19-
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse;
18+
import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListEventsPagedResponse;
19+
import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse;
2020

2121
import com.google.api.gax.grpc.ChannelAndExecutor;
2222
import com.google.api.gax.grpc.UnaryCallable;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

18-
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse;
19-
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse;
18+
import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListEventsPagedResponse;
19+
import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse;
2020

2121
import com.google.api.core.ApiFuture;
2222
import com.google.api.gax.core.GoogleCredentialsProvider;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/PagedResponseWrappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

1818
import com.google.api.core.ApiFunction;
1919
import com.google.api.core.ApiFuture;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClient.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

1818
import com.google.api.gax.grpc.ChannelAndExecutor;
1919
import com.google.api.gax.grpc.UnaryCallable;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

1818
import com.google.api.gax.core.GoogleCredentialsProvider;
1919
import com.google.api.gax.core.PropertiesProvider;

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/package-info.java renamed to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@
6666
* </code>
6767
* </pre>
6868
*/
69-
package com.google.cloud.errorreporting.spi.v1beta1;
69+
package com.google.cloud.errorreporting.v1beta1;

google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClientTest.java renamed to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.google.cloud.errorreporting.spi.v1beta1;
16+
package com.google.cloud.errorreporting.v1beta1;
1717

1818
import com.google.api.gax.grpc.ApiException;
1919
import com.google.api.gax.grpc.testing.MockGrpcService;

0 commit comments

Comments
 (0)