diff --git a/http-service/src/main/java/net/runelite/http/service/animation/AnimationEndpoint.java b/http-service/src/main/java/net/runelite/http/service/animation/AnimationEndpoint.java index 57b54c98d1..65dd873d60 100644 --- a/http-service/src/main/java/net/runelite/http/service/animation/AnimationEndpoint.java +++ b/http-service/src/main/java/net/runelite/http/service/animation/AnimationEndpoint.java @@ -40,33 +40,33 @@ import org.sql2o.Sql2o; public class AnimationEndpoint { private static final String CREATE_SQL = "CREATE TABLE IF NOT EXISTS `animation` (\n" - + " `id` int(11) NOT NULL AUTO_INCREMENT,\n" - + " `region` int(11) NOT NULL,\n" - + " `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n" - + " `rev` int(11) NOT NULL,\n" - + " `anim1` int(11),\n" - + " `anim2` int(11),\n" - + " `anim3` int(11),\n" - + " `anim4` int(11),\n" - + " `anim5` int(11),\n" - + " `anim6` int(11),\n" - + " `anim7` int(11),\n" - + " `anim8` int(11),\n" - + " `anim9` int(11),\n" - + " `anim10` int(11),\n" - + " PRIMARY KEY (`id`),\n" - + " KEY `npcid` (`npcid`,`time`)\n" - + ") ENGINE=InnoDB"; + + " `id` int(11) NOT NULL AUTO_INCREMENT,\n" + + " `npcid` int(11) NOT NULL,\n" + + " `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n" + + " `rev` int(11) NOT NULL,\n" + + " `anim1` int(11),\n" + + " `anim2` int(11),\n" + + " `anim3` int(11),\n" + + " `anim4` int(11),\n" + + " `anim5` int(11),\n" + + " `anim6` int(11),\n" + + " `anim7` int(11),\n" + + " `anim8` int(11),\n" + + " `anim9` int(11),\n" + + " `anim10` int(11),\n" + + " PRIMARY KEY (`id`),\n" + + " KEY `npcid` (`npcid`,`time`)\n" + + ") ENGINE=InnoDB"; private final Sql2o sql2o; private final Cache keyCache = CacheBuilder.newBuilder() - .maximumSize(1024) - .build(); + .maximumSize(1024) + .build(); @Autowired public AnimationEndpoint( - @Qualifier("Runelite SQL2O") Sql2o sql2o + @Qualifier("Runelite SQL2O") Sql2o sql2o ) { this.sql2o = sql2o; @@ -74,18 +74,18 @@ public class AnimationEndpoint try (Connection con = sql2o.beginTransaction()) { con.createQuery(CREATE_SQL) - .executeUpdate(); + .executeUpdate(); } } private AnimationEntry findLatestAnimations(Connection con, int npcid) { return con.createQuery("select npcid, time, anim1, anim2, anim3, anim4, anim5, anim6, anim7, anim8, anim9, anim10 from animation " - + "where npcid = :npcid " - + "order by time desc " - + "limit 1") - .addParameter("npcid", npcid) - .executeAndFetchFirst(AnimationEntry.class); + + "where npcid = :npcid " + + "order by time desc " + + "limit 1") + .addParameter("npcid", npcid) + .executeAndFetchFirst(AnimationEntry.class); } public void submit(AnimationRequest animationRequest) @@ -98,7 +98,7 @@ public class AnimationEndpoint AnimationCache animationCache = keyCache.getIfPresent(npcid); if (animationCache == null - || animationCache.getAnim1() != animations[0] + || animationCache.getAnim1() != animations[0] || animationCache.getAnim2() != animations[1] || animationCache.getAnim3() != animations[2] || animationCache.getAnim4() != animations[3] @@ -137,7 +137,7 @@ public class AnimationEndpoint // already have these? if (animationEntry != null - && animationEntry.getAnimations()[0] == animations[0] + && animationEntry.getAnimations()[0] == animations[0] && animationEntry.getAnimations()[1] == animations[1] && animationEntry.getAnimations()[2] == animations[2] && animationEntry.getAnimations()[3] == animations[3] @@ -155,22 +155,22 @@ public class AnimationEndpoint if (query == null) { query = con.createQuery("insert into animation (npcid, rev, anim1, anim2, anim3, anim4, anim5, anim6, anim7, anim8, anim9, anim10) " - + "values (:npcid, :rev, :anim1, :anim2, :anim3, :anim4, anim5, anim6, anim7, anim8, anim9, anim10)"); + + "values (:npcid, :rev, :anim1, :anim2, :anim3, :anim4, anim5, anim6, anim7, anim8, anim9, anim10)"); } query.addParameter("npcid", npcid) - .addParameter("rev", animationRequest.getRevision()) - .addParameter("anim1", animations[0]) - .addParameter("anim2", animations[1]) - .addParameter("anim3", animations[2]) - .addParameter("anim4", animations[3]) - .addParameter("anim5", animations[4]) - .addParameter("anim6", animations[5]) - .addParameter("anim7", animations[6]) - .addParameter("anim8", animations[7]) - .addParameter("anim9", animations[8]) - .addParameter("anim10", animations[9]) - .addToBatch(); + .addParameter("rev", animationRequest.getRevision()) + .addParameter("anim1", animations[0]) + .addParameter("anim2", animations[1]) + .addParameter("anim3", animations[2]) + .addParameter("anim4", animations[3]) + .addParameter("anim5", animations[4]) + .addParameter("anim6", animations[5]) + .addParameter("anim7", animations[6]) + .addParameter("anim8", animations[7]) + .addParameter("anim9", animations[8]) + .addParameter("anim10", animations[9]) + .addToBatch(); } if (query != null) @@ -186,10 +186,10 @@ public class AnimationEndpoint try (Connection con = sql2o.open()) { return con.createQuery( - "select t1.npcid, t2.time, t2.rev, t2.anim1, t2.anim2, t2.anim3, t2.anim4, t2.anim5, t2.anim6, t2.anim7, t2.anim8, t2.anim9, t2.anim10 from " + - "(select npcid,max(id) as id from animation group by npcid) t1 " + - "join animation t2 on t1.id = t2.id") - .executeAndFetch(AnimationEntry.class); + "select t1.npcid, t2.time, t2.rev, t2.anim1, t2.anim2, t2.anim3, t2.anim4, t2.anim5, t2.anim6, t2.anim7, t2.anim8, t2.anim9, t2.anim10 from " + + "(select npcid,max(id) as id from animation group by npcid) t1 " + + "join animation t2 on t1.id = t2.id") + .executeAndFetch(AnimationEntry.class); } } @@ -198,9 +198,9 @@ public class AnimationEndpoint try (Connection con = sql2o.open()) { return con.createQuery("select npcid, time, rev, anim1, anim2, anim3, anim4, anim5, anim6, anim7, anim8, anim9, anim10 from animation " - + "where npcid = :npcid order by time desc limit 1") - .addParameter("npcid", npcid) - .executeAndFetchFirst(AnimationEntry.class); + + "where npcid = :npcid order by time desc limit 1") + .addParameter("npcid", npcid) + .executeAndFetchFirst(AnimationEntry.class); } } }