Project

General

Profile

« Previous | Next » 

Revision ea33ac4f

Added by Andreas Müller almost 6 years ago

use long instead of int (cont.)

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java
63 63
	}
64 64

  
65 65
	@Override
66
    public int countInstitutionalMemberships(Person person) {
66
    public long countInstitutionalMemberships(Person person) {
67 67
		AuditEvent auditEvent = getAuditEventFromContext();
68 68
		if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) {
69 69
		    Query query = getSession().createQuery("select count(institutionalMembership) from InstitutionalMembership institutionalMembership where institutionalMembership.person = :person");
70 70
		    query.setParameter("person", person);
71
		    return ((Long)query.uniqueResult()).intValue();
71
		    return (Long)query.uniqueResult();
72 72
		} else {
73
			AuditQuery query = getAuditReader().createQuery().forEntitiesAtRevision(InstitutionalMembership.class,auditEvent.getRevisionNumber());
73
			AuditQuery query = makeAuditQuery(InstitutionalMembership.class, auditEvent);
74 74
			query.add(AuditEntity.relatedId("person").eq(person.getId()));
75 75
			query.addProjection(AuditEntity.id());
76
			return ((Long)query.getSingleResult()).intValue();
76
			return (Long)query.getSingleResult();
77 77
		}
78 78
	}
79 79

  
80 80
	@Override
81
    public int countMembers(Team team) {
81
    public long countMembers(Team team) {
82 82
		checkNotInPriorView("AgentDaoImpl.countMembers(Team team)");
83 83
		Query query = getSession().createQuery("select count(teamMember) from Team team join team.teamMembers teamMember where team = :team");
84 84
		query.setParameter("team", team);
85
		return ((Long)query.uniqueResult()).intValue();
85
		return (Long)query.uniqueResult();
86 86
	}
87 87

  
88 88
	@Override
......
108 108
		query.setParameter("team", team);
109 109
		//query.addOrder( Order.asc("sortindex") );
110 110
		setPagingParameter(query, pageSize, pageNumber);
111
		return query.list();
111
		@SuppressWarnings("unchecked")
112
        List<Person> result = query.list();
113
		return result;
112 114
	}
113 115

  
114 116
	@Override
115
    public Integer countAddresses(AgentBase agent) {
117
    public long countAddresses(AgentBase agent) {
116 118
		checkNotInPriorView("AgentDaoImpl.countAddresses(AgentBase agent)");
117 119
		Query query = getSession().createQuery("select count(address) from AgentBase agent join agent.contact.addresses address where agent = :agent");
118 120
		query.setParameter("agent", agent);
119
		return ((Long)query.uniqueResult()).intValue();
121
		return (Long)query.uniqueResult();
120 122
	}
121 123

  
122 124
	@Override
......
125 127
		Query query = getSession().createQuery("select address from AgentBase agent join agent.contact.addresses address where agent = :agent");
126 128
		query.setParameter("agent", agent);
127 129
		setPagingParameter(query, pageSize, pageNumber);
128
		return query.list();
130
        @SuppressWarnings("unchecked")
131
        List<Address> result = query.list();
132
        return result;
129 133
	}
130 134

  
131 135

  
132 136
	@Override
133 137
	public List<UuidAndTitleCache<Team>> getTeamUuidAndNomenclaturalTitle() {
134
		List<UuidAndTitleCache<Team>> list = new ArrayList<UuidAndTitleCache<Team>>();
138
		List<UuidAndTitleCache<Team>> list = new ArrayList<>();
135 139
		Session session = getSession();
136 140

  
137 141
		Query query = session.createQuery("select uuid, id, nomenclaturalTitle from " + type.getSimpleName() + " where dtype = 'Team'");
......
140 144
        List<Object[]> result = query.list();
141 145

  
142 146
		for(Object[] object : result){
143
			list.add(new UuidAndTitleCache<Team>(Team.class, (UUID) object[0], (Integer)object[1], (String) object[2]));
147
			list.add(new UuidAndTitleCache<>(Team.class, (UUID) object[0], (Integer)object[1], (String) object[2]));
144 148
		}
145 149

  
146 150
		return list;

Also available in: Unified diff