Fix up comments

xiv-gear-planner · Sep 2, 2024 · 6635572 · 6635572
1 parent 34265a7
commit 6635572
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/src/main/groovy/gg/xp/xivgear/dataapi/endpoints/BaseDataEndpoint.groovy b/src/main/groovy/gg/xp/xivgear/dataapi/endpoints/BaseDataEndpoint.groovy
@@ -1,6 +1,5 @@
 package gg.xp.xivgear.dataapi.endpoints
 
-
 import gg.xp.xivgear.dataapi.datamanager.DataManager
 import gg.xp.xivgear.dataapi.datamanager.FullData
 import groovy.transform.CompileStatic
@@ -9,8 +8,6 @@ import io.micronaut.core.annotation.NonNull
 import io.micronaut.http.HttpHeaders
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
-import io.micronaut.jackson.codec.JsonMediaTypeCodec
-import jakarta.inject.Inject
 
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
@@ -27,8 +24,8 @@ import java.time.temporal.ChronoUnit
  *     <li>Returning 304 Not Modified when the client already has the newest data.</li>
  * </ul>
  *
- * @param <In>    A type that encompasses whatever necessary parameters.
- * @param <Out>   The response object type.
+ * @param <In>     A type that encompasses whatever necessary parameters.
+ * @param <Out>    The response object type.
  */
 @TupleConstructor(includeFields = true, defaults = false)
 @CompileStatic

diff --git a/src/main/groovy/gg/xp/xivgear/dataapi/gear/GearSource.groovy b/src/main/groovy/gg/xp/xivgear/dataapi/gear/GearSource.groovy
@@ -24,7 +24,7 @@ class GearSource {
 					}
 					else {
 //						return Unknown
-						boolean isCraftable = fd.itemsWithRecipes.contains(rowId) // TODO
+						boolean isCraftable = fd.itemsWithRecipes.contains(rowId)
 						if (isCraftable) {
 							return Crafted
 						}
@@ -42,7 +42,7 @@ class GearSource {
 					if (GearLevels.isArtifactLevel(ilvl)) {
 						if (isWeapon) {
 							// Ambiguous due to start-of-expac extreme trial weapons having the same level
-							// TODO: do these AF weapons have a shop that we can use?
+							// TODO: these AF weapons probably have a shop that we can use.
 							return Unknown
 						}
 						else {
@@ -64,7 +64,6 @@ class GearSource {
 					}
 					// Savage/Ultimate weapon
 					else if (GearLevels.isSavageRaidWeaponLevel(ilvl) && isWeapon) {
-						// TODO: Aloalo has some weapons, doesn't it?
 						if (name.contains("Ultimate")) {
 							return Ultimate
 						}
@@ -77,33 +76,33 @@ class GearSource {
 					}
 					// Unaug tome, alliance raid
 					else if (GearLevels.isUnAugmentedTomeLevel(ilvl)) {
-						// TODO
+						// TODO: shops
 						return Unknown
-						boolean hasShop = true
-						if (hasShop) {
-							return Tome
-						}
-						else {
-							return AllianceRaid
-						}
+//						boolean hasShop = true
+//						if (hasShop) {
+//							return Tome
+//						}
+//						else {
+//							return AllianceRaid
+//						}
 					}
 					// Normal raids, start-of-expac extreme accs
 					else if (GearLevels.isNormalRaidLevel(ilvl)) {
 						if (isWeapon) {
 							return ExtremeTrial
 						}
 						else {
-							// TODO
+							// TODO: shops
 							return Unknown
-							boolean hasShop = true
-							if (hasShop) {
-								// TODO: this logic is untested
-								// old logic just put these as 'other'
-								return NormalRaid
-							}
-							else {
-								return ExtremeTrial
-							}
+//							boolean hasShop = true
+//							if (hasShop) {
+//								// TODO: this logic is untested
+//								// old logic just put these as 'other'
+//								return NormalRaid
+//							}
+//							else {
+//								return ExtremeTrial
+//							}
 						}
 					}
 					else if (GearLevels.isExTrialLevel(ilvl) && isWeapon) {