- fix userfilter junit test

Author: rathnapandi

modules/apim-adapter/src/main/java/com/axway/apim/adapter/jackson/UserOrgName2IdConverter.java

@@ -17,14 +17,16 @@ public User convert(User user) {
 //        if(user.getRole().equals("oadmin")) {
 //            orgName2Id.put(organization.getName(), organization.getId());
 //        }
-        for (Map.Entry<String,String> entry : orgs2Role.entrySet()){
-            String orgId = entry.getKey();
-            String role = entry.getValue();
-            if(role.equals("oadmin") || role.equals("admin")){
-                orgName2Id.put(orgs2Name.get(orgId), orgId);
+        if(orgs2Role != null) {
+            for (Map.Entry<String, String> entry : orgs2Role.entrySet()) {
+                String orgId = entry.getKey();
+                String role = entry.getValue();
+                if (role.equals("oadmin") || role.equals("admin")) {
+                    orgName2Id.put(orgs2Name.get(orgId), orgId);
+                }
             }
+            user.setName2OrgId(orgName2Id);
         }
-        user.setName2OrgId(orgName2Id);
         return user;
     }
 }

modules/apim-adapter/src/main/java/com/axway/apim/adapter/user/UserFilter.java

@@ -15,7 +15,7 @@
 
 public class UserFilter implements CustomPropertiesFilter {
 
-	public static enum USER_TYPE {
+	public enum USER_TYPE {
 		internal, 
 		external
 	}
@@ -36,7 +36,7 @@ public static enum USER_TYPE {
 
 	private List<String> customProperties;
 
-	private List<NameValuePair> filters = new ArrayList<NameValuePair>();
+	private List<NameValuePair> filters = new ArrayList<>();
 
 	private UserFilter() { }
 
@@ -170,7 +170,7 @@ public void setCustomProperties(List<String> customProperties) {
 	public boolean equals(Object obj) {
 		if (obj == null) return false;
 		if (this == obj) return true;
-		if(obj instanceof UserFilter == false) return false;
+		if(!(obj instanceof UserFilter)) return false;
 		UserFilter other = (UserFilter)obj;
 		return (
 				StringUtils.equals(other.getId(), this.getId()) && 
@@ -229,7 +229,6 @@ public static class Builder {
 
 		private List<String> customProperties;
 
-		List<NameValuePair> filters = new ArrayList<NameValuePair>();
 
 		public Builder() {
 			super();

modules/apim-adapter/src/main/java/com/axway/apim/api/model/User.java

@@ -17,7 +17,7 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonFilter("UserFilter")
-//@JsonDeserialize(converter = UserOrgName2IdConverter.class)
+@JsonDeserialize(converter = UserOrgName2IdConverter.class)
 public class User implements CustomPropertiesEntity {
     String id;
     @JsonDeserialize(using = OrganizationDeserializer.class)