Increase the version number for the development of the next release. (#54)

* Increase the version number for the development of the next release.

* Set Travis CI Java version to openjdk8

This framework is intended to work with Java 8 on Google App Engine
Standard. Newer versions are not supported.

* Make platform discovery hermetic in unit tests.

This fixes failing Travis CI tests. Now Travis moved to GCE and that
environment is reflected in ReportRequest labels in ControlFilter tests.
Unit tests shouldn't probe the execution environment, so a hermetic HTTP
transport to check for "Metadata Server" existence is passed to the
ControlFilter constructor.

* Set version to 1.0.12 (drop -SNAPSHOT)

Author: tomboc

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+jdk: openjdk8
 install: ./gradlew assemble -x :endpoints-management-control-appengine-all:assemble -x :endpoints-management-control-all:assemble
 script: ./gradlew check -x :endpoints-management-control-appengine-all:check -x :endpoints-management-control-all:check
 after_success:

endpoints-control/src/test/java/com/google/api/control/ControlFilterTest.java

@@ -148,22 +148,22 @@ public void setUp() {
 
   @Test
   public void shouldCallTheChainIfThereIsNoClient() throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(null, "aProjectId", testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(null, "aProjectId", testTicker, testClock, new MetadataTransport(false));
     f.doFilter(request, response, chain);
     verify(chain).doFilter(request, response);
   }
 
   @Test
   public void shouldNotUseTheClientWithoutAProjectId() throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, null, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, null, testTicker, testClock, new MetadataTransport(false));
     f.doFilter(request, response, chain);
     verify(chain).doFilter(request, response);
     verify(client, never()).check(capturedCheck.capture());
   }
 
   @Test
   public void shouldNotUseTheClientIfThereIsNoMethodInfo() throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     when(request.getAttribute(ConfigFilter.METHOD_INFO_ATTRIBUTE)).thenReturn(null);
     f.doFilter(request, response, chain);
     verify(chain).doFilter(request, response);
@@ -177,7 +177,7 @@ public void shouldUseTheDefaultLocation() throws IOException, ServletException {
     mockRequestAndResponse();
     when(client.check(any(CheckRequest.class))).thenReturn(checkResponse);
 
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     f.doFilter(request, response, chain);
     verify(client, times(1)).report(capturedReport.capture());
     ReportRequest aReport = capturedReport.getValue();
@@ -199,7 +199,7 @@ public void shouldSetBackendLatency() throws IOException, ServletException {
     mockRequestAndResponse();
     when(client.check(any(CheckRequest.class))).thenReturn(checkResponse);
 
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     f.doFilter(request, response, chain);
     verify(client, times(1)).report(capturedReport.capture());
     ReportRequest aReport = capturedReport.getValue();
@@ -218,7 +218,7 @@ public void shouldSetBackendLatency() throws IOException, ServletException {
 
   @Test
   public void shouldUseTheClientIfConfiguredOk() throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     mockRequestAndResponse();
     when(client.check(any(CheckRequest.class))).thenReturn(checkResponse);
 
@@ -250,7 +250,7 @@ public void shouldUseTheClientIfConfiguredOk() throws IOException, ServletExcept
   public void shouldSendTheDefaultApiKeyIfPresent() throws IOException, ServletException {
     String[] defaultKeyNames = {"key", "api_key"};
     String testApiKey = "defaultApiKey";
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     for (String defaultKeyName : defaultKeyNames) {
       mockRequestAndResponse();
       when(request.getParameter(defaultKeyName)).thenReturn(testApiKey);
@@ -292,7 +292,7 @@ public void shouldSendTheDefaultApiKeyIfPresent() throws IOException, ServletExc
   @Test
   public void shouldSendAReportButNotInvokeTheChainIfTheCheckFails()
       throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
 
     // Fail because the project got deleted
     CheckResponse deleted = CheckResponse
@@ -335,7 +335,7 @@ public void shouldSendAReportButNotInvokeTheChainIfTheCheckFails()
   public void shouldSendAReportButNotInvokeTheChainIfTheCheckFailsOnBadApiKey()
       throws IOException, ServletException {
     String testApiKey = "defaultApiKey";
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
 
     // Fail because the project got deleted
     CheckResponse deleted = CheckResponse
@@ -386,7 +386,7 @@ public void shouldSendAReportButNotInvokeTheChainIfTheCheckFailsOnBadApiKey()
   @Test
   public void shouldSendAReportAndInvokeTheChainIfTheCheckErrors()
       throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
 
     // Return null from check to indicate that transport fail occurred
     mockRequestAndResponse();
@@ -419,15 +419,15 @@ public void shouldSendAReportAndInvokeTheChainIfTheCheckErrors()
 
   @Test
   public void shouldStopTheClientWhenDestroyed() throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     f.destroy();
     verify(client, times(1)).stop();
   }
 
   @Test
   public void shouldSendAReportButNotInvokeTheChainWhenNeededApiKeyIsNotProvided()
       throws IOException, ServletException {
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
 
     // Fail because the api key is needed but no provided
     mockRequestAndResponse();
@@ -462,7 +462,7 @@ public void shouldSendAReportButNotInvokeTheChainWhenNeededApiKeyIsNotProvided()
   public void shouldSucceedWhenANeededApiKeyIsPresent() throws IOException, ServletException {
     String[] defaultKeyNames = {"key", "api_key"};
     String testApiKey = "defaultApiKey";
-    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, null);
+    ControlFilter f = new ControlFilter(client, TEST_PROJECT_ID, testTicker, testClock, new MetadataTransport(false));
     info.setAllowUnregisteredCalls(false); // the means that the API key is necessary
 
     for (String defaultKeyName : defaultKeyNames) {

gradle.properties

@@ -17,7 +17,7 @@
 sourceCompatibility=1.7
 targetCompatibility=1.7
 
-version = 1.0.11
+version = 1.0.12
 appengineSdkVersion = 1.9.56
 autoValueVersion = 1.1
 bouncycastleVersion = 1.54