add additional models for nullsafe and biabduction

Makefile.config

@@ -96,11 +96,18 @@ GUAVA_JAR = $(DEPENDENCIES_DIR)/java/guava/guava-23.0.jar
 INFER_ANNOTATIONS_JAR = $(ANNOTATIONS_DIR)/annotations.jar
 JACKSON_JAR = $(DEPENDENCIES_DIR)/java/jackson/jackson-2.2.3.jar
 JSR_305_JAR = $(DEPENDENCIES_DIR)/java/jsr-305/jsr305.jar
+COMMONS_JAR = $(DEPENDENCIES_DIR)/java/commons/commons-lang-2.6.jar
+COMMONS3_JAR = $(DEPENDENCIES_DIR)/java/commons/commons-lang3-3.0.jar
+LOMBOK_JAR = $(DEPENDENCIES_DIR)/java/lombok/lombok-1.18.20.jar
+S3_JAR = $(DEPENDENCIES_DIR)/java/aws/s3-abi.jar
+KMS_JAR = $(DEPENDENCIES_DIR)/java/aws/kms-abi.jar
+DDB_JAR = $(DEPENDENCIES_DIR)/java/aws/ddb-abi.jar
 
 JAVA_MODELS_JAR = $(LIB_DIR)/java/models.jar
 
 JAVA_DEPS_NO_MODELS = \
   $(ANDROID_JAR) $(GUAVA_JAR) $(JACKSON_JAR) $(JSR_305_JAR) $(INFER_ANNOTATIONS_JAR) \
+  $(COMMONS_JAR) $(COMMONS3_JAR) $(LOMBOK_JAR) \
   $(INFER_BIN)
 
 JAVA_DEPS = $(JAVA_DEPS_NO_MODELS) $(JAVA_MODELS_JAR) $(MODELS_RESULTS_FILE)

infer/models/Makefile

@@ -19,7 +19,7 @@ JAVA_MODELS_OUT = java/models
 MODELS_JAR = models.jar
 
 JAVA_SOURCES = $(shell find $(JAVA_BUILTINS_DIR) $(JAVA_MODELS_DIR) -name "*.java")
-JAVA_MODELS_CLASSPATH = $(ANDROID_JAR):$(GUAVA_JAR):$(JACKSON_JAR):$(JSR_305_JAR):$(INFER_ANNOTATIONS_JAR)
+JAVA_MODELS_CLASSPATH = $(ANDROID_JAR):$(GUAVA_JAR):$(JACKSON_JAR):$(JSR_305_JAR):$(INFER_ANNOTATIONS_JAR):$(COMMONS_JAR):$(COMMONS3_JAR):$(LOMBOK_JAR):$(S3_JAR):$(DDB_JAR):$(KMS_JAR)
 JAVAC_OPTIONS = -bootclasspath $(ANDROID_JAR) -d $(JAVA_MODELS_OUT) -classpath $(JAVA_MODELS_CLASSPATH) \
 	$(JAVA_SOURCES) -source 7 -target 7
 

infer/models/java/src/com/amazonaws/AmazonClientException.java

@@ -0,0 +1,5 @@
+package com.amazonaws;
+
+public class AmazonClientException {
+   public AmazonClientException () {}
+}

infer/models/java/src/com/amazonaws/metrics/RequestMetricCollector.java

