Skip to content

Commit

Permalink
Update pom dependency version
Browse files Browse the repository at this point in the history
  • Loading branch information
@MouMangTai
MouMangTai committed Jul 12, 2022
1 parent d4653f2 commit f0cd843
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 106 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
<spring-cloud-stream.version>3.2.4</spring-cloud-stream.version>
<dapr-sdk-autogen.version>1.5.0</dapr-sdk-autogen.version>
<dapr-sdk-autogen.version>1.6.0</dapr-sdk-autogen.version>
<mockito-inline.version>4.6.1</mockito-inline.version>
<spring-messaging-azure.version>4.3.0</spring-messaging-azure.version>
<grpc-netty-shaded.version>1.42.2</grpc-netty-shaded.version>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-stream-binder-dapr-sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.7</version>
<version>2.7.1</version>
<relativePath/>
</parent>

Expand Down
10 changes: 5 additions & 5 deletions .../azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
66 changes: 33 additions & 33 deletions ...ava/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprServerProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<Subscription> subscriptions = new ArrayList<>();
public static class Pubsub {
private List<Subscription> subscriptions = new ArrayList<>();

public void setSubscriptions(List<Subscription> subscriptions) {
this.subscriptions = subscriptions;
}
public void setSubscriptions(List<Subscription> subscriptions) {
this.subscriptions = subscriptions;
}

public List<Subscription> getSubscriptions() {
return subscriptions;
}
}
public List<Subscription> 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;
}
}
}
135 changes: 69 additions & 66 deletions ...n/java/com/azure/spring/cloud/stream/binder/dapr/sample/subscriber/DaprSpringService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<DaprAppCallbackProtos.TopicSubscription> topicSubscriptionList = new ArrayList<>();
private ApplicationEventPublisher applicationEventPublisher;
ApplicationEventPublisherAware {
private static final Logger LOGGER = LoggerFactory.getLogger(DaprSpringService.class);
private final DaprServerProperties properties;
private final List<DaprAppCallbackProtos.TopicSubscription> 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<DaprServerProperties.Subscription, DaprAppCallbackProtos.TopicSubscription> SUBSCRIPTION_TOPIC_SUBSCRIPTION_FUNCTION = (subscription) -> {
return DaprAppCallbackProtos.TopicSubscription
.newBuilder()
.setPubsubName(subscription.getPubsubName())
.setTopic(subscription.getTopic())
.build();
};
private static final Function<DaprServerProperties.Subscription, DaprAppCallbackProtos.TopicSubscription> SUBSCRIPTION_TOPIC_SUBSCRIPTION_FUNCTION = (subscription) -> {
return DaprAppCallbackProtos.TopicSubscription
.newBuilder()
.setPubsubName(subscription.getPubsubName())
.setTopic(subscription.getTopic())
.build();
};

@Override
public void listTopicSubscriptions(Empty request,
StreamObserver<DaprAppCallbackProtos.ListTopicSubscriptionsResponse> 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<DaprAppCallbackProtos.ListTopicSubscriptionsResponse> 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<DaprAppCallbackProtos.TopicEventResponse> 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<DaprAppCallbackProtos.TopicEventResponse> 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;
}
}

0 comments on commit f0cd843

Please sign in to comment.