Skip to content

Commit c746eb2

Browse files
lachlan-robertslachlan-roberts
committed
Merge remote-tracking branch 'origin/main' into DevAppServerApiProxyEnv
2 parents ef5a456 + 3c5b238 commit c746eb2

27 files changed

Lines changed: 50 additions & 616 deletions

File tree

‎api/src/main/java/com/google/appengine/api/datastore/AsyncDatastoreServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.google.appengine.api.datastore.Query.FilterOperator;
2828
import com.google.appengine.api.utils.FutureWrapper;
2929
import com.google.apphosting.api.ApiProxy.ApiConfig;
30-
import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
30+
import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
3131
import com.google.apphosting.datastore.DatastoreV3Pb;
3232
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
3333
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;

‎api_dev/src/main/java/com/google/appengine/api/blobstore/dev/LocalBlobstoreService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.google.appengine.tools.development.LocalRpcService;
3434
import com.google.appengine.tools.development.LocalServiceContext;
3535
import com.google.apphosting.api.ApiProxy;
36-
import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
36+
import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
3737
import com.google.apphosting.utils.config.GenerationDirectory;
3838
import com.google.auto.service.AutoService;
3939
import com.google.common.io.ByteStreams;

‎api_dev/src/main/java/com/google/appengine/api/datastore/dev/ApiProxyDatastoreV3.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
import com.google.appengine.api.taskqueue.TaskQueuePb.TaskQueueBulkAddRequest;
2020
import com.google.apphosting.api.ApiProxy;
21-
import com.google.apphosting.base.protos.api.ApiBasePb.Integer64Proto;
22-
import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
23-
import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
2421
import com.google.apphosting.datastore.DatastoreV3Pb;
2522
import com.google.apphosting.datastore.DatastoreV3Pb.CompositeIndices;
2623
import com.google.apphosting.datastore.DatastoreV3Pb.Cursor;
@@ -29,6 +26,9 @@
2926
import com.google.apphosting.datastore.DatastoreV3Pb.PutRequest;
3027
import com.google.apphosting.datastore.DatastoreV3Pb.Query;
3128
import com.google.apphosting.datastore.DatastoreV3Pb.Transaction;
29+
import com.google.apphosting.api.proto2api.ApiBasePb.Integer64Proto;
30+
import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
31+
import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
3232
import com.google.protobuf.InvalidProtocolBufferException;
3333
import com.google.protobuf.MessageLite;
3434
import com.google.protobuf.Parser;

‎api_dev/src/main/java/com/google/appengine/api/datastore/dev/DatastoreV3Impl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.appengine.api.taskqueue.TaskQueuePb.TaskQueueBulkAddRequest;
2020
import com.google.appengine.tools.development.LocalRpcService.Status;
21-
import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
21+
import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
2222
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
2323
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;
2424
import com.google.apphosting.datastore.DatastoreV3Pb.BeginTransactionRequest;

‎api_dev/src/main/java/com/google/appengine/api/datastore/dev/LocalDatastoreService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
import com.google.appengine.tools.development.LocalRpcService.Status;
4343
import com.google.appengine.tools.development.LocalServiceContext;
4444
import com.google.apphosting.api.ApiProxy.ApplicationException;
45-
import com.google.apphosting.base.protos.api.ApiBasePb.Integer64Proto;
46-
import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
47-
import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
45+
import com.google.apphosting.api.proto2api.ApiBasePb.Integer64Proto;
46+
import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
47+
import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
4848
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
4949
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;
5050
import com.google.apphosting.datastore.DatastoreV3Pb.BeginTransactionRequest;

‎api_dev/src/main/java/com/google/appengine/api/datastore/dev/LocalDatastoreV3Service.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import com.google.appengine.tools.development.LatencyPercentiles;
2222
import com.google.appengine.tools.development.LocalRpcService;
2323
import com.google.apphosting.api.ApiProxy;
24-
import com.google.apphosting.base.protos.api.ApiBasePb.Integer64Proto;
25-
import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
26-
import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
24+
import com.google.apphosting.api.proto2api.ApiBasePb.Integer64Proto;
25+
import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
26+
import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
2727
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
2828
import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;
2929
import com.google.apphosting.datastore.DatastoreV3Pb.BeginTransactionRequest;

‎api_dev/src/main/java/com/google/appengine/api/mail/dev/LocalMailService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.google.appengine.tools.development.LocalRpcService;
2626
import com.google.appengine.tools.development.LocalServiceContext;
2727
import com.google.apphosting.api.ApiProxy;
28-
import com.google.apphosting.base.protos.api.ApiBasePb;
28+
import com.google.apphosting.api.proto2api.ApiBasePb;
2929
import com.google.auto.service.AutoService;
3030
import com.google.common.base.Ascii;
3131
import com.google.common.collect.ImmutableSet;

