replace null comparison by Objects methods

atlanmod · Jan 16, 2017 · 8b7f4c5 · 8b7f4c5
1 parent 70ce8c3
commit 8b7f4c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.../hbase/src/main/java/fr/inria/atlanmod/neoemf/data/hbase/store/DirectWriteHBaseStore.java b/.../hbase/src/main/java/fr/inria/atlanmod/neoemf/data/hbase/store/DirectWriteHBaseStore.java
@@ -263,7 +263,7 @@ public EStructuralFeature getContainingFeature(InternalEObject internalObject) {
     @Override
     public EObject eObject(Id id) {
         PersistentEObject object = null;
-        if(id != null) {
+        if(nonNull(id)) {
             EClass eClass = resolveInstanceOf(id);
             object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
             if (object.resource() != resource()) {

diff --git a/.../main/java/fr/inria/atlanmod/neoemf/data/berkeleydb/store/DirectWriteBerkeleyDbStore.java b/.../main/java/fr/inria/atlanmod/neoemf/data/berkeleydb/store/DirectWriteBerkeleyDbStore.java
@@ -299,7 +299,7 @@ public EStructuralFeature getContainingFeature(InternalEObject internalObject) {
     @Override
     public EObject eObject(Id id) {
         PersistentEObject object = null;
-        if(id != null) {
+        if(nonNull(id)) {
             EClass eClass = resolveInstanceOf(id);
             object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
             if (object.resource() != resource()) {

diff --git a/.../mapdb/src/main/java/fr/inria/atlanmod/neoemf/data/mapdb/store/DirectWriteMapDbStore.java b/.../mapdb/src/main/java/fr/inria/atlanmod/neoemf/data/mapdb/store/DirectWriteMapDbStore.java
@@ -312,7 +312,7 @@ public EStructuralFeature getContainingFeature(InternalEObject internalObject) {
     @Override
     public EObject eObject(Id id) {
         PersistentEObject object = null;
-        if(id != null) {
+        if(nonNull(id)) {
             EClass eClass = resolveInstanceOf(id);
             object = persistentObjectsCache.get(id, new PersistentEObjectCacheLoader(eClass));
             if (object.resource() != resource()) {