Skip to content

Commit

Permalink
Fix #3. Upgrading leshan-client-cf dependency to version 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@vadimp
vadimp committed Aug 31, 2021
1 parent d8f65a1 commit c576f61
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 20 deletions.
3 changes: 2 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<leshan.client.version>1.3.1</leshan.client.version>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.leshan</groupId>
<artifactId>leshan-client-cf</artifactId>
<version>1.0.0-RC1</version>
<version>${leshan.client.version}</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
Expand Down
44 changes: 27 additions & 17 deletions src/main/java/org/eclipse/leshan/benchmark/client/BenchClient.java
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
package org.eclipse.leshan.benchmark.client;

import static org.eclipse.leshan.LwM2mId.SECURITY;
import static org.eclipse.leshan.LwM2mId.SERVER;
import static org.eclipse.leshan.core.LwM2mId.SECURITY;
import static org.eclipse.leshan.core.LwM2mId.SERVER;
import static org.eclipse.leshan.client.object.Security.noSec;
import static org.eclipse.leshan.client.object.Security.noSecBootstap;
import static org.eclipse.leshan.client.object.Security.psk;
import static org.eclipse.leshan.client.object.Security.pskBootstrap;

import java.net.InetSocketAddress;
import java.util.List;
import java.util.Map;

import org.eclipse.californium.core.network.CoapEndpoint;
import org.eclipse.californium.core.network.config.NetworkConfig;
import org.eclipse.californium.scandium.DTLSConnector;
import org.eclipse.leshan.ResponseCode;

import org.eclipse.leshan.client.californium.LeshanClient;
import org.eclipse.leshan.client.californium.LeshanClientBuilder;
import org.eclipse.leshan.client.object.Server;
import org.eclipse.leshan.client.observer.LwM2mClientObserverAdapter;
import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;
import org.eclipse.leshan.client.resource.ObjectsInitializer;
import org.eclipse.leshan.client.servers.ServerIdentity;
import org.eclipse.leshan.core.ResponseCode;
import org.eclipse.leshan.core.model.LwM2mModel;
import org.eclipse.leshan.core.model.ObjectLoader;
import org.eclipse.leshan.core.model.ObjectModel;
Expand Down Expand Up @@ -128,17 +131,17 @@ public BenchClient(LeshanClientBuilder builder, String serverURI, boolean bootst
client.addObserver(new LwM2mClientObserverAdapter() {

@Override
public void onUpdateTimeout(org.eclipse.leshan.client.servers.Server server, UpdateRequest request) {
public void onUpdateTimeout(ServerIdentity server, UpdateRequest request) {
updateTimeout.inc();
}

@Override
public void onUpdateSuccess(org.eclipse.leshan.client.servers.Server server, UpdateRequest request) {
public void onUpdateSuccess(ServerIdentity server, UpdateRequest request) {
updateSuccess.inc();
}

@Override
public void onUpdateFailure(org.eclipse.leshan.client.servers.Server server, UpdateRequest request,
public void onUpdateFailure(ServerIdentity server, UpdateRequest request,
ResponseCode responseCode, String errorMessage, Exception e) {
updateFailure.inc();
if (e != null) {
Expand All @@ -153,19 +156,19 @@ public void onUpdateFailure(org.eclipse.leshan.client.servers.Server server, Upd
}

@Override
public void onRegistrationTimeout(org.eclipse.leshan.client.servers.Server server,
public void onRegistrationTimeout(ServerIdentity server,
RegisterRequest request) {
registrationTimeout.inc();
}

@Override
public void onRegistrationSuccess(org.eclipse.leshan.client.servers.Server server, RegisterRequest request,
public void onRegistrationSuccess(ServerIdentity server, RegisterRequest request,
String registrationID) {
registrationSuccess.inc();
}

@Override
public void onRegistrationFailure(org.eclipse.leshan.client.servers.Server server, RegisterRequest request,
public void onRegistrationFailure(ServerIdentity server, RegisterRequest request,
ResponseCode responseCode, String errorMessage, Exception e) {
registrationFailure.inc();
if (e != null) {
Expand All @@ -180,19 +183,19 @@ public void onRegistrationFailure(org.eclipse.leshan.client.servers.Server serve
}

@Override
public void onDeregistrationTimeout(org.eclipse.leshan.client.servers.Server server,
public void onDeregistrationTimeout(ServerIdentity server,
DeregisterRequest request) {
deregistrationTimeout.inc();
}

@Override
public void onDeregistrationSuccess(org.eclipse.leshan.client.servers.Server server,
public void onDeregistrationSuccess(ServerIdentity server,
DeregisterRequest request) {
deregistrationSuccess.inc();
}

@Override
public void onDeregistrationFailure(org.eclipse.leshan.client.servers.Server server,
public void onDeregistrationFailure(ServerIdentity server,
DeregisterRequest request, ResponseCode responseCode, String errorMessage, Exception e) {
deregistrationFailure.inc();
if (e != null) {
Expand All @@ -207,19 +210,19 @@ public void onDeregistrationFailure(org.eclipse.leshan.client.servers.Server ser
}

@Override
public void onBootstrapTimeout(org.eclipse.leshan.client.servers.Server bsserver,
public void onBootstrapTimeout(ServerIdentity bsserver,
BootstrapRequest request) {
bootstrapTimeout.inc();
}

@Override
public void onBootstrapSuccess(org.eclipse.leshan.client.servers.Server bsserver,
public void onBootstrapSuccess(ServerIdentity bsserver,
BootstrapRequest request) {
bootstrapSuccess.inc();
}

@Override
public void onBootstrapFailure(org.eclipse.leshan.client.servers.Server bsserver, BootstrapRequest request,
public void onBootstrapFailure(ServerIdentity bsserver, BootstrapRequest request,
ResponseCode responseCode, String errorMessage, Exception e) {
bootstrapFailure.inc();
if (e != null) {
Expand Down Expand Up @@ -267,11 +270,11 @@ public void stop(boolean deregister) {
}

public InetSocketAddress getSocketAddress() {
return client.getAddress();
return client.getAddress(getCurrentRegisteredServer());
}

public boolean triggerUpdate(boolean rehandshake, boolean abbreviated) {
if (client.getRegistrationId() != null) {
if (getCurrentRegisteredServer() != null) {
if (rehandshake) {
CoapEndpoint endpoint = (CoapEndpoint) client.coap().getServer().getEndpoint(getSocketAddress());
if (endpoint.getConnector() instanceof DTLSConnector) {
Expand All @@ -288,6 +291,13 @@ public boolean triggerUpdate(boolean rehandshake, boolean abbreviated) {
return false;
}
}

public ServerIdentity getCurrentRegisteredServer() {
Map<String, ServerIdentity> registeredServers = client.getRegisteredServers();
if (registeredServers != null && !registeredServers.isEmpty())
return registeredServers.values().iterator().next();
return null;
}

public void destroy(boolean deregister) {
client.destroy(deregister);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/eclipse/leshan/benchmark/client/ClientsLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import org.eclipse.leshan.client.californium.LeshanClientBuilder;
import org.eclipse.leshan.client.engine.DefaultRegistrationEngineFactory;
import org.eclipse.leshan.util.Hex;
import org.eclipse.leshan.util.NamedThreadFactory;
import org.eclipse.leshan.core.util.Hex;
import org.eclipse.leshan.core.util.NamedThreadFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down

0 comments on commit c576f61

Please sign in to comment.