Changeset 348:d91f6bd7d381 for kraken-dom/src/main/java/org/krakenapps/dom/api/impl/OrganizationParameterApiImpl.java

Timestamp:

09/20/11 03:16:11 (8 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2782

Message:

modified API interfaces.

File:

• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/OrganizationParameterApiImpl.java (modified) (6 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/OrganizationParameterApiImpl.java

@@ -16 +16 @@
 package org.krakenapps.dom.api.impl;
 
-import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.persistence.EntityManager;
@@ -43 +45 @@
         @Override
         @Transactional
-        public Collection<OrganizationParameter> getOrganizationParameters(int orgId) {
+        public Map<String, String> getOrganizationParameters(int orgId) {
                 EntityManager em = entityManagerService.getEntityManager();
-                return em.createQuery("FROM OrganizationParameter o WHERE o.organization.id = ?").setParameter(1, orgId)
+                List<OrganizationParameter> orgParameters = em
+                                .createQuery("FROM OrganizationParameter o WHERE o.organization.id = ?").setParameter(1, orgId)
                                 .getResultList();
+
+                Map<String, String> m = new HashMap<String, String>();
+                for (OrganizationParameter orgParameter : orgParameters)
+                        m.put(orgParameter.getName(), orgParameter.getValue());
+                return m;
         }
 
         @Transactional
         @Override
-        public OrganizationParameter getOrganizationParameter(int orgId, String name) {
+        public String getOrganizationParameter(int orgId, String name) {
                 EntityManager em = entityManagerService.getEntityManager();
                 try {
@@ -58 +66 @@
                                         .setParameter(1, orgId).setParameter(2, name).getSingleResult();
 
-                        return op;
+                        return op.getValue();
                 } catch (NoResultException e) {
                         return null;
@@ -76 +84 @@
         @Transactional
         private OrganizationParameter setOrganizationParameterInternal(int orgId, String name, String value) {
-                OrganizationParameter orgParameter = getOrganizationParameter(orgId, name);
+                OrganizationParameter orgParameter = getOrgParameter(orgId, name);
                 if (orgParameter == null) {
                         EntityManager em = entityManagerService.getEntityManager();
@@ -104 +112 @@
         private OrganizationParameter unsetOrganizationParameterInternal(int orgId, String name) {
                 EntityManager em = entityManagerService.getEntityManager();
-                OrganizationParameter op = getOrganizationParameter(orgId, name);
+                OrganizationParameter op = getOrgParameter(orgId, name);
                 if (op.getOrganization().getId() == orgId) {
                         em.remove(op);
@@ -111 +119 @@
                 return null;
         }
+
+        @Transactional
+        public OrganizationParameter getOrgParameter(int orgId, String name) {
+                EntityManager em = entityManagerService.getEntityManager();
+                OrganizationParameter op = (OrganizationParameter) em
+                                .createQuery("FROM OrganizationParameter o WHERE o.organization.id = ? AND o.name = ?")
+                                .setParameter(1, orgId).setParameter(2, name).getSingleResult();
+
+                return op;
+        }
 }