mirror of https://github.com/dapr/java-sdk.git
				
				
				
			Updating proto, daprd and cli + fix ITs for v1.0.0 Milestone 1. (#384)
* Updating proto, daprd and cli prior to v1.0.0 Milestone 1. * Fixes integration tests.
This commit is contained in:
		
							parent
							
								
									2ebb94e413
								
							
						
					
					
						commit
						2bafc05e4c
					
				|  | @ -24,8 +24,8 @@ jobs: | ||||||
|       JDK_VER: 13.0.x |       JDK_VER: 13.0.x | ||||||
|       DAPR_RUNTIME_VER: 0.11.0-rc.2 |       DAPR_RUNTIME_VER: 0.11.0-rc.2 | ||||||
|       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/e7c9a643dfefbcfff0c2c26c12029259e6e81180/install/install.sh |       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/e7c9a643dfefbcfff0c2c26c12029259e6e81180/install/install.sh | ||||||
|       DAPR_CLI_REF: v0.11.0-rc.0 |       DAPR_CLI_REF: 8b3f62fb739b198bc07f36b08a7c77595a6d33c4 | ||||||
|       DAPR_REF: f4f3ee68960c5436fca9a19a40e1e91116e31776 |       DAPR_REF: 20c989955c66359665ae98181e7d021928ab2e0e | ||||||
|       OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }} |       OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }} | ||||||
|       OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }} |       OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }} | ||||||
|       GPG_KEY: ${{ secrets.GPG_KEY }} |       GPG_KEY: ${{ secrets.GPG_KEY }} | ||||||
|  | @ -40,7 +40,7 @@ jobs: | ||||||
|       run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash |       run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash | ||||||
|     - name: Set up Go ${{ env.GOVER }} |     - name: Set up Go ${{ env.GOVER }} | ||||||
|       if: env.DAPR_REF != '' || env.DAPR_CLI_REF != '' |       if: env.DAPR_REF != '' || env.DAPR_CLI_REF != '' | ||||||
|       uses: actions/setup-go@v2-beta |       uses: actions/setup-go@v2 | ||||||
|       with: |       with: | ||||||
|         go-version: ${{ env.GOVER }} |         go-version: ${{ env.GOVER }} | ||||||
|     - name: Checkout Dapr CLI repo to override dapr command. |     - name: Checkout Dapr CLI repo to override dapr command. | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								pom.xml
								
								
								
								
							
							
						
						
									
										2
									
								
								pom.xml
								
								
								
								
							|  | @ -16,7 +16,7 @@ | ||||||
|     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||||||
|     <grpc.version>1.33.1</grpc.version> |     <grpc.version>1.33.1</grpc.version> | ||||||
|     <protobuf.version>3.13.0</protobuf.version> |     <protobuf.version>3.13.0</protobuf.version> | ||||||
|     <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/67c4553aea13acef634540469f4a287b759a288e/dapr/proto</dapr.proto.baseurl> |     <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/f3ddd345962d7e065e26a54f7b2f1f2db9af1fdb/dapr/proto</dapr.proto.baseurl> | ||||||
|     <os-maven-plugin.version>1.6.2</os-maven-plugin.version> |     <os-maven-plugin.version>1.6.2</os-maven-plugin.version> | ||||||
|     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> |     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> | ||||||
|     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> |     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ package io.dapr.it.actors.app; | ||||||
| import io.dapr.actors.runtime.ActorRuntime; | import io.dapr.actors.runtime.ActorRuntime; | ||||||
| 
 | 
 | ||||||