@@ -0,0 +1,5 @@
+package com.amazonaws.metrics;
+
+public class RequestMetricCollector {
+   public RequestMetricCollector () {}
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/datamodeling/AbstractDynamoDBMapper.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.datamodeling;
+import java.util.Map;
+public class AbstractDynamoDBMapper {
+   public AbstractDynamoDBMapper () {}
+   public <T> T load(T keyObject, DynamoDBMapperConfig config) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapper.java

@@ -0,0 +1,11 @@
+package com.amazonaws.services.dynamodbv2.datamodeling;
+import java.util.Map;
+public class DynamoDBMapper {
+   public DynamoDBMapper () {}
+   public <T> T load(Class<T> clazz, Object hashKey) {
+      return null;
+   }
+   public <T> T load(Class<T> clazz, Object hashKey, Object rangeKey, DynamoDBMapperConfig config) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfig.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.datamodeling;
+import com.amazonaws.metrics.RequestMetricCollector;
+public class DynamoDBMapperConfig {
+   public DynamoDBMapperConfig () {}
+   public RequestMetricCollector getRequestMetricCollector() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScanExpression.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.datamodeling;
+
+public class DynamoDBScanExpression {
+   public DynamoDBScanExpression () {}
+   public String getIndexName() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/datamodeling/QueryResultPage.java

@@ -0,0 +1,9 @@
+package com.amazonaws.services.dynamodbv2.datamodeling;
+import java.util.Map;
+import com.amazonaws.services.dynamodbv2.model.AttributeValue;
+public class QueryResultPage<T> {
+   public QueryResultPage () {}
+   public Map<String,AttributeValue> getLastEvaluatedKey() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/datamodeling/ScanResultPage.java

@@ -0,0 +1,9 @@
+package com.amazonaws.services.dynamodbv2.datamodeling;
+import java.util.Map;
+import com.amazonaws.services.dynamodbv2.model.AttributeValue;
+public class ScanResultPage<T> {
+   public ScanResultPage () {}
+   public Map<String,AttributeValue> getLastEvaluatedKey() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/document/DeleteItemOutcome.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.document;
+
+public class DeleteItemOutcome {
+   public DeleteItemOutcome () {}
+   public Item getItem() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/document/GetItemOutcome.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.document;
+
+public class GetItemOutcome {
+   public GetItemOutcome () {}
+   public Item getItem() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/document/Item.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.document;
+
+public class Item {
+   public Item () {}
+   public Class<?> getTypeOf(String attrName) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/document/ItemUtils.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.document;
+
+public class ItemUtils {
+   public ItemUtils () {}
+   public static Integer minimum(Integer one, Integer two) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/document/Table.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.document;
+import com.amazonaws.services.dynamodbv2.model.TableDescription;
+public class Table {
+   public Table () {}
+   public TableDescription getDescription() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/document/internal/InternalUtils.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.document.internal;
+
+public class InternalUtils {
+   public InternalUtils () {}
+   public static Integer minimum(Integer one, Integer two) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/xspec/DeleteItemExpressionSpec.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.xspec;
+import java.util.Map;
+public class DeleteItemExpressionSpec {
+   public DeleteItemExpressionSpec () {}
+   public final Map<String,Object> getValueMap() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/xspec/GetItemExpressionSpec.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.xspec;
+import java.util.Map;
+public class GetItemExpressionSpec {
+   public GetItemExpressionSpec () {}
+   public final Map<String,String> getNameMap() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/xspec/PutItemExpressionSpec.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.xspec;
+import java.util.Map;
+public class PutItemExpressionSpec {
+   public PutItemExpressionSpec () {}
+   public Map<String,Object> getValueMap() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/xspec/QueryExpressionSpec.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.xspec;
+import java.util.Map;
+public class QueryExpressionSpec {
+   public QueryExpressionSpec () {}
+   public Map<String,Object> getValueMap() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/xspec/ScanExpressionSpec.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.xspec;
+import java.util.Map;
+public class ScanExpressionSpec {
+   public ScanExpressionSpec () {}
+   public Map<String,Object> getValueMap() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/dynamodbv2/xspec/UpdateItemExpressionSpec.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.dynamodbv2.xspec;
+import java.util.Map;
+public class UpdateItemExpressionSpec {
+   public UpdateItemExpressionSpec () {}
+   public Map<String,Object> getValueMap() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/elasticmapreduce/spi/security/EncryptionMaterials.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.elasticmapreduce.spi.security;
+import java.util.Map;
+public class EncryptionMaterials {
+   public EncryptionMaterials () {}
+   public Map<String,String> getMaterialsDescription() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/kinesisvideo/model/AckErrorCode/Values.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.kinesisvideo.model.AckErrorCode;
+
+public class Values {
+   public Values () {}
+   public String toString() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/kinesisvideo/model/AckEventType/Values.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.kinesisvideo.model.AckEventType;
+
+public class Values {
+   public Values () {}
+   public String toString() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/kms/AWSKMS.java

@@ -0,0 +1,5 @@
+package com.amazonaws.services.kms;
+
+public class AWSKMS {
+   public AWSKMS () {}
+}

infer/models/java/src/com/amazonaws/services/mediaconvert/model/Job.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.mediaconvert.model;
+
+public class Job {
+   public Job () {}
+   public Job withJobPercentComplete(Integer jobPercentComplete) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/AmazonS3Client.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3;
+
+public class AmazonS3Client {
+   public AmazonS3Client () {}
+   public String getResourceUrl(String bucketName, String key) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/AmazonS3EncryptionClientV2.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3;
+import com.amazonaws.services.kms.AWSKMS;
+public class AmazonS3EncryptionClientV2 {
+   public AmazonS3EncryptionClientV2 () {}
+   public AWSKMS getKmsClient() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/internal/PartCreationEvent.java

@@ -0,0 +1,9 @@
+package com.amazonaws.services.s3.internal;
+import java.io.File;
+import com.amazonaws.services.s3.OnFileDelete;
+public class PartCreationEvent {
+   public PartCreationEvent () {}
+   public OnFileDelete getFileDeleteObserver() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/internal/RepeatableFileInputStream.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.internal;
+import java.io.InputStream;
+public class RepeatableFileInputStream {
+   public RepeatableFileInputStream () {}
+   public InputStream getWrappedInputStream() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/internal/RepeatableInputStream.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.internal;
+import java.io.InputStream;
+public class RepeatableInputStream {
+   public RepeatableInputStream () {}
+   public InputStream getWrappedInputStream() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/internal/S3XmlResponseHandler.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.internal;
+import java.util.Map;
+public class S3XmlResponseHandler<T> {
+   public S3XmlResponseHandler () {}
+   public Map<String,String> getResponseHeaders() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/internal/SSEResultBase.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.internal;
+
+public class SSEResultBase {
+   public SSEResultBase () {}
+   public final String getSSECustomerKeyMd5() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/internal/crypto/GCMCipherLite.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.internal.crypto;
+
+public class GCMCipherLite {
+   public GCMCipherLite () {}
+   public byte[] getTag() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/AmazonS3Exception.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+
+public class AmazonS3Exception {
+   public AmazonS3Exception () {}
+   public String getErrorResponseXml() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/Bucket.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+import java.util.Date;
+public class Bucket {
+   public Bucket () {}
+   public Date getCreationDate() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/CompleteMultipartUploadResult.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+
+public class CompleteMultipartUploadResult {
+   public CompleteMultipartUploadResult () {}
+   public String getExpirationTimeRuleId() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/CopyObjectResult.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+
+public class CopyObjectResult {
+   public CopyObjectResult () {}
+   public String getExpirationTimeRuleId() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/EncryptionMaterials.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+import com.amazonaws.services.s3.model.EncryptionMaterialsAccessor;
+public class EncryptionMaterials {
+   public EncryptionMaterials () {}
+   public EncryptionMaterialsAccessor getAccessor() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/GeneratePresignedUrlRequest.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+
+public class GeneratePresignedUrlRequest {
+   public GeneratePresignedUrlRequest () {}
+   public String getSSEAlgorithm() {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/GroupGrantee.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+
+public class GroupGrantee {
+   public GroupGrantee () {}
+   public static GroupGrantee parseGroupGrantee(String groupUri) {
+      return null;
+   }
+}

infer/models/java/src/com/amazonaws/services/s3/model/KMSEncryptionMaterials.java

@@ -0,0 +1,8 @@
+package com.amazonaws.services.s3.model;
+
+public class KMSEncryptionMaterials {
+   public KMSEncryptionMaterials () {}
+   public String getCustomerMasterKeyId() {
+      return null;
+   }
+}