‎api_dev/src/test/java/com/google/appengine/api/images/dev/LocalBlobImageServletTest.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
3434
import com.google.appengine.tools.development.testing.LocalImagesServiceTestConfig;
3535
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
36-
import com.google.common.base.StandardSystemProperty;
3736
import com.google.common.io.Resources;
3837
import com.google.common.truth.Expect;
3938
import java.io.File;
@@ -112,11 +111,9 @@ public void tearDown() {
112111
* @return The file contents as a byte array.
113112
*/
114113
private byte[] readImage(String filename) throws IOException {
115-
URL resource = null;
116-
if (!isJDK8()) {
117-
String jdk11Name = newerJDKFileName(filename);
118-
resource = getClass().getResource("testdata/" + jdk11Name);
119-
}
114+
String jdk11Name = newerJDKFileName(filename);
115+
URL resource = getClass().getResource("testdata/" + jdk11Name);
116+
120117
if (resource == null) {
121118
resource = getClass().getResource("testdata/" + filename);
122119
}
@@ -201,7 +198,7 @@ private void runTransform(String url, String expectedImageFile) throws Exception
201198
LocalBlobImageServlet.Image image =
202199
servlet.transformImage(LocalBlobImageServlet.ParsedUrl.createParsedUrl(url));
203200
byte[] expectedImage = readImage(expectedImageFile);
204-
if (!Arrays.equals(image.getImage(), expectedImage) && !isJDK8()) {
201+
if (!Arrays.equals(image.getImage(), expectedImage)) {
205202
File jdkFile = new File(TESTDATA, newerJDKFileName(expectedImageFile));
206203
if (!jdkFile.exists() && generateGoldenFiles != null) {
207204
generateGoldenFiles.accept(jdkFile, image.getImage());
@@ -210,10 +207,6 @@ private void runTransform(String url, String expectedImageFile) throws Exception
210207
expect.that(image.getImage()).isEqualTo(expectedImage);
211208
}
212209

213-
private static boolean isJDK8() {
214-
return StandardSystemProperty.JAVA_SPECIFICATION_VERSION.value().equals("1.8");
215-
}
216-
217210
private static final String newerJDKFileName(String filename) {
218211
// For all JDK non Java8, the files containing the name jdk11 are working.
219212
return filename.replaceAll("(?!-jdk11)\\.(png|jpg)$", "-jdk11.$1");

‎api_dev/src/test/java/com/google/appengine/api/images/dev/LocalImagesServiceTest.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import com.google.appengine.tools.development.testing.LocalImagesServiceTestConfig;
5252
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
5353
import com.google.apphosting.api.ApiProxy;
54-
import com.google.common.base.StandardSystemProperty;
5554
import com.google.common.io.Resources;
5655
import com.google.protobuf.ByteString;
5756
import java.io.IOException;
@@ -487,29 +486,21 @@ private void compareImage(String filename, byte[] responseImage) throws IOExcept
487486
assertThat(responseImage).isEqualTo(expectedImage);
488487
}
489488

490-
private static boolean isJDK8() {
491-
return StandardSystemProperty.JAVA_SPECIFICATION_VERSION.value().equals("1.8");
492-
}
493-
494489
/**
495490
* We have 2 test files per image: one for jdk8 and the other one (11) used by jdk 11,17 and above
496491
*/
497492
private static final String jdk11(String filename) {
498493
return filename.replaceAll("(?!-jdk11)\\.(png|jpg)$", "-jdk11.$1");
499494
}
500495

501-
502496
/**
503497
* Reads in an image and returns its contents as a byte array.
504498
* @param filename Name of the file to be opened.
505499
* @return The file contents as a byte array.
506500
*/
507501
private byte[] readImage(String filename) throws IOException {
508-
URL resource = null;
509-
if (!isJDK8()) {
510-
String jdk11Name = jdk11(filename);
511-
resource = getClass().getResource("testdata/" + jdk11Name);
512-
}
502+
String jdk11Name = jdk11(filename);
503+
URL resource = getClass().getResource("testdata/" + jdk11Name);
513504
if (resource == null) {
514505
resource = getClass().getResource("testdata/" + filename);
515506
}

‎applications/springboot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
<maven.deploy.skip>true</maven.deploy.skip>
3838
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
39-
<spring.boot.version>3.5.7</spring.boot.version>
39+
<spring.boot.version>3.5.8</spring.boot.version>
4040
<maven.compiler.target>1.8</maven.compiler.target>
4141
<maven.compiler.source>1.8</maven.compiler.source>
4242
</properties>

0 commit comments

Comments
 (0)