Merge pull request #281 from bgklein/update-java-0820

Update Java Samples And Change Python Default Sizes

Author: bgklein

Java/PoolAndResourceFile/pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-batch</artifactId>
-      <version>5.0.1</version>
+      <version>7.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.rest</groupId>

Java/PoolAndResourceFile/src/main/java/PoolAndResourceFile.java

@@ -44,17 +44,17 @@ private static CloudPool createPoolIfNotExists(BatchClient client, String poolId
             // See detail of creating IaaS pool at
             // https://blogs.technet.microsoft.com/windowshpc/2016/03/29/introducing-linux-support-on-azure-batch/
             // Get the sku image reference
-            List<NodeAgentSku> skus = client.accountOperations().listNodeAgentSkus();
+            List<ImageInformation> skus = client.accountOperations().listSupportedImages();
             String skuId = null;
             ImageReference imageRef = null;
 
-            for (NodeAgentSku sku : skus) {
+            for (ImageInformation sku : skus) {
                 if (sku.osType() == OSType.LINUX) {
-                    for (ImageReference imgRef : sku.verifiedImageReferences()) {
-                        if (imgRef.publisher().equalsIgnoreCase(osPublisher)
-                                && imgRef.offer().equalsIgnoreCase(osOffer)) {
-                            imageRef = imgRef;
-                            skuId = sku.id();
+                    if (sku.verificationType() == VerificationType.VERIFIED) {
+                        if (sku.imageReference().publisher().equalsIgnoreCase(osPublisher)
+                                && sku.imageReference().offer().equalsIgnoreCase(osOffer)) {
+                            imageRef = sku.imageReference();
+                            skuId = sku.nodeAgentSKUId();
                             break;
                         }
                     }
@@ -208,7 +208,7 @@ private static void submitJobAndAddTask(BatchClient client, CloudBlobContainer c
             String jobId)
             throws BatchErrorException, IOException, StorageException, InvalidKeyException, URISyntaxException {
         String BLOB_FILE_NAME = "test.txt";
-        String LOCAL_FILE_PATH = "./" + BLOB_FILE_NAME;
+        String LOCAL_FILE_PATH = "./PoolAndResourceFile/" + BLOB_FILE_NAME;
 
         // Create job run at the specified pool
         PoolInformation poolInfo = new PoolInformation();