Merge pull request #1 from mladjan-gadzic/main

sync

Author: mladjan-gadzic

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>io.armadaproject</groupId>
   <artifactId>armada-grpc-java-client</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.4</version>
   <packaging>jar</packaging>
 
   <name>armada-grpc-java-client</name>

src/main/java/io/armadaproject/ArmadaClient.java

@@ -5,22 +5,27 @@
 import api.EventOuterClass.JobSetRequest;
 import api.Health.HealthCheckResponse;
 import api.Health.HealthCheckResponse.ServingStatus;
+import api.Job.JobStatusRequest;
+import api.Job.JobStatusResponse;
+import api.JobsGrpc;
 import api.SubmitGrpc;
 import api.SubmitOuterClass.CancellationResult;
 import api.SubmitOuterClass.JobCancelRequest;
 import api.SubmitOuterClass.JobSubmitRequest;
 import api.SubmitOuterClass.JobSubmitResponse;
+import api.SubmitOuterClass.Queue;
+import api.SubmitOuterClass.QueueGetRequest;
+import api.SubmitOuterClass.StreamingQueueGetRequest;
+import api.SubmitOuterClass.StreamingQueueMessage;
 import com.google.protobuf.Empty;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.Metadata;
 import io.grpc.stub.MetadataUtils;
 import java.util.Iterator;
