Merge "Renaming openecomp to onap"

diff --combined src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
index a848bd2,54bd081..ce83b15
--- 1/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
--- 2/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/OxmEntityDescriptor.java
@@@ -24,7 -24,7 +24,7 @@@ package org.onap.aai.datarouter.entity
  
  import java.util.List;
  
- import org.openecomp.datarouter.util.CrossEntityReference;
+ import org.onap.aai.datarouter.util.CrossEntityReference;
  
  
  public class OxmEntityDescriptor {
@@@ -73,7 -73,7 +73,7 @@@
              return false;
           }
           
 -         if ( this.searchableAttributes.size() > 0 ) {
 +         if ( !this.searchableAttributes.isEmpty() ) {
              return true;
           }
           
@@@ -121,4 -121,4 +121,4 @@@
          + ", suggestableAttributes=" + suggestableAttributes + ", isSuggestableEntity="
          + isSuggestableEntity + "]";
    }
 -}
 +}