Release 1.13.0

.gitignore

@@ -0,0 +1,115 @@
+# User-specific stuff
+.idea/
+
+*.iml
+*.ipr
+*.iws
+
+# IntelliJ
+out/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+target/
+
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.flattened-pom.xml
+
+# Common working directory
+run/
+
+.junie

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,3 @@
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip

api/pom.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.btuk</groupId>
+        <artifactId>Proxy</artifactId>
+        <version>1.13.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.btuk.proxy</groupId>
+    <artifactId>api</artifactId>
+    <name>Proxy API</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <openapi-generator.version>7.4.0</openapi-generator.version>
+        <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
+        <jakarta-ws-rs-api.version>3.1.0</jakarta-ws-rs-api.version>
+        <jersey.version>3.1.5</jersey.version>
+        <grizzly.version>4.0.2</grizzly.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.btuk.proxy</groupId>
+            <artifactId>database</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.btuk.proxy</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${jakarta-ws-rs-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Jersey + Grizzly for API -->
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-grizzly2-http</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>${openapi-generator.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/src/main/resources/openapi.yaml</inputSpec>
+                            <generatorName>jaxrs-spec</generatorName>
+                            <apiPackage>org.btuk.proxy.api</apiPackage>
+                            <modelPackage>org.btuk.proxy.api.model</modelPackage>
+                            <configOptions>
+                                <interfaceOnly>true</interfaceOnly>
+                                <useTags>true</useTags>
+                                <returnResponse>true</returnResponse>
+                                <useJakartaEe>true</useJakartaEe>
+                                <generatePom>false</generatePom>
+                                <useSwaggerAnnotations>false</useSwaggerAnnotations>
+                                <openApiNullable>false</openApiNullable>
+                                <useBeanValidation>false</useBeanValidation>
+                                <performBeanValidation>false</performBeanValidation>
+                            </configOptions>
+                            <generateSupportingFiles>false</generateSupportingFiles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/openapi/src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

api/src/main/java/org/btuk/proxy/api/impl/BuildingsApiImpl.java

@@ -0,0 +1,106 @@
+package org.btuk.proxy.api.impl;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import org.btuk.proxy.api.BuildingsApi;
+import org.btuk.proxy.api.model.Building;
+import org.btuk.proxy.api.model.BuildingCount;
+import org.btuk.proxy.api.model.BuildingGridResponse;
+import org.btuk.proxy.api.model.GridCell;
+import org.btuk.proxy.database.dto.BuildingDTO;
+import org.btuk.proxy.database.dto.GridCellDTO;
+import org.btuk.proxy.database.sql.GlobalSQL;
+
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Path("/buildings")
+public class BuildingsApiImpl implements BuildingsApi {
+
+    private final GlobalSQL globalSQL;
+
+    @Inject
+    public BuildingsApiImpl(GlobalSQL globalSQL) {
+        this.globalSQL = globalSQL;
+    }
+
+    @Override
+    public Response getBuildingsByArea(Double minLat, Double maxLat, Double minLon, Double maxLon, UUID playerUuid) {
+        String playerUuidStr = playerUuid != null ? playerUuid.toString() : null;
+        List<BuildingDTO> buildingDTOs = globalSQL.getBuildingsByArea(minLat, maxLat, minLon, maxLon, playerUuidStr);
+
+        List<Building> buildings = buildingDTOs.stream()
+                .map(this::mapBuilding)
+                .collect(Collectors.toList());
+        return Response.ok(buildings).build();
+    }
+
+    @Override
+    public Response getBuildingCount(List<UUID> playerUuid, Double minLat, Double maxLat, Double minLon, Double maxLon, Boolean isPublic, Boolean playerBuilt) {
+        List<String> playerUuidStrs = null;
+        if (playerUuid != null && !playerUuid.isEmpty()) {
+            playerUuidStrs = playerUuid.stream()
+                    .map(UUID::toString)
+                    .collect(Collectors.toList());
+        }
+
+        int count = globalSQL.getBuildingCount(playerUuidStrs, minLat, maxLat, minLon, maxLon, isPublic, playerBuilt);
+
+        BuildingCount buildingCount = new BuildingCount();
+        buildingCount.setCount(count);
+
+        return Response.ok(buildingCount).build();
+    }
+
+    @Override
+    public Response getBuildingGridCount(Double minLat, Double maxLat, Double minLon, Double maxLon, Double stepLat, Double stepLon, UUID playerUuid) {
+        if (stepLat == null || stepLat <= 0 || stepLon == null || stepLon <= 0) {
+            return Response.status(Response.Status.BAD_REQUEST).entity("stepLat and stepLon must be greater than 0").build();
+        }
+
+        String playerUuidStr = (playerUuid != null) ? playerUuid.toString() : null;
+
+        List<GridCellDTO> dbGridCounts = globalSQL.getBuildingGridCounts(minLat, maxLat, minLon, maxLon, stepLat, stepLon, playerUuidStr);
+
+        List<GridCell> cells = new ArrayList<>();
+
+        for (GridCellDTO dbCell : dbGridCounts) {
+            GridCell cell = new GridCell();
+            cell.setLat(dbCell.lat());
+            cell.setLon(dbCell.lon());
+            cell.setMinLat(dbCell.minLat());
+            cell.setMaxLat(dbCell.maxLat());
+            cell.setMinLon(dbCell.minLon());
+            cell.setMaxLon(dbCell.maxLon());
+            cell.setRow(dbCell.row());
+            cell.setCol(dbCell.col());
+            cell.setCount(dbCell.count());
+            cells.add(cell);
+        }
+
+        BuildingGridResponse response = new BuildingGridResponse();
+        response.setCells(cells);
+
+        return Response.ok(response).build();
+    }
+
+    private Building mapBuilding(BuildingDTO dto) {
+        Building building = new Building();
+        building.setBuildingId(dto.buildingId());
+        building.setPlayerName(dto.playerName());
+        building.setPlayerId(dto.playerId() != null ? UUID.fromString(dto.playerId()) : null);
+        building.setIsPublic(dto.isPublic());
+        building.setPlayerBuilt(dto.playerBuilt());
+        if (dto.timeAdded() != null) {
+            building.setTimeAdded(Date.from(dto.timeAdded().toInstant(ZoneOffset.UTC)));
+        }
+        building.setLat(dto.lat());
+        building.setLon(dto.lon());
+        return building;
+    }
+}