Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ public static class DefaultHttpTransportFactory implements HttpTransportFactory

@Override
public HttpTransport create() {
// Consider App Engine
if (ServiceOptions.getAppEngineAppId() != null) {
// Consider App Engine Standard
if (System.getProperty("com.google.appengine.runtime.version") != null
&& System.getenv("GAE_SERVICE") == null) {
try {
return new UrlFetchTransport();
} catch (Exception ignore) {
Expand Down
2 changes: 1 addition & 1 deletion testing/google-cloud-appengine-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3</version>
<version>3.5.1</version>

This comment was marked as spam.

<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.source.version}</source>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
<manual-scaling>
<instances>1</instances>
</manual-scaling>
<url-stream-handler>native</url-stream-handler>
</appengine-web-app>
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;

@WebServlet(name = "flex", value = "/test")

This comment was marked as spam.

public class GcjFlexTestServlet extends HttpServlet {
public class GaeGcjTestServlet extends HttpServlet {

private static final long serialVersionUID = 523885428311420041L;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright 2017 Google Inc. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.cloud.managed.test;

import java.io.IOException;
import java.io.PrintWriter;
import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@WebServlet(name = "hex", value = "/info")

This comment was marked as spam.

public class GaeInfoServlet extends HttpServlet {

private static final long serialVersionUID = -3598229312089602597L;

@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text");

PrintWriter out = resp.getWriter();
out.append("\nENVIRONMENT VARIABLES:\n\n");

Map<String, String> envVars = System.getenv();
for (Map.Entry<String, String> entry : envVars.entrySet()) {
out.append(entry.getKey()).append("=").append(entry.getValue()).append('\n');
}

out.append("\n\nSYSTEM PROPERTIES:\n\n");
System.getProperties().list(out);

out.close();
}
}