8000 Refactoring in Registration class by sbernard31 · Pull Request #1007 · eclipse-leshan/leshan · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Refactoring in Registration class #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 3, 2021
5 changes: 1 addition & 4 deletions leshan-core/src/main/java/org/eclipse/leshan/core/Link.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*******************************************************************************/
package org.eclipse.leshan.core;

import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
Expand All @@ -41,9 +40,7 @@
// https://github.com/google/coapblaster/blob/master/src/main/java/com/google/iot/coap/LinkFormat.java
// https://github.com/eclipse/californium/blob/2.0.x/californium-core/src/main/java/org/eclipse/californium/core/coap/LinkFormat.java
// https://github.com/ARMmbed/java-coap/blob/master/coap-core/src/main/java/com/mbed/coap/linkformat/LinkFormat.java
public class Link implements Serializable {

private static final long serialVersionUID = 1L;
public class Link {

private final String url;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public interface LwM2m {
* Version of LWM2M specification.
*/
public class Version implements Comparable<Version> {

public static Version V1_0 = new Version("1.0", true);
public static Version V1_1 = new Version("1.1", true);
private static Version[] supportedVersions = new Version[] { V1_0, V1_1 };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*******************************************************************************/
package org.eclipse.leshan.core.request;

import java.io.Serializable;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.security.PublicKey;
Expand All @@ -27,9 +26,7 @@
* Contains all data which could identify a peer like peer address, PSK identity, Raw Public Key or Certificate Common
* Name.
*/
public class Identity implements Serializable {

private static final long serialVersionUID = 1L;
public class Identity {

private final InetSocketAddress peerAddress;
private final String pskIdentity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ public Map<String, String> getAdditionalAttributes() {
return additionalAttributes;
}

public void validate(String targetedVersion) {
public void validate(Version targetedVersion) {
if (bindingMode != null) {
String err = BindingMode.isValidFor(bindingMode, Version.get(targetedVersion));
String err = BindingMode.isValidFor(bindingMode, targetedVersion);
if (err != null) {
throw new InvalidRequestException("Invalid Binding mode: %s", err);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ private Registration newRegistration() throws UnknownHostException {
private Registration newRegistration(String rootpath) throws UnknownHostException {
Builder b = new Registration.Builder("regid", "endpoint",
Identity.unsecure(Inet4Address.getLoopbackAddress(), 12354));
b.extractDataFromObjectLink(true);
if (rootpath != null) {
Map<String, String> attr = new HashMap<>();
attr.put("rt", "\"oma.lwm2m\"");
Expand Down
Loading
0