tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Minor refactoring

pull/4143/head
Andrii Shvaika 6 years ago
parent
d0928e4d81
commit
c3efbd4015
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/secure/LwM2mInMemorySecurityStore.java

10
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/secure/LwM2mInMemorySecurityStore.java
View File

@ -74,7 +74,7 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
public SecurityInfo getByEndpoint(String endPoint) { public SecurityInfo getByEndpoint(String endPoint) {
readLock.lock(); readLock.lock();
try { try {
String registrationId = this.getByRegistrationId(endPoint, null); String registrationId = this.getRegistrationId(endPoint, null);
return (registrationId != null && sessions.size() > 0 && sessions.get(registrationId) != null) ? return (registrationId != null && sessions.size() > 0 && sessions.get(registrationId) != null) ?
sessions.get(registrationId).getSecurityInfo() : this.addLwM2MClientToSession(endPoint); sessions.get(registrationId).getSecurityInfo() : this.addLwM2MClientToSession(endPoint);
} finally { } finally {
@ -91,7 +91,7 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
public SecurityInfo getByIdentity(String identity) { public SecurityInfo getByIdentity(String identity) {
readLock.lock(); readLock.lock();
try { try {
String integrationId = this.getByRegistrationId(null, identity); String integrationId = this.getRegistrationId(null, identity);
return (integrationId != null) ? sessions.get(integrationId).getSecurityInfo() : this.addLwM2MClientToSession(identity); return (integrationId != null) ? sessions.get(integrationId).getSecurityInfo() : this.addLwM2MClientToSession(identity);
} finally { } finally {
readLock.unlock(); readLock.unlock();
@ -177,10 +177,10 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
} }
} }
private String getByRegistrationId(String endPoint, String identity) { private String getRegistrationId(String endPoint, String identity) {
List<String> registrationIds = (endPoint != null) ? List<String> registrationIds = (endPoint != null) ?
this.sessions.entrySet().stream().filter(model -> endPoint.equals(model.getValue().getEndPoint())).map(model -> model.getKey()).collect(Collectors.toList()) : this.sessions.entrySet().stream().filter(model -> endPoint.equals(model.getValue().getEndPoint())).map(Map.Entry::getKey).collect(Collectors.toList()) :
this.sessions.entrySet().stream().filter(model -> identity.equals(model.getValue().getIdentity())).map(model -> model.getKey()).collect(Collectors.toList()); this.sessions.entrySet().stream().filter(model -> identity.equals(model.getValue().getIdentity())).map(Map.Entry::getKey).collect(Collectors.toList());
return (registrationIds != null && registrationIds.size() > 0) ? registrationIds.get(0) : null; return (registrationIds != null && registrationIds.size() > 0) ? registrationIds.get(0) : null;
} }

Write Preview
Loading…
Cancel
Save