eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 06:18:12 +00:00
Code Activity

replaced CompetitorWithBoatDTO by CompetitorDTO where possible

Browse Source 
Change-Id: Iabb14f5e5f3989cc96128120955f0d4ae4332d23
This commit is contained in:
Axel Uhl committed 2018-04-23 18:46:33 +02:00
1 parent bf7e38f01d
commit ad99a56209
156 files changed
+1681 -1552
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorAndBoatStore.java
+15 -3
View File
@@ -102,13 +102,25 @@ public interface CompetitorAndBoatStore extends CompetitorFactory, BoatFactory {
void addNewCompetitorsWithBoat(Iterable<DynamicCompetitorWithBoat> competitorsWithBoat);
/**
* @return an object of type {@link CompetitorDTO}, regardless of whether {@code competitor}
* {@link Competitor#hasBoat() has a boat assigned}. See also
* {@link #convertToCompetitorWithBoatDTO(CompetitorWithBoat)} and
* {@link #convertToCompetitorWithOptionalBoatDTO(Competitor)
*/
CompetitorDTO convertToCompetitorDTO(Competitor competitor);
CompetitorWithBoatDTO convertToCompetitorWithBoatDTO(Competitor c, Boat b);
CompetitorWithBoatDTO convertToCompetitorWithBoatDTO(CompetitorWithBoat c);
CompetitorWithBoatDTO convertToCompetitorWithOptionalBoatDTO(Competitor c);
/**
* If the {@code competitor} is a {@link CompetitorWithBoat}, a {@link CompetitorWithBoatDTO} will result; if the
* type of {@code competitor} is already known at compile time, consider using
* {@link #convertToCompetitorWithBoatDTO(CompetitorWithBoat)} instead. If {@code competitor} is not a
* {@link CompetitorWithBoat}, a {@link CompetitorDTO} will result that is not a {@link CompetitorWithBoatDTO}.
*/
CompetitorDTO convertToCompetitorWithOptionalBoatDTO(Competitor c);
Map<CompetitorWithBoatDTO, BoatDTO> convertToCompetitorAndBoatDTOs(Map<Competitor, ? extends Boat> competitorsAndBoats);
Map<CompetitorDTO, BoatDTO> convertToCompetitorAndBoatDTOs(Map<Competitor, ? extends Boat> competitorsAndBoats);
/**
* Listeners added here are notified whenever {@link #updateCompetitor(String, String, Color, String, Nationality)} is called
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorAndBoatStoreImpl.java
+12 -20
View File
@@ -209,18 +209,13 @@ public class TransientCompetitorAndBoatStoreImpl implements CompetitorAndBoatSto
}
}
protected boolean isValidCompetitorWithBoat(Competitor competitor) {
assert competitor != null;
return competitor.hasBoat();
}
@Override
public DynamicCompetitorWithBoat getExistingCompetitorWithBoatById(Serializable competitorId) {
final DynamicCompetitorWithBoat result;
LockUtil.lockForRead(lock);
try {
DynamicCompetitor competitor = competitorCache.get(competitorId);
if (competitor != null && isValidCompetitorWithBoat(competitor)) {
if (competitor != null && competitor.hasBoat()) {
result = (DynamicCompetitorWithBoat) competitor;
} else {
result = null;
@@ -236,7 +231,7 @@ public class TransientCompetitorAndBoatStoreImpl implements CompetitorAndBoatSto
LockUtil.lockForRead(lock);
try {
Competitor competitor = competitorsByIdAsString.get(competitorIdAsString);
if (competitor != null && isValidCompetitorWithBoat(competitor)) {
if (competitor != null && competitor.hasBoat()) {
return (CompetitorWithBoat) competitor;
} else {
return null;
@@ -625,7 +620,7 @@ public class TransientCompetitorAndBoatStoreImpl implements CompetitorAndBoatSto
Set<DynamicBoat> boats = new HashSet<>(boatCache.values());
Set<DynamicBoat> boatsEmbeddedInCompetitors = new HashSet<>();
for (Competitor competitor : competitorCache.values()) {
if (isValidCompetitorWithBoat(competitor)) {
if (competitor.hasBoat()) {
boatsEmbeddedInCompetitors.add(((DynamicCompetitorWithBoat) competitor).getBoat());
}
}
@@ -722,30 +717,27 @@ public class TransientCompetitorAndBoatStoreImpl implements CompetitorAndBoatSto
}
@Override
public CompetitorWithBoatDTO convertToCompetitorWithBoatDTO(Competitor competitor, Boat boat) {
public CompetitorWithBoatDTO convertToCompetitorWithBoatDTO(CompetitorWithBoat competitor) {
CompetitorDTO c = convertToCompetitorDTO(competitor);
BoatDTO boatDTO = null;
if (boat != null) {
boatDTO = convertToBoatDTO(boat);
}
BoatDTO boatDTO = convertToBoatDTO(competitor.getBoat());
CompetitorWithBoatDTO competitorDTO = new CompetitorWithBoatDTOImpl(c, boatDTO);
return competitorDTO;
}
@Override
public CompetitorWithBoatDTO convertToCompetitorWithOptionalBoatDTO(Competitor competitor) {
if (isValidCompetitorWithBoat(competitor)) {
return convertToCompetitorWithBoatDTO(competitor, ((CompetitorWithBoat) competitor).getBoat());
public CompetitorDTO convertToCompetitorWithOptionalBoatDTO(Competitor competitor) {
if (competitor.hasBoat()) {
return convertToCompetitorWithBoatDTO((CompetitorWithBoat) competitor);
} else {
return convertToCompetitorWithBoatDTO(competitor, null);
return convertToCompetitorDTO(competitor);
}
}
@Override
public Map<CompetitorWithBoatDTO, BoatDTO> convertToCompetitorAndBoatDTOs(Map<Competitor, ? extends Boat> competitorsAndBoats) {
Map<CompetitorWithBoatDTO, BoatDTO> result = new HashMap<>();
public Map<CompetitorDTO, BoatDTO> convertToCompetitorAndBoatDTOs(Map<Competitor, ? extends Boat> competitorsAndBoats) {
Map<CompetitorDTO, BoatDTO> result = new HashMap<>();
for (Entry<Competitor, ? extends Boat> entry : competitorsAndBoats.entrySet()) {
CompetitorWithBoatDTO competitorDTO = convertToCompetitorWithOptionalBoatDTO(entry.getKey());
CompetitorDTO competitorDTO = convertToCompetitorWithOptionalBoatDTO(entry.getKey());
BoatDTO boatDTO = convertToBoatDTO(entry.getValue());
result.put(competitorDTO, boatDTO);
}