| public class MyActorService { | public class MyActorService { | ||||||
|   public static final String SUCCESS_MESSAGE = "established connection to placement service at localhost"; |   public static final String SUCCESS_MESSAGE = "established connection to placement service at"; | ||||||
| 
 | 
 | ||||||
|   /** |   /** | ||||||
|    * Starts the service. |    * Starts the service. | ||||||
|  |  | ||||||
|  | @ -6,13 +6,12 @@ | ||||||
| package io.dapr.it.actors.services.springboot; | package io.dapr.it.actors.services.springboot; | ||||||
| 
 | 
 | ||||||
| import io.dapr.actors.runtime.ActorRuntime; | import io.dapr.actors.runtime.ActorRuntime; | ||||||
| import io.dapr.serializer.DefaultObjectSerializer; |  | ||||||
| 
 | 
 | ||||||
| import java.time.Duration; | import java.time.Duration; | ||||||
| 
 | 
 | ||||||
| public class DemoActorService { | public class DemoActorService { | ||||||
| 
 | 
 | ||||||
|   public static final String SUCCESS_MESSAGE = "established connection to placement service at localhost"; |   public static final String SUCCESS_MESSAGE = "established connection to placement service at"; | ||||||
| 
 | 
 | ||||||
|   /** |   /** | ||||||
|    * Starts the service. |    * Starts the service. | ||||||
|  |  | ||||||
|  | @ -12,7 +12,7 @@ import java.time.Duration; | ||||||
| 
 | 
 | ||||||
| public class StatefulActorService { | public class StatefulActorService { | ||||||
| 
 | 
 | ||||||
|   public static final String SUCCESS_MESSAGE = "established connection to placement service at localhost"; |   public static final String SUCCESS_MESSAGE = "established connection to placement service at"; | ||||||
| 
 | 
 | ||||||
|   /** |   /** | ||||||
|    * Starts the service. |    * Starts the service. | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||||
| @SpringBootApplication | @SpringBootApplication | ||||||
| public class InputBindingService { | public class InputBindingService { | ||||||
| 
 | 
 | ||||||
|   public static final String SUCCESS_MESSAGE = "You're up and running!"; |   public static final String SUCCESS_MESSAGE = "Completed initialization in"; | ||||||
| 
 | 
 | ||||||
|   public static void main(String[] args) throws Exception { |   public static void main(String[] args) throws Exception { | ||||||
|     // If port string is not valid, it will throw an exception. |     // If port string is not valid, it will throw an exception. | ||||||
|  |  | ||||||
|  | @ -2,18 +2,21 @@ package io.dapr.it.methodinvoke.http; | ||||||
| 
 | 
 | ||||||
| import io.dapr.client.DaprClient; | import io.dapr.client.DaprClient; | ||||||
| import io.dapr.client.DaprClientBuilder; | import io.dapr.client.DaprClientBuilder; | ||||||
| import io.dapr.client.DaprHttp; |  | ||||||
| import io.dapr.client.domain.HttpExtension; | import io.dapr.client.domain.HttpExtension; | ||||||
| import io.dapr.it.BaseIT; | import io.dapr.it.BaseIT; | ||||||
| import io.dapr.it.DaprRun; | import io.dapr.it.DaprRun; | ||||||
| import org.junit.After; |  | ||||||
| import org.junit.Before; | import org.junit.Before; | ||||||
| import org.junit.Test; | import org.junit.Test; | ||||||
| import org.junit.runner.RunWith; | import org.junit.runner.RunWith; | ||||||
| import org.junit.runners.Parameterized; | import org.junit.runners.Parameterized; | ||||||
| 
 | 
 | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| import java.util.*; | import java.util.Arrays; | ||||||
|  | import java.util.Calendar; | ||||||
|  | import java.util.Collection; | ||||||
|  | import java.util.Date; | ||||||
|  | import java.util.List; | ||||||
|  | import java.util.Map; | ||||||
| 
 | 
 | ||||||
| import static org.junit.Assert.assertEquals; | import static org.junit.Assert.assertEquals; | ||||||
| import static org.junit.runners.Parameterized.Parameter; | import static org.junit.runners.Parameterized.Parameter; | ||||||
|  | @ -57,6 +60,9 @@ public class MethodInvokeIT extends BaseIT { | ||||||
|         } else { |         } else { | ||||||
|             daprRun.switchToHTTP(); |             daprRun.switchToHTTP(); | ||||||
|         } |         } | ||||||
|  | 
 | ||||||
|  |         // Wait since service might be ready even after port is available. | ||||||
|  |         Thread.sleep(2000); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     @Test |     @Test | ||||||
|  |  | ||||||
|  | @ -15,7 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||||
| @SpringBootApplication | @SpringBootApplication | ||||||
| public class MethodInvokeService { | public class MethodInvokeService { | ||||||
| 
 | 
 | ||||||
|   public static final String SUCCESS_MESSAGE = "You're up and running!"; |   public static final String SUCCESS_MESSAGE = "Completed initialization in"; | ||||||
| 
 | 
 | ||||||
|   public static void main(String[] args) { |   public static void main(String[] args) { | ||||||
|     int port = Integer.parseInt(args[0]); |     int port = Integer.parseInt(args[0]); | ||||||
|  |  | ||||||
|  | @ -5,7 +5,6 @@ | ||||||
| 
 | 
 | ||||||
| package io.dapr.it.pubsub.http; | package io.dapr.it.pubsub.http; | ||||||
| 
 | 
 | ||||||
| import io.dapr.it.binding.http.InputBindingService; |  | ||||||
| import org.springframework.boot.SpringApplication; | import org.springframework.boot.SpringApplication; | ||||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||||
| 
 | 
 | ||||||
|  | @ -16,7 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||||
| @SpringBootApplication(scanBasePackages = {"io.dapr.springboot", "io.dapr.it.pubsub.http"}) | @SpringBootApplication(scanBasePackages = {"io.dapr.springboot", "io.dapr.it.pubsub.http"}) | ||||||
| public class SubscriberService { | public class SubscriberService { | ||||||
| 
 | 
 | ||||||
|   public static final String SUCCESS_MESSAGE = "You're up and running!"; |   public static final String SUCCESS_MESSAGE = "Completed initialization in"; | ||||||
| 
 | 
 | ||||||
|   public static void main(String[] args) throws Exception { |   public static void main(String[] args) throws Exception { | ||||||
|     int port = Integer.parseInt(args[0]); |     int port = Integer.parseInt(args[0]); | ||||||
|  |  | ||||||
|  | @ -5,12 +5,11 @@ | ||||||
| 
 | 
 | ||||||
| package io.dapr.it.state; | package io.dapr.it.state; | ||||||
| 
 | 
 | ||||||
| import com.google.protobuf.Any; |  | ||||||
| import com.google.protobuf.ByteString; | import com.google.protobuf.ByteString; | ||||||
|  | import io.dapr.v1.CommonProtos.StateItem; | ||||||
| import io.dapr.v1.DaprGrpc; | import io.dapr.v1.DaprGrpc; | ||||||
| import io.dapr.v1.DaprGrpc.DaprBlockingStub; | import io.dapr.v1.DaprGrpc.DaprBlockingStub; | ||||||
| import io.dapr.v1.DaprProtos.SaveStateRequest; | import io.dapr.v1.DaprProtos.SaveStateRequest; | ||||||
| import io.dapr.v1.CommonProtos.StateItem; |  | ||||||
| import io.grpc.ManagedChannel; | import io.grpc.ManagedChannel; | ||||||
| import io.grpc.ManagedChannelBuilder; | import io.grpc.ManagedChannelBuilder; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue