Skip to content

Commit 42727c0

Browse files
committed
Merge pull request #501 from ajkannan/fix-non-public-javadoc-types
Remove javadoc refs to non-public classes
2 parents 823f0de + edfb470 commit 42727c0

File tree

13 files changed

+75
-4
lines changed

13 files changed

+75
-4
lines changed

gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BaseTableInfo.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ public enum Type {
9494
private final Long expirationTime;
9595
private final Long lastModifiedTime;
9696

97+
/**
98+
* Base builder for tables.
99+
*
100+
* @param <T> the table type.
101+
* @param <B> the table builder.
102+
*/
97103
public abstract static class Builder<T extends BaseTableInfo, B extends Builder<T, B>> {
98104

99105
private String etag;

gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
* a table. Use {@link QueryJobInfo} for a job that runs a query.
3333
*
3434
* @see <a href="https://cloud.google.com/bigquery/docs/reference/v2/jobs">Jobs</a>
35+
*
36+
* @param <S> the statistics type.
3537
*/
3638
public abstract class JobInfo<S extends JobStatistics> implements Serializable {
3739

@@ -87,6 +89,13 @@ public enum WriteDisposition {
8789
private final S statistics;
8890
private final String userEmail;
8991

92+
/**
93+
* Base builder for jobs.
94+
*
95+
* @param <T> the job type.
96+
* @param <S> the job statistics type.
97+
* @param <B> the job builder.
98+
*/
9099
public abstract static class Builder<T extends JobInfo, S extends JobStatistics,
91100
B extends Builder<T, S, B>> {
92101

gcloud-java-core/src/main/java/com/google/gcloud/BaseService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
package com.google.gcloud;
1818

19+
/**
20+
* Base class for service objects.
21+
*
22+
* @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
23+
*/
1924
public abstract class BaseService<OptionsT extends ServiceOptions<?, ?, OptionsT>>
2025
implements Service<OptionsT> {
2126

gcloud-java-core/src/main/java/com/google/gcloud/Page.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
* }
4141
* page = page.nextPage();
4242
* }}</pre>
43+
*
44+
* @param <T> the value type that the page holds.
4345
*/
4446
public interface Page<T> {
4547

gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
/**
2727
* Base implementation for Google Cloud paginated results.
28+
*
29+
* @param <T> the value type that the page holds.
2830
*/
2931
public class PageImpl<T> implements Page<T>, Serializable {
3032

@@ -34,6 +36,11 @@ public class PageImpl<T> implements Page<T>, Serializable {
3436
private final Iterable<T> results;
3537
private final NextPageFetcher<T> pageFetcher;
3638

39+
/**
40+
* Interface for fetching the next page of results from the service.
41+
*
42+
* @param <T> the value type that the page holds.
43+
*/
3744
public interface NextPageFetcher<T> extends Serializable {
3845
Page<T> nextPage();
3946
}

gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
* X restorableObj = state.restore();
3434
* ...
3535
* }</pre>
36+
*
37+
* @param <T> the restorable object's type.
3638
*/
3739
public interface Restorable<T extends Restorable<T>> {
3840

gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
*
2323
* Implementations of this class must implement {@link java.io.Serializable} to ensure that the
2424
* state of a the object can be correctly serialized.
25+
*
26+
* @param <T> the restored object's type.
2527
*/
2628
public interface RestorableState<T extends Restorable<T>> {
2729

gcloud-java-core/src/main/java/com/google/gcloud/Service.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
package com.google.gcloud;
1818

19+
/**
20+
* Interface for service objects.
21+
*
22+
* @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
23+
*/
1924
public interface Service<OptionsT extends ServiceOptions<?, ?, OptionsT>> {
2025
OptionsT options();
2126
}

gcloud-java-core/src/main/java/com/google/gcloud/ServiceFactory.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
/**
2020
* A base interface for all service factories.
2121
*
22-
* Implementation must provide a public no-arg constructor.
22+
* <p>Implementation must provide a public no-arg constructor.
2323
* Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
24+
*
25+
* @param <ServiceT> the service subclass.
26+
* @param <ServiceOptionsT> the {@code ServiceOptions} subclass corresponding to the service.
2427
*/
2528
@SuppressWarnings("rawtypes")
2629
public interface ServiceFactory<ServiceT extends Service, ServiceOptionsT extends ServiceOptions> {

gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@
5353
import java.util.regex.Matcher;
5454
import java.util.regex.Pattern;
5555

56+
/**
57+
* Abstract class representing service options.
58+
*
59+
* @param <ServiceT> the service subclass.
60+
* @param <ServiceRpcT> the spi-layer class corresponding to the service.
61+
* @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
62+
*/
5663
public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, ServiceRpcT,
5764
OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>> implements Serializable {
5865

@@ -150,6 +157,14 @@ private Object readResolve() throws ObjectStreamException {
150157
}
151158
}
152159

160+
/**
161+
* Builder for {@code ServiceOptions}.
162+
*
163+
* @param <ServiceT> the service subclass.
164+
* @param <ServiceRpcT> the spi-layer class corresponding to the service.
165+
* @param <OptionsT> the {@code ServiceOptions} subclass corresponding to the service.
166+
* @param <B> the {@code ServiceOptions} builder.
167+
*/
153168
protected abstract static class Builder<ServiceT extends Service<OptionsT>, ServiceRpcT,
154169
OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>,
155170
B extends Builder<ServiceT, ServiceRpcT, OptionsT, B>> {

0 commit comments

Comments
 (0)