diff --git a/pom.xml b/pom.xml index f476336..2747d58 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.8 3.2.4 - 1.5.0 + 1.6.0 4.6.1 4.3.0 1.42.2 diff --git a/spring-cloud-stream-binder-dapr-sample/pom.xml b/spring-cloud-stream-binder-dapr-sample/pom.xml index a22f78a..2d560ba 100644 --- a/spring-cloud-stream-binder-dapr-sample/pom.xml +++ b/spring-cloud-stream-binder-dapr-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.7.1 diff --git a/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerAutoConfiguration.java b/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerAutoConfiguration.java index 32a7c65..d36e69b 100644 --- a/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerAutoConfiguration.java +++ b/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerAutoConfiguration.java @@ -9,15 +9,15 @@ import org.springframework.context.annotation.Configuration; /** - * Dapr server auto configuration + * Dapr server auto configuration. */ @EnableConfigurationProperties({ DaprServerProperties.class }) @Configuration public class DaprServerAutoConfiguration { - @ConditionalOnMissingBean - @Bean + @ConditionalOnMissingBean + @Bean DaprSpringService daprSpringService(DaprServerProperties clientProperties) { - return new DaprSpringService(clientProperties); - } + return new DaprSpringService(clientProperties); + } } diff --git a/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerProperties.java b/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerProperties.java index 46746fd..779ddf3 100644 --- a/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerProperties.java +++ b/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerProperties.java @@ -9,50 +9,50 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Dapr server properties + * Dapr server properties. */ @ConfigurationProperties(prefix = "dapr.client") public class DaprServerProperties { - private Pubsub pubsub; + private Pubsub pubsub; - public Pubsub getPubsub() { - return pubsub; - } + public Pubsub getPubsub() { + return pubsub; + } - public void setPubsub(Pubsub pubsub) { - this.pubsub = pubsub; - } + public void setPubsub(Pubsub pubsub) { + this.pubsub = pubsub; + } - public static class Pubsub{ - private List subscriptions = new ArrayList<>(); + public static class Pubsub { + private List subscriptions = new ArrayList<>(); - public void setSubscriptions(List subscriptions) { - this.subscriptions = subscriptions; - } + public void setSubscriptions(List subscriptions) { + this.subscriptions = subscriptions; + } - public List getSubscriptions() { - return subscriptions; - } - } + public List getSubscriptions() { + return subscriptions; + } + } - public static class Subscription{ - private String pubsubName; - private String topic; + public static class Subscription { + private String pubsubName; + private String topic; - public String getPubsubName() { - return pubsubName; - } + public String getPubsubName() { + return pubsubName; + } - public void setPubsubName(String pubsubName) { - this.pubsubName = pubsubName; - } + public void setPubsubName(String pubsubName) { + this.pubsubName = pubsubName; + } - public String getTopic() { - return topic; - } + public String getTopic() { + return topic; + } - public void setTopic(String topic) { - this.topic = topic; - } - } + public void setTopic(String topic) { + this.topic = topic; + } + } } diff --git a/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprSpringService.java b/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprSpringService.java index 13ee8dc..1ea328f 100644 --- a/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprSpringService.java +++ b/spring-cloud-stream-binder-dapr-sample/src/main/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprSpringService.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.function.Function; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.protobuf.Empty; import io.dapr.v1.AppCallbackGrpc; import io.dapr.v1.DaprAppCallbackProtos; @@ -25,75 +24,79 @@ */ @GrpcService public class DaprSpringService extends AppCallbackGrpc.AppCallbackImplBase implements InitializingBean, - ApplicationEventPublisherAware { - private static final Logger LOGGER = LoggerFactory.getLogger(DaprSpringService.class); - private final DaprServerProperties properties; - private final List topicSubscriptionList = new ArrayList<>(); - private ApplicationEventPublisher applicationEventPublisher; + ApplicationEventPublisherAware { + private static final Logger LOGGER = LoggerFactory.getLogger(DaprSpringService.class); + private final DaprServerProperties properties; + private final List topicSubscriptionList = new ArrayList<>(); + private ApplicationEventPublisher applicationEventPublisher; - /** - * Construct a {@link DaprSpringService} with the specified {@link DaprServerProperties}. - * - * @param properties the dapr server properties - */ - public DaprSpringService(DaprServerProperties properties) { - this.properties = properties; - } + /** + * Construct a {@link DaprSpringService} with the specified {@link DaprServerProperties}. + * + * @param properties the dapr server properties + */ + public DaprSpringService(DaprServerProperties properties) { + this.properties = properties; + } - @Override - public void afterPropertiesSet() { - DaprServerProperties.Pubsub pubsub = properties.getPubsub(); - if (pubsub != null && !pubsub.getSubscriptions().isEmpty()) { - pubsub.getSubscriptions().stream().map(SUBSCRIPTION_TOPIC_SUBSCRIPTION_FUNCTION).forEach(topicSubscriptionList::add); - } - } + @Override + public void afterPropertiesSet() { + DaprServerProperties.Pubsub pubsub = properties.getPubsub(); + if (pubsub != null && !pubsub.getSubscriptions().isEmpty()) { + pubsub.getSubscriptions().stream().map(SUBSCRIPTION_TOPIC_SUBSCRIPTION_FUNCTION) + .forEach(topicSubscriptionList::add); + } + } - private static final Function SUBSCRIPTION_TOPIC_SUBSCRIPTION_FUNCTION = (subscription) -> { - return DaprAppCallbackProtos.TopicSubscription - .newBuilder() - .setPubsubName(subscription.getPubsubName()) - .setTopic(subscription.getTopic()) - .build(); - }; + private static final Function SUBSCRIPTION_TOPIC_SUBSCRIPTION_FUNCTION = (subscription) -> { + return DaprAppCallbackProtos.TopicSubscription + .newBuilder() + .setPubsubName(subscription.getPubsubName()) + .setTopic(subscription.getTopic()) + .build(); + }; - @Override - public void listTopicSubscriptions(Empty request, - StreamObserver responseObserver) { - try { - DaprAppCallbackProtos.ListTopicSubscriptionsResponse.Builder builder = - DaprAppCallbackProtos.ListTopicSubscriptionsResponse.newBuilder(); - topicSubscriptionList.forEach(builder::addSubscriptions); - DaprAppCallbackProtos.ListTopicSubscriptionsResponse response = builder.build(); - responseObserver.onNext(response); - } catch (Throwable e) { - responseObserver.onError(e); - } finally { - responseObserver.onCompleted(); - } - } + @Override + public void listTopicSubscriptions(Empty request, + StreamObserver responseObserver) { + try { + DaprAppCallbackProtos.ListTopicSubscriptionsResponse.Builder builder = + DaprAppCallbackProtos.ListTopicSubscriptionsResponse.newBuilder(); + topicSubscriptionList.forEach(builder::addSubscriptions); + DaprAppCallbackProtos.ListTopicSubscriptionsResponse response = builder.build(); + responseObserver.onNext(response); + } + catch (Throwable e) { + responseObserver.onError(e); + } + finally { + responseObserver.onCompleted(); + } + } - @Override - public void onTopicEvent(DaprAppCallbackProtos.TopicEventRequest request, - StreamObserver responseObserver) { - try { - LOGGER.info("------onTopicEvent------"); - LOGGER.info("TopicEventRequest : \n {}", request); - DaprAppCallbackProtos.TopicEventResponse response = - DaprAppCallbackProtos.TopicEventResponse.newBuilder() - .setStatus(DaprAppCallbackProtos.TopicEventResponse.TopicEventResponseStatus.SUCCESS).build(); - responseObserver.onNext(response); - applicationEventPublisher.publishEvent(request); - } - catch (Throwable e){ - responseObserver.onError(e); - } - finally { - responseObserver.onCompleted(); - } - } + @Override + public void onTopicEvent(DaprAppCallbackProtos.TopicEventRequest request, + StreamObserver responseObserver) { + try { + LOGGER.info("------onTopicEvent------"); + LOGGER.info("TopicEventRequest : \n {}", request); + DaprAppCallbackProtos.TopicEventResponse response = + DaprAppCallbackProtos.TopicEventResponse.newBuilder() + .setStatus(DaprAppCallbackProtos.TopicEventResponse.TopicEventResponseStatus.SUCCESS) + .build(); + responseObserver.onNext(response); + applicationEventPublisher.publishEvent(request); + } + catch (Throwable e) { + responseObserver.onError(e); + } + finally { + responseObserver.onCompleted(); + } + } - @Override - public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { - this.applicationEventPublisher = applicationEventPublisher; - } + @Override + public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { + this.applicationEventPublisher = applicationEventPublisher; + } }