-import java.util.logging.Logger;
 
 public class ArmadaClient {
 
-  private static final Logger LOG = Logger.getLogger(ArmadaClient.class.getName());
   private final ManagedChannel channel;
 
   public ArmadaClient(String host, int port) {
@@ -43,31 +48,40 @@ private Metadata createAuthMetadata(String token) {
   }
 
   public ServingStatus checkHealth() {
-    LOG.info("checking connection to armada server...");
     SubmitGrpc.SubmitBlockingStub submitBlockingStub = SubmitGrpc.newBlockingStub(channel);
     HealthCheckResponse healthCheckResponse = submitBlockingStub.health(Empty.getDefaultInstance());
-    ServingStatus status = healthCheckResponse.getStatus();
-    LOG.info("connection to armada server: " + status);
-    return status;
+    return healthCheckResponse.getStatus();
   }
 
   public JobSubmitResponse submitJob(JobSubmitRequest jobSubmitRequest) {
     SubmitGrpc.SubmitBlockingStub submitBlockingStub = SubmitGrpc.newBlockingStub(channel);
-    JobSubmitResponse jobSubmitResponse = submitBlockingStub.submitJobs(jobSubmitRequest);
-    LOG.info("job submitted! response: \n" + jobSubmitResponse);
-    return jobSubmitResponse;
+    return submitBlockingStub.submitJobs(jobSubmitRequest);
   }
 
   public CancellationResult cancelJob(JobCancelRequest jobCancelRequest) {
     SubmitGrpc.SubmitBlockingStub submitBlockingStub = SubmitGrpc.newBlockingStub(channel);
-    CancellationResult cancellationResult = submitBlockingStub.cancelJobs(jobCancelRequest);
-    LOG.info("job cancelled! response: \n" + cancellationResult);
-    return cancellationResult;
+    return submitBlockingStub.cancelJobs(jobCancelRequest);
   }
 
   public Iterator<EventStreamMessage> getEvents(JobSetRequest jobSetRequest) {
     EventGrpc.EventBlockingStub eventBlockingStub = EventGrpc.newBlockingStub(channel);
     return eventBlockingStub.getJobSetEvents(jobSetRequest);
   }
 
+  public Queue getQueue(QueueGetRequest queueGetRequest) {
+    SubmitGrpc.SubmitBlockingStub submitBlockingStub = SubmitGrpc.newBlockingStub(channel);
+    return submitBlockingStub.getQueue(queueGetRequest);
+  }
+
+  public Iterator<StreamingQueueMessage> getQueueInfo(
+      StreamingQueueGetRequest streamingQueueGetRequest) {
+    SubmitGrpc.SubmitBlockingStub submitBlockingStub = SubmitGrpc.newBlockingStub(channel);
+    return submitBlockingStub.getQueues(streamingQueueGetRequest);
+  }
+
+  public JobStatusResponse getJobStatus(JobStatusRequest jobStatusRequest) {
+    JobsGrpc.JobsBlockingStub jobsBlockingStub = JobsGrpc.newBlockingStub(channel);
+    return jobsBlockingStub.getJobStatus(jobStatusRequest);
+  }
+
 }

…rmadaproject/examples/CancelExample.java …io/armadaproject/examples/CancelJob.javasrc/main/java/io/armadaproject/examples/CancelExample.java renamed to src/main/java/io/armadaproject/examples/CancelJob.java src/main/java/io/armadaproject/examples/CancelExample.java renamed to src/main/java/io/armadaproject/examples/CancelJob.java

@@ -5,16 +5,16 @@
 import io.armadaproject.ArmadaClient;
 import java.util.logging.Logger;
 
-public class CancelExample {
+public class CancelJob {
 
-  private static final Logger LOG = Logger.getLogger(CancelExample.class.getName());
+  private static final Logger LOG = Logger.getLogger(CancelJob.class.getName());
 
   public static void main(String[] args) {
     ArmadaClient armadaClient = new ArmadaClient("localhost", 30002);
 
     String queueName = "example";
     // TODO use @{link SubmitExample} to submit a job and get the job id
-    String jobId = "01j9p0q536g8s1zrghhv38mc8q";
+    String jobId = "01je8sr94msnkcwvne7f41cynv";
     JobCancelRequest jobCancelRequest = JobCancelRequest.newBuilder()
         .setJobId(jobId)
         .setQueue(queueName)

…armadaproject/examples/EventExample.java …io/armadaproject/examples/GetEvents.javasrc/main/java/io/armadaproject/examples/EventExample.java renamed to src/main/java/io/armadaproject/examples/GetEvents.java src/main/java/io/armadaproject/examples/EventExample.java renamed to src/main/java/io/armadaproject/examples/GetEvents.java

@@ -4,9 +4,9 @@
 import io.armadaproject.ArmadaClient;
 import java.util.logging.Logger;
 
-public class EventExample {
+public class GetEvents {
 
-  private static final Logger LOG = Logger.getLogger(EventExample.class.getName());
+  private static final Logger LOG = Logger.getLogger(GetEvents.class.getName());
 
   public static void main(String[] args) {
     ArmadaClient armadaClient = new ArmadaClient("localhost", 30002);
@@ -16,7 +16,10 @@ public static void main(String[] args) {
         .setQueue("example")
         .setErrorIfMissing(true)
         .build();
-    armadaClient.getEvents(jobSetRequest).forEachRemaining(e -> LOG.info("event:" + e));
+
+    armadaClient.getEvents(jobSetRequest).forEachRemaining(e -> {
+      LOG.info("event:" + e);
+    });
   }
 
 }

src/main/java/io/armadaproject/examples/GetJobStatus.java

@@ -0,0 +1,22 @@
+package io.armadaproject.examples;
+
+import api.Job.JobStatusRequest;
+import api.Job.JobStatusResponse;
+import io.armadaproject.ArmadaClient;
+import java.util.logging.Logger;
+
+public class GetJobStatus {
+
+  private static final Logger LOG = Logger.getLogger(GetJobStatus.class.getName());
+
+  public static void main(String[] args) {
+    ArmadaClient armadaClient = new ArmadaClient("localhost", 30002);
+
+    JobStatusResponse jobStatus = armadaClient.getJobStatus(JobStatusRequest.newBuilder()
+        .addJobIds("01je8sr94msnkcwvne7f41cynv")
+        .build());
+
+    LOG.info("job status: " + jobStatus);
+  }
+
+}

src/main/java/io/armadaproject/examples/GetQueue.java

@@ -0,0 +1,22 @@
+package io.armadaproject.examples;
+
+import api.SubmitOuterClass.Queue;
+import api.SubmitOuterClass.QueueGetRequest;
+import io.armadaproject.ArmadaClient;
+import java.util.logging.Logger;
+
+public class GetQueue {
+
+  private static final Logger LOG = Logger.getLogger(GetQueue.class.getName());
+
+  public static void main(String[] args) {
+    ArmadaClient armadaClient = new ArmadaClient("localhost", 30002);
+
+    Queue queue = armadaClient.getQueue(QueueGetRequest.newBuilder()
+        .setName("example")
+        .build());
+
+    LOG.info("queue:" + queue);
+  }
+
+}

src/main/java/io/armadaproject/examples/GetQueueInfo.java

@@ -0,0 +1,19 @@
+package io.armadaproject.examples;
+
+import api.SubmitOuterClass.StreamingQueueGetRequest;
+import io.armadaproject.ArmadaClient;
+import java.util.logging.Logger;
+
+public class GetQueueInfo {
+
+  private static final Logger LOG = Logger.getLogger(GetQueueInfo.class.getName());
+
+  public static void main(String[] args) {
+    ArmadaClient armadaClient = new ArmadaClient("localhost", 30002);
+
+    armadaClient.getQueueInfo(StreamingQueueGetRequest.newBuilder().build()).forEachRemaining(q -> {
+      LOG.info("queue:" + q);
+    });
+  }
+
+}

…rmadaproject/examples/SubmitExample.java …io/armadaproject/examples/SubmitJob.javasrc/main/java/io/armadaproject/examples/SubmitExample.java renamed to src/main/java/io/armadaproject/examples/SubmitJob.java src/main/java/io/armadaproject/examples/SubmitExample.java renamed to src/main/java/io/armadaproject/examples/SubmitJob.java

@@ -11,9 +11,9 @@
 import k8s.io.api.core.v1.Generated.ResourceRequirements;
 import k8s.io.apimachinery.pkg.api.resource.Generated.Quantity;
 
-public class SubmitExample {
+public class SubmitJob {
 
-  private static final Logger LOG = Logger.getLogger(SubmitExample.class.getName());
+  private static final Logger LOG = Logger.getLogger(SubmitJob.class.getName());
 
   public static void main(String[] args) {
     ArmadaClient armadaClient = new ArmadaClient("localhost", 30002);