cloudendpoints
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎endpoints-framework/src/main/java/com/google/api/server/spi/config/jsonwriter/JacksonResourceSchemaProvider.java‎
Lines changed: 1 addition & 1 deletion b/‎endpoints-framework/src/main/java/com/google/api/server/spi/config/jsonwriter/JacksonResourceSchemaProvider.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎endpoints-framework/src/main/java/com/google/api/server/spi/swagger/SwaggerGenerator.java‎
Lines changed: 0 additions & 592 deletions b/‎endpoints-framework/src/main/java/com/google/api/server/spi/swagger/SwaggerGenerator.java‎
Lines changed: 0 additions & 592 deletions
diff --git a/‎endpoints-framework/src/test/java/com/google/api/server/spi/ConfiguredObjectMapperTest.java‎
Lines changed: 2 additions & 1 deletion b/‎endpoints-framework/src/test/java/com/google/api/server/spi/ConfiguredObjectMapperTest.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎endpoints-framework/src/test/java/com/google/api/server/spi/request/ServletRequestParamReaderTest.java‎
Lines changed: 1 addition & 1 deletion b/‎endpoints-framework/src/test/java/com/google/api/server/spi/request/ServletRequestParamReaderTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -11,6 +11,8 @@
 # generated files
 bin/
 gen/
+*/out/
+*/build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
@@ -128,7 +128,7 @@ private TypeToken<?> getPropertyType(TypeToken<?> beanType, Method readMethod, M
       }
     } else if (field != null) {
       return ApiAnnotationIntrospector.getSchemaType(
-          beanType.resolveType(field.getGenericType()), config);
+          beanType.resolveType(field.getAnnotated().getGenericType()), config);
     }
     return null;
   }
 
@@ -40,7 +40,7 @@
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import java.util.Map;
+import java.util.*;
 
 /** Unit tests for {@link ConfiguredObjectMapper}. */
 @RunWith(MockitoJUnitRunner.class)
@@ -75,6 +75,7 @@ public void setUp() throws Exception {
   private static void doModuleSetup(Module module, String name) {
     when(module.getModuleName()).thenReturn(name);
     when(module.version()).thenReturn(Version.unknownVersion());
+    when(module.getDependencies()).thenReturn(Collections.emptyList());
   }
 
   @Test
 
@@ -241,7 +241,7 @@ public void testReadNoParameters() throws Exception {
   public void testReadByteArrayParameter() throws Exception {
     Method method =
         TestEndpoint.class.getDeclaredMethod("doSomething", byte[].class);
-    Object[] params = readParameters("{\"bytes\":\"AQIDBA==\"}", method);
+    Object[] params = readParameters("{\"bytes\":\"AQIDBA\"}", method);
 
     assertEquals(1, params.length);
     assertThat((byte[]) params[0]).isEqualTo(new byte[]{1, 2, 3, 4});
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private TypeToken<?> getPropertyType(TypeToken<?> beanType, Method readMethod, M`
`128`	`128`	`}`
`129`	`129`	`} else if (field != null) {`
`130`	`130`	`return ApiAnnotationIntrospector.getSchemaType(`
`131`		`- beanType.resolveType(field.getGenericType()), config);`
	`131`	`+ beanType.resolveType(field.getAnnotated().getGenericType()), config);`
`132`	`132`	`}`
`133`	`133`	`return null;`
`134`	`134`	`}`