Skip to content

Commit dd10f00

Browse files
sav007sav007
authored
Reorganize api-module (#1985)
* Reorganize api-module As a prerequisite for migrating `apollo-api` module to Kotlin. - Extract http cache related API classes to separate module `apollo-http-cache-api` - Move several classes under `internal` package as they shouldn't have been public at first place (`JsonDataException`, `JsonEncodingException`, `InputFieldMarshaller`, `InputFieldWriter`, `ResponseFieldMapper`, `ResponseFieldMarshaller`, `ResponseReader`, `ResponseWriter`) - Move couple classes in `apollo-api` module under `api` subpackage (`ApolloLogger`, `QueryDocumentMinifier`, `CustomTypeAdapter`, `CustomTypeValue`, `ScalarTypeAdapters`) * Update generated test fixtures * Add missing api dependency * Bump version to 1.4.0-SNAPSHOT Fix test * Checktstyle
1 parent fce008e commit dd10f00

File tree

252 files changed

+1069
-1096
lines changed

Some content is hidden

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

252 files changed

+1069
-1096
lines changed

‎.idea/codeStyles/Project.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apollo-api/src/main/java/com/apollographql/apollo/response/CustomTypeAdapter.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/CustomTypeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apollographql.apollo.response;
1+
package com.apollographql.apollo.api;
22

33
import org.jetbrains.annotations.NotNull;
44

‎apollo-api/src/main/java/com/apollographql/apollo/response/CustomTypeValue.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/CustomTypeValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apollographql.apollo.response;
1+
package com.apollographql.apollo.api;
22

33
import java.util.List;
44
import java.util.Map;

‎apollo-api/src/main/java/com/apollographql/apollo/api/GraphqlFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.apollographql.apollo.api;
22

3+
import com.apollographql.apollo.api.internal.ResponseFieldMarshaller;
4+
35
/**
46
* Represents a GraphQL fragment
57
*/
@@ -8,7 +10,7 @@ public interface GraphqlFragment {
810
/**
911
* Returns marshaller to serialize fragment data
1012
*
11-
* @return {@link ResponseFieldMarshaller} to serialize fragment data
13+
* @return {@link com.apollographql.apollo.api.internal.ResponseFieldMarshaller} to serialize fragment data
1214
*/
1315
ResponseFieldMarshaller marshaller();
1416
}

‎apollo-api/src/main/java/com/apollographql/apollo/api/InputType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.apollographql.apollo.api;
22

3+
import com.apollographql.apollo.api.internal.InputFieldMarshaller;
34
import org.jetbrains.annotations.NotNull;
45

56
public interface InputType {

‎apollo-api/src/main/java/com/apollographql/apollo/api/Operation.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.apollographql.apollo.api;
22

3+
import com.apollographql.apollo.api.internal.InputFieldMarshaller;
4+
import com.apollographql.apollo.api.internal.InputFieldWriter;
5+
import com.apollographql.apollo.api.internal.ResponseFieldMapper;
6+
import com.apollographql.apollo.api.internal.ResponseFieldMarshaller;
37
import com.apollographql.apollo.api.internal.json.InputFieldJsonWriter;
48
import com.apollographql.apollo.api.internal.json.JsonWriter;
5-
import com.apollographql.apollo.response.ScalarTypeAdapters;
69
import okio.Buffer;
710
import okio.BufferedSource;
811
import org.jetbrains.annotations.NotNull;
@@ -77,7 +80,7 @@ interface Data {
7780
*
7881
* @return {@link ResponseFieldMarshaller} to serialize operation data
7982
*/
80-
ResponseFieldMarshaller marshaller();
83+
com.apollographql.apollo.api.internal.ResponseFieldMarshaller marshaller();
8184
}
8285

8386
/**
@@ -107,7 +110,7 @@ protected Variables() {
107110
}
108111

109112
@NotNull public InputFieldMarshaller marshaller() {
110-
return new InputFieldMarshaller() {
113+
return new com.apollographql.apollo.api.internal.InputFieldMarshaller() {
111114
@Override public void marshal(InputFieldWriter writer) {
112115
}
113116
};

‎apollo-api/src/main/java/com/apollographql/apollo/api/OperationDataExtensions.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
package com.apollographql.apollo.api
66

7-
import com.apollographql.apollo.response.ScalarTypeAdapters
8-
97
/**
108
* Serializes GraphQL operation response data into its equivalent Json representation.
119
* For example:

‎apollo-api/src/main/java/com/apollographql/apollo/api/OperationDataJsonSerializer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.apollographql.apollo.api;
22

33
import com.apollographql.apollo.api.internal.SimpleResponseWriter;
4-
import com.apollographql.apollo.response.ScalarTypeAdapters;
54
import org.jetbrains.annotations.NotNull;
65

76
import java.io.IOException;

‎apollo-api/src/main/java/com/apollographql/apollo/response/ScalarTypeAdapters.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/ScalarTypeAdapters.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
package com.apollographql.apollo.response;
1+
package com.apollographql.apollo.api;
2+
3+
import org.jetbrains.annotations.NotNull;
24

35
import java.util.Collections;
46
import java.util.HashMap;
57
import java.util.LinkedHashMap;
68
import java.util.List;
79
import java.util.Map;
810

9-
import com.apollographql.apollo.api.FileUpload;
10-
import com.apollographql.apollo.api.ScalarType;
11-
import org.jetbrains.annotations.NotNull;
12-
1311
import static com.apollographql.apollo.api.internal.Utils.checkNotNull;
1412

1513
public final class ScalarTypeAdapters {

‎apollo-api/src/main/java/com/apollographql/apollo/internal/ApolloLogger.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/ApolloLogger.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package com.apollographql.apollo.internal;
1+
package com.apollographql.apollo.api.internal;
22

33
import com.apollographql.apollo.Logger;
4-
import com.apollographql.apollo.api.internal.Optional;
5-
64
import org.jetbrains.annotations.NotNull;
75
import org.jetbrains.annotations.Nullable;
86

‎apollo-api/src/main/java/com/apollographql/apollo/api/InputFieldMarshaller.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/InputFieldMarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apollographql.apollo.api;
1+
package com.apollographql.apollo.api.internal;
22

33
import java.io.IOException;
44

‎apollo-api/src/main/java/com/apollographql/apollo/api/InputFieldWriter.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/InputFieldWriter.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.apollographql.apollo.api;
2-
3-
import java.io.IOException;
4-
import java.util.Map;
1+
package com.apollographql.apollo.api.internal;
52

3+
import com.apollographql.apollo.api.ScalarType;
64
import org.jetbrains.annotations.NotNull;
75
import org.jetbrains.annotations.Nullable;
86

7+
import java.io.IOException;
8+
import java.util.Map;
9+
910
public interface InputFieldWriter {
1011
void writeString(@NotNull String fieldName, @Nullable String value) throws IOException;
1112

‎apollo-api/src/main/java/com/apollographql/apollo/internal/QueryDocumentMinifier.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/QueryDocumentMinifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apollographql.apollo.internal;
1+
package com.apollographql.apollo.api.internal;
22

33
import org.jetbrains.annotations.NotNull;
44

‎apollo-api/src/main/java/com/apollographql/apollo/api/ResponseFieldMapper.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/ResponseFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apollographql.apollo.api;
1+
package com.apollographql.apollo.api.internal;
22

33
/**
44
* ResponseFieldMapper is an abstraction for mapping the response data returned by

‎apollo-api/src/main/java/com/apollographql/apollo/api/ResponseFieldMarshaller.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/ResponseFieldMarshaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apollographql.apollo.api;
1+
package com.apollographql.apollo.api.internal;
22

33
public interface ResponseFieldMarshaller {
44
void marshal(ResponseWriter writer);

‎apollo-api/src/main/java/com/apollographql/apollo/api/ResponseReader.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/ResponseReader.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package com.apollographql.apollo.api;
1+
package com.apollographql.apollo.api.internal;
2+
3+
import com.apollographql.apollo.api.ResponseField;
4+
import com.apollographql.apollo.api.ScalarType;
25

36
import java.util.List;
47

‎apollo-api/src/main/java/com/apollographql/apollo/api/ResponseWriter.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/ResponseWriter.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package com.apollographql.apollo.api;
2-
3-
import java.util.List;
1+
package com.apollographql.apollo.api.internal;
42

3+
import com.apollographql.apollo.api.ResponseField;
4+
import com.apollographql.apollo.api.ScalarType;
55
import org.jetbrains.annotations.NotNull;
66
import org.jetbrains.annotations.Nullable;
77

8+
import java.util.List;
9+
810
public interface ResponseWriter {
911
void writeString(@NotNull ResponseField field, @Nullable String value);
1012

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/SimpleOperationResponseParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.apollographql.apollo.api.Error;
44
import com.apollographql.apollo.api.Operation;
55
import com.apollographql.apollo.api.Response;
6-
import com.apollographql.apollo.response.ScalarTypeAdapters;
6+
import com.apollographql.apollo.api.ScalarTypeAdapters;
77
import com.apollographql.apollo.api.internal.json.BufferedSourceJsonReader;
88
import com.apollographql.apollo.api.internal.json.ResponseJsonStreamReader;
99
import okio.BufferedSource;

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/SimpleResponseReader.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.apollographql.apollo.api.internal;
22

3+
import com.apollographql.apollo.api.CustomTypeAdapter;
4+
import com.apollographql.apollo.api.CustomTypeValue;
35
import com.apollographql.apollo.api.Operation;
46
import com.apollographql.apollo.api.ResponseField;
5-
import com.apollographql.apollo.api.ResponseReader;
67
import com.apollographql.apollo.api.ScalarType;
7-
import com.apollographql.apollo.response.CustomTypeAdapter;
8-
import com.apollographql.apollo.response.CustomTypeValue;
9-
import com.apollographql.apollo.response.ScalarTypeAdapters;
8+
import com.apollographql.apollo.api.ScalarTypeAdapters;
109
import org.jetbrains.annotations.NotNull;
1110

1211
import java.math.BigDecimal;

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/SimpleResponseWriter.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.apollographql.apollo.api.internal;
22

3+
import com.apollographql.apollo.api.CustomTypeAdapter;
4+
import com.apollographql.apollo.api.CustomTypeValue;
35
import com.apollographql.apollo.api.ResponseField;
4-
import com.apollographql.apollo.api.ResponseFieldMarshaller;
5-
import com.apollographql.apollo.api.ResponseWriter;
66
import com.apollographql.apollo.api.ScalarType;
7+
import com.apollographql.apollo.api.ScalarTypeAdapters;
78
import com.apollographql.apollo.api.internal.json.JsonWriter;
8-
import com.apollographql.apollo.response.CustomTypeAdapter;
9-
import com.apollographql.apollo.response.CustomTypeValue;
10-
import com.apollographql.apollo.response.ScalarTypeAdapters;
119
import okio.Buffer;
1210
import org.jetbrains.annotations.NotNull;
1311
import org.jetbrains.annotations.Nullable;

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/json/BufferedSourceJsonReader.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
*/
1616
package com.apollographql.apollo.api.internal.json;
1717

18-
import com.apollographql.apollo.json.JsonDataException;
19-
import com.apollographql.apollo.json.JsonEncodingException;
20-
21-
import java.io.EOFException;
22-
import java.io.IOException;
23-
2418
import okio.Buffer;
2519
import okio.BufferedSource;
2620
import okio.ByteString;
2721

22+
import java.io.EOFException;
23+
import java.io.IOException;
24+
2825
/** TODO add Modifications copyright **/
2926
public final class BufferedSourceJsonReader extends JsonReader {
3027
private static final long MIN_INCOMPLETE_INTEGER = Long.MIN_VALUE / 10;

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/json/InputFieldJsonWriter.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package com.apollographql.apollo.api.internal.json;
22

3-
import com.apollographql.apollo.api.InputFieldMarshaller;
4-
import com.apollographql.apollo.api.InputFieldWriter;
3+
import com.apollographql.apollo.api.CustomTypeAdapter;
4+
import com.apollographql.apollo.api.CustomTypeValue;
55
import com.apollographql.apollo.api.ScalarType;
6-
import com.apollographql.apollo.response.CustomTypeAdapter;
7-
import com.apollographql.apollo.response.CustomTypeValue;
8-
import com.apollographql.apollo.response.ScalarTypeAdapters;
6+
import com.apollographql.apollo.api.ScalarTypeAdapters;
7+
import com.apollographql.apollo.api.internal.InputFieldMarshaller;
8+
import com.apollographql.apollo.api.internal.InputFieldWriter;
9+
import org.jetbrains.annotations.NotNull;
10+
import org.jetbrains.annotations.Nullable;
911

1012
import java.io.IOException;
1113
import java.util.Map;
1214

13-
import org.jetbrains.annotations.NotNull;
14-
import org.jetbrains.annotations.Nullable;
15-
1615
import static com.apollographql.apollo.api.internal.Utils.checkNotNull;
1716

1817
public class InputFieldJsonWriter implements InputFieldWriter {

‎apollo-api/src/main/java/com/apollographql/apollo/json/JsonDataException.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/json/JsonDataException.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.apollographql.apollo.json;
16+
package com.apollographql.apollo.api.internal.json;
1717

1818
/**
1919
* Thrown when the data in a JSON document doesn't match the data expected by the caller. For

‎apollo-api/src/main/java/com/apollographql/apollo/json/JsonEncodingException.java renamed to ‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/json/JsonEncodingException.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.apollographql.apollo.json;
16+
package com.apollographql.apollo.api.internal.json;
1717

1818
import java.io.IOException;
1919

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/json/JsonReader.java

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

1717
package com.apollographql.apollo.api.internal.json;
1818

19-
import com.apollographql.apollo.json.JsonDataException;
20-
2119
import java.io.Closeable;
2220
import java.io.IOException;
2321

‎apollo-api/src/main/java/com/apollographql/apollo/api/internal/json/JsonWriter.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
*/
1616
package com.apollographql.apollo.api.internal.json;
1717

18-
import com.apollographql.apollo.json.JsonDataException;
18+
import okio.BufferedSink;
19+
import org.jetbrains.annotations.Nullable;
1920

2021
import java.io.Closeable;
2122
import java.io.Flushable;
2223
import java.io.IOException;
2324

24-
import org.jetbrains.annotations.Nullable;
25-
26-
import okio.BufferedSink;
27-
2825
import static com.apollographql.apollo.api.internal.json.JsonScope.EMPTY_OBJECT;
2926
import static com.apollographql.apollo.api.internal.json.JsonScope.NONEMPTY_OBJECT;
3027

‎apollo-api/src/test/java/com/apollographql/apollo/api/internal/SimpleResponseReaderTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package com.apollographql.apollo.api.internal;
22

3+
import com.apollographql.apollo.api.CustomTypeAdapter;
4+
import com.apollographql.apollo.api.CustomTypeValue;
35
import com.apollographql.apollo.api.Operation;
46
import com.apollographql.apollo.api.OperationName;
57
import com.apollographql.apollo.api.Response;
68
import com.apollographql.apollo.api.ResponseField;
7-
import com.apollographql.apollo.api.ResponseFieldMapper;
8-
import com.apollographql.apollo.api.ResponseReader;
99
import com.apollographql.apollo.api.ScalarType;
10-
import com.apollographql.apollo.response.CustomTypeAdapter;
11-
import com.apollographql.apollo.response.CustomTypeValue;
12-
import com.apollographql.apollo.response.ScalarTypeAdapters;
10+
import com.apollographql.apollo.api.ScalarTypeAdapters;
1311
import okio.BufferedSource;
1412
import org.jetbrains.annotations.NotNull;
1513
import org.junit.Test;

‎apollo-api/src/test/java/com/apollographql/apollo/api/internal/json/InputFieldJsonWriterTest.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.apollographql.apollo.api.internal.json;
22

3-
import com.apollographql.apollo.api.InputFieldMarshaller;
4-
import com.apollographql.apollo.api.InputFieldWriter;
3+
import com.apollographql.apollo.api.CustomTypeAdapter;
4+
import com.apollographql.apollo.api.CustomTypeValue;
55
import com.apollographql.apollo.api.ScalarType;
6+
import com.apollographql.apollo.api.ScalarTypeAdapters;
7+
import com.apollographql.apollo.api.internal.InputFieldMarshaller;
8+
import com.apollographql.apollo.api.internal.InputFieldWriter;
69
import com.apollographql.apollo.api.internal.UnmodifiableMapBuilder;
7-
import com.apollographql.apollo.response.CustomTypeAdapter;
8-
import com.apollographql.apollo.response.CustomTypeValue;
9-
import com.apollographql.apollo.response.ScalarTypeAdapters;
10-
10+
import okio.Buffer;
11+
import org.jetbrains.annotations.NotNull;
1112
import org.junit.Before;
1213
import org.junit.Test;
1314

@@ -19,10 +20,6 @@
1920
import java.util.List;
2021
import java.util.Map;
2122

22-
import org.jetbrains.annotations.NotNull;
23-
24-
import okio.Buffer;
25-
2623
import static com.google.common.truth.Truth.assertThat;
2724

2825
public class InputFieldJsonWriterTest {

‎apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/FragmentsResponseMapperBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.apollographql.apollo.compiler
22

3-
import com.apollographql.apollo.api.ResponseFieldMapper
4-
import com.apollographql.apollo.api.ResponseReader
3+
import com.apollographql.apollo.api.internal.ResponseFieldMapper
4+
import com.apollographql.apollo.api.internal.ResponseReader
55
import com.apollographql.apollo.compiler.ir.CodeGenerationContext
66
import com.squareup.javapoet.*
77
import javax.lang.model.element.Modifier

‎apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/InputFieldSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.apollographql.apollo.compiler
22

3-
import com.apollographql.apollo.api.InputFieldWriter
3+
import com.apollographql.apollo.api.internal.InputFieldWriter
44
import com.apollographql.apollo.compiler.ir.CodeGenerationContext
55
import com.squareup.javapoet.*
66
import java.io.IOException

0 commit comments

Comments
 (0)