HWKALERTS-112 Upgrade commons and accounts

hawkular · Dec 15, 2015 · 16a19cd · 16a19cd
1 parent 9fd0cd4
commit 16a19cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/accounts/PersonaFilter.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/accounts/PersonaFilter.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
@@ -38,30 +39,26 @@ public class PersonaFilter implements ContainerRequestFilter {
     private final Logger log = Logger.getLogger(PersonaFilter.class);
 
     @Inject
-    Persona persona;
+    Instance<Persona> personaInstance;
 
     @Override
     public void filter(ContainerRequestContext requestContext) throws IOException {
         if (!checkPersona()) {
             requestContext.abortWith(ResponseUtil.internalError("No persona found"));
         }
-        requestContext.getHeaders().putSingle(HawkularAlertsApp.TENANT_HEADER_NAME, persona.getId());
+        requestContext.getHeaders().putSingle(HawkularAlertsApp.TENANT_HEADER_NAME,
+                personaInstance.get().getIdAsUUID().toString());
     }
 
     private boolean checkPersona() {
-        if (persona == null) {
+        if (personaInstance == null || personaInstance.get() == null) {
             log.warn("Persona is null. Possible issue with accounts integration ? ");
             return false;
         }
-        if (isEmpty(persona.getId())) {
+        if (personaInstance.get().getIdAsUUID() == null) {
             log.warn("Persona is empty. Possible issue with accounts integration ? ");
             return false;
         }
         return true;
     }
-
-    private boolean isEmpty(String s) {
-        return s == null || s.trim().isEmpty();
-    }
-
 }
diff --git a/pom.xml b/pom.xml
@@ -91,10 +91,10 @@
     <version.org.drools>6.3.0.Final</version.org.drools>
     <version.org.freemarker>2.3.17</version.org.freemarker>
     <version.org.hawkular>1.0.0.Alpha6</version.org.hawkular>
-    <version.org.hawkular.accounts>1.1.1.Final</version.org.hawkular.accounts>
+    <version.org.hawkular.accounts>1.1.4.Final</version.org.hawkular.accounts>
     <version.org.hawkular.bus>0.7.3.Final</version.org.hawkular.bus>
     <version.org.hawkular.command-gateway>0.10.4.Final</version.org.hawkular.command-gateway>
-    <version.org.hawkular.commons>0.2.2.Final</version.org.hawkular.commons>
+    <version.org.hawkular.commons>0.2.5.Final</version.org.hawkular.commons>
     <version.org.hawkular.inventory>0.8.0-Final</version.org.hawkular.inventory>
     <version.org.hawkular.metrics>0.6.0.Final</version.org.hawkular.metrics>
     <version.org.hawkular.nest>${version.org.hawkular.bus}</version.org.hawkular.nest>