简柏林 / thingskit · Commits

Commit afc295963314c76c18faa5ac7cd37d5d58cabd4a

Authored by Igor Kulikov
2 parents 4164d360 260dec9b

Merge branch 'master' of github.com:thingsboard/thingsboard

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
... ... @@ -22,6 +22,7 @@ import org.eclipse.californium.core.coap.MediaTypeRegistry;
22 22 import org.eclipse.californium.core.coap.Response;
23 23 import org.eclipse.californium.core.observe.ObserveRelation;
24 24 import org.eclipse.californium.core.server.resources.CoapExchange;
  25 +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
25 26 import org.springframework.stereotype.Service;
26 27 import org.thingsboard.server.coapserver.CoapServerContext;
27 28 import org.thingsboard.server.coapserver.TbCoapServerComponent;
... ... @@ -73,7 +74,7 @@ import static org.eclipse.californium.core.coap.Message.NONE;
73 74 @Slf4j
74 75 @Service
75 76 @RequiredArgsConstructor
76   -@TbCoapServerComponent
  77 +@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.coap.enabled}'=='true')")
77 78 public class DefaultCoapClientContext implements CoapClientContext {
78 79
79 80 private final CoapServerContext config;
... ...