Skip to content

Commit c9fc854

Browse files
committed
first pass at renaming lease to leasehold
1 parent 8e60f86 commit c9fc854

17 files changed

Lines changed: 317 additions & 278 deletions

File tree

realty-areashop-importer/src/main/java/io/github/md5sha256/realty/importer/ImportJob.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import io.github.md5sha256.realty.database.SqlSessionWrapper;
77
import io.github.md5sha256.realty.database.entity.ContractEntity;
88
import io.github.md5sha256.realty.database.mapper.ContractMapper;
9-
import io.github.md5sha256.realty.database.mapper.LeaseContractMapper;
9+
import io.github.md5sha256.realty.database.mapper.LeaseholdContractMapper;
1010
import io.github.md5sha256.realty.database.mapper.RealtyRegionMapper;
1111
import io.github.md5sha256.realty.database.mapper.RealtySignMapper;
1212
import io.github.md5sha256.realty.database.mapper.FreeholdContractMapper;
@@ -44,19 +44,19 @@ public class ImportJob {
4444
@NotNull Database database,
4545
@NotNull Audience audience,
4646
@NotNull List<FreeholdDto> freeholds,
47-
@NotNull List<LeaseDto> leases,
47+
@NotNull List<LeaseholdDto> leaseholds,
4848
@NotNull List<SignDto> signs) {
4949
int imported = 0;
5050
int skipped = 0;
5151
int failed = 0;
5252
int processed = 0;
5353
int signsImported = 0;
54-
int total = freeholds.size() + leases.size();
54+
int total = freeholds.size() + leaseholds.size();
5555
try (SqlSessionWrapper wrapper = database.openSession(ExecutorType.REUSE, false);
5656
SqlSession session = wrapper.session()) {
5757
RealtyRegionMapper regionMapper = wrapper.realtyRegionMapper();
5858
FreeholdContractMapper freeholdMapper = wrapper.freeholdContractMapper();
59-
LeaseContractMapper leaseMapper = wrapper.leaseContractMapper();
59+
LeaseholdContractMapper leaseholdMapper = wrapper.leaseholdContractMapper();
6060
ContractMapper contractMapper = wrapper.contractMapper();
6161
FreeholdHistoryMapper freeholdHistoryMapper = wrapper.freeholdHistoryMapper();
6262
RealtySignMapper signMapper = wrapper.realtySignMapper();
@@ -95,29 +95,29 @@ public class ImportJob {
9595
reportProgress(audience, processed, total);
9696
}
9797
}
98-
for (LeaseDto lease : leases) {
98+
for (LeaseholdDto lease : leaseholds) {
9999
try {
100100
if (regionMapper.selectByWorldGuardRegion(lease.worldGuardRegionId(),
101101
lease.worldId()) != null) {
102102
skipped++;
103103
} else {
104104
int regionId = regionMapper.registerWorldGuardRegion(lease.worldGuardRegionId(),
105105
lease.worldId());
106-
int leaseContractId = leaseMapper.insertLease(regionId,
106+
int leaseholdContractId = leaseholdMapper.insertLeasehold(regionId,
107107
lease.price(),
108108
lease.durationSeconds(),
109109
lease.maxRenewals(),
110110
lease.landlordId(),
111111
lease.tenantId());
112-
contractMapper.insert(new ContractEntity(leaseContractId,
113-
"contract",
112+
contractMapper.insert(new ContractEntity(leaseholdContractId,
113+
"leasehold",
114114
regionId));
115115
imported++;
116116
}
117117
} catch (Exception ex) {
118118
failed++;
119119
audience.sendMessage(Component.text(
120-
"Failed to import lease region " + lease.worldGuardRegionId() + ": " + ex.getMessage(),
120+
"Failed to import leasehold region " + lease.worldGuardRegionId() + ": " + ex.getMessage(),
121121
NamedTextColor.RED));
122122
}
123123
processed++;
@@ -184,7 +184,7 @@ public static CompletableFuture<ImportResult> performImport(@NotNull Database da
184184
})
185185
.filter(Objects::nonNull)
186186
.toList();
187-
List<LeaseDto> rentRegions = fileManager.getRentsRef().stream()
187+
List<LeaseholdDto> rentRegions = fileManager.getRentsRef().stream()
188188
.map(region -> {
189189
ProtectedRegion protectedRegion = region.getRegion();
190190
World world = region.getWorld();
@@ -193,9 +193,9 @@ public static CompletableFuture<ImportResult> performImport(@NotNull Database da
193193
return null;
194194
}
195195

196-
UUID authorityId = Objects.requireNonNullElse(region.getLandlord(), settings.defaultLeaseAuthority());
196+
UUID authorityId = Objects.requireNonNullElse(region.getLandlord(), settings.defaultLeaseholdAuthority());
197197
UUID tenantId = region.getRenter();
198-
return new LeaseDto(protectedRegion.getId(),
198+
return new LeaseholdDto(protectedRegion.getId(),
199199
world.getUID(),
200200
region.getPrice(),
201201
TimeUnit.MILLISECONDS.toSeconds(region.getDuration()),
@@ -212,7 +212,7 @@ public static CompletableFuture<ImportResult> performImport(@NotNull Database da
212212
int totalRegions = buyRegions.size() + rentRegions.size();
213213
audience.sendMessage(Component.text(
214214
"Starting import: " + buyRegions.size() + " freehold regions, "
215-
+ rentRegions.size() + " lease regions (" + totalRegions + " total), "
215+
+ rentRegions.size() + " leasehold regions (" + totalRegions + " total), "
216216
+ signs.size() + " sign(s)",
217217
NamedTextColor.YELLOW));
218218
return CompletableFuture.supplyAsync(() -> importAll(database, audience, buyRegions, rentRegions, signs), executor);
@@ -235,7 +235,7 @@ private record FreeholdDto(@NotNull String worldGuardRegionId,
235235
@Nullable UUID titleHolder) {
236236
}
237237

238-
private record LeaseDto(@NotNull String worldGuardRegionId,
238+
private record LeaseholdDto(@NotNull String worldGuardRegionId,
239239
@NotNull UUID worldId,
240240
double price,
241241
long durationSeconds,

0 commit comments

Comments
 (0)