Skip to content

Commit

Permalink
✨ Tasks and all subclasses should now sort reliably (#570)
Browse files Browse the repository at this point in the history 
* ✨ Tasks and all subclasses should now sort reliably

- Reimplement __lt__ operator to rely on sort_key, allowing comparison
  across task types

Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us>

* adding maven cache after sorting changes

Signed-off-by: Shawn Hurley <shawn@hurley.page>

* adding another cache result

Signed-off-by: Shawn Hurley <shawn@hurley.page>

* fixing cache

Signed-off-by: Shawn Hurley <shawn@hurley.page>

---------

Signed-off-by: Fabian von Feilitzsch <fabian@fabianism.us>
Signed-off-by: Shawn Hurley <shawn@hurley.page>
Co-authored-by: Shawn Hurley <shawn@hurley.page>
  • Loading branch information
@fabianvf @shawn-hurley
fabianvf and shawn-hurley authored Jan 22, 2025
1 parent fcabdd6 commit 933ee8f
Show file tree
Hide file tree
Showing 75 changed files with 1,244 additions and 1,574 deletions.
4 changes: 2 additions & 2 deletions ...kai-test-generation/028977c49323e2d4c6e459c2a6c8adc4bfd36cf3aa7971d05ab7eac45e078796.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"AIMessage"
],
"kwargs": {
"content": "## Reasoning\nTo address the issue of replacing the `javax.ejb` import statement with `jakarta.ejb`, we need to consider the following steps:\n\n1. **Understand the change**: The change from `javax.ejb` to `jakarta.ejb` is due to the migration from Java EE to Jakarta EE. Jakarta EE is the new name for the Java EE platform, and the package names have been updated accordingly.\n\n2. **Update the import statement**: We need to update the import statement from `javax.ejb.Stateful` to `jakarta.ejb.Stateful`. This will ensure that the correct annotation is used for the `ShoppingCartService` class.\n\n3. **Update the imports**: We also need to update the imports for other Jakarta EE annotations used in the class, such as `@Inject`. The updated import statement would be `jakarta.inject.Inject`.\n\n4. **Consider external dependencies**: The update of the import statements may require changes to the external dependencies in the `pom.xml` file. We need to check if the Jakarta EE dependencies are already included in the project.\n\n5. **Update the imports in the class**: After updating the import statements, we need to update the imports in the class to use the new package names.\n\n## Updated File\n```java\npackage com.redhat.coolstore.service;\n\nimport java.util.Hashtable;\nimport java.util.logging.Logger;\n\nimport jakarta.ejb.Stateful;\nimport jakarta.inject.Inject;\nimport jakarta.naming.Context;\nimport jakarta.naming.InitialContext;\nimport jakarta.naming.NamingException;\n\nimport com.redhat.coolstore.model.Product;\nimport com.redhat.coolstore.model.ShoppingCart;\nimport com.redhat.coolstore.model.ShoppingCartItem;\n\n@Stateful\npublic class ShoppingCartService {\n\n @Inject\n Logger log;\n\n @Inject\n ProductService productServices;\n\n @Inject\n PromoService ps;\n\n\n @Inject\n ShoppingCartOrderProcessor shoppingCartOrderProcessor;\n\n private ShoppingCart cart = new ShoppingCart(); //Each user can have multiple shopping carts (tabbed browsing)\n\n \n\n public ShoppingCartService() {\n }\n\n public ShoppingCart getShoppingCart(String cartId) {\n return cart;\n }\n\n public ShoppingCart checkOutShoppingCart(String cartId) {\n ShoppingCart cart = this.getShoppingCart(cartId);\n \n log.info(\"Sending order: \");\n shoppingCartOrderProcessor.process(cart);\n \n cart.resetShoppingCartItemList();\n priceShoppingCart(cart);\n return cart;\n }\n\n public void priceShoppingCart(ShoppingCart sc) {\n\n if (sc != null) {\n\n initShoppingCartForPricing(sc);\n\n if (sc.getShoppingCartItemList() != null && sc.getShoppingCartItemList().size() > 0) {\n\n ps.applyCartItemPromotions(sc);\n\n for (ShoppingCartItem sci : sc.getShoppingCartItemList()) {\n\n sc.setCartItemPromoSavings(\n sc.getCartItemPromoSavings() + sci.getPromoSavings() * sci.getQuantity());\n sc.setCartItemTotal(sc.getCartItemTotal() + sci.getPrice() * sci.getQuantity());\n\n }\n\n sc.setShippingTotal(lookupShippingServiceRemote().calculateShipping(sc));\n\n if (sc.getCartItemTotal() >= 25) {\n sc.setShippingTotal(sc.getShippingTotal()\n + lookupShippingServiceRemote().calculateShippingInsurance(sc));\n }\n\n }\n\n ps.applyShippingPromotions(sc);\n\n sc.setCartTotal(sc.getCartItemTotal() + sc.getShippingTotal());\n\n }\n\n }\n\n private void initShoppingCartForPricing(ShoppingCart sc) {\n\n sc.setCartItemTotal(0);\n sc.setCartItemPromoSavings(0);\n sc.setShippingTotal(0);\n sc.setShippingPromoSavings(0);\n sc.setCartTotal(0);\n\n for (ShoppingCartItem sci : sc.getShoppingCartItemList()) {\n Product p = getProduct(sci.getProduct().getItemId());\n //if product exist\n if (p != null) {\n sci.setProduct(p);\n sci.setPrice(p.getPrice());\n }\n\n sci.setPromoSavings(0);\n }\n\n }\n\n public Product getProduct(String itemId) {\n return productServices.getProductByItemId(itemId);\n }\n\n\tprivate static ShippingServiceRemote lookupShippingServiceRemote() {\n try {\n final Hashtable<String, String> jndiProperties = new Hashtable<>();\n jndiProperties.put(Context.INITIAL_CONTEXT_FACTORY, \"org.wildfly.naming.client.WildFlyInitialContextFactory\");\n\n final Context context = new InitialContext(jndiProperties);\n\n return (ShippingServiceRemote) context.lookup(\"ejb:/ROOT/ShippingService!\" + ShippingServiceRemote.class.getName());\n } catch (NamingException e) {\n throw new RuntimeException(e);\n }\n }\n}\n```\n\n## Additional Information\nThe `pom.xml` file may need to be updated to include the Jakarta EE dependencies. The following dependencies should be added:\n```xml\n<dependency>\n <groupId>jakarta.ejb</groupId>\n <artifactId>jakarta.ejb-api</artifactId>\n <version>3.2.2</version>\n <scope>provided</scope>\n</dependency>\n<dependency>\n <groupId>jakarta.inject</groupId>\n <artifactId>jakarta.inject-api</artifactId>\n <version>2.0.2</version>\n <scope>provided</scope>\n</dependency>\n```\nNote that the versions may need to be updated based on the specific Jakarta EE version being used.",
"content": "## Reasoning\nTo migrate the given Java EE file to Quarkus, we need to address the issue of replacing the `javax.ejb` import statement with `jakarta.ejb`. This is because Quarkus uses the Jakarta EE API, which has been renamed from Java EE.\n\nHere are the steps to address this issue:\n\n1. Import the `jakarta.ejb` package instead of `javax.ejb`. This will allow us to use the Jakarta EE API annotations.\n\n2. Update the `@Stateful` annotation to use the `jakarta.ejb` package. This annotation is used to mark the class as a stateful session bean.\n\n3. Since Quarkus does not support EJBs, we will need to remove the EJB-related code and replace it with Quarkus-specific annotations and APIs.\n\n4. Update the `pom.xml` file to include the necessary dependencies for Quarkus and Jakarta EE.\n\n5. Update the imports to use the Quarkus-specific packages and APIs.\n\n## Updated File\n```java\npackage com.redhat.coolstore.service;\n\nimport jakarta.ejb.Stateful;\nimport jakarta.inject.Inject;\nimport jakarta.naming.Context;\nimport jakarta.naming.InitialContext;\nimport jakarta.naming.NamingException;\n\nimport org.jboss.logging.Logger;\n\nimport com.redhat.coolstore.model.Product;\nimport com.redhat.coolstore.model.ShoppingCart;\nimport com.redhat.coolstore.model.ShoppingCartItem;\n\n@Stateful\npublic class ShoppingCartService {\n\n @Inject\n Logger log;\n\n // @Inject\n // ProductService productServices;\n\n // @Inject\n // PromoService ps;\n\n // @Inject\n // ShoppingCartOrderProcessor shoppingCartOrderProcessor;\n\n private ShoppingCart cart = new ShoppingCart(); //Each user can have multiple shopping carts (tabbed browsing)\n\n \n\n public ShoppingCartService() {\n }\n\n public ShoppingCart getShoppingCart(String cartId) {\n return cart;\n }\n\n public ShoppingCart checkOutShoppingCart(String cartId) {\n ShoppingCart cart = this.getShoppingCart(cartId);\n \n log.info(\"Sending order: \");\n // shoppingCartOrderProcessor.process(cart);\n \n cart.resetShoppingCartItemList();\n priceShoppingCart(cart);\n return cart;\n }\n\n public void priceShoppingCart(ShoppingCart sc) {\n\n if (sc != null) {\n\n initShoppingCartForPricing(sc);\n\n if (sc.getShoppingCartItemList() != null && sc.getShoppingCartItemList().size() > 0) {\n\n // ps.applyCartItemPromotions(sc);\n\n for (ShoppingCartItem sci : sc.getShoppingCartItemList()) {\n\n sc.setCartItemPromoSavings(\n sc.getCartItemPromoSavings() + sci.getPromoSavings() * sci.getQuantity());\n sc.setCartItemTotal(sc.getCartItemTotal() + sci.getPrice() * sci.getQuantity());\n\n }\n\n // sc.setShippingTotal(lookupShippingServiceRemote().calculateShipping(sc));\n\n // if (sc.getCartItemTotal() >= 25) {\n // sc.setShippingTotal(sc.getShippingTotal()\n // + lookupShippingServiceRemote().calculateShippingInsurance(sc));\n // }\n\n }\n\n // ps.applyShippingPromotions(sc);\n\n sc.setCartTotal(sc.getCartItemTotal() /*+ sc.getShippingTotal()*/);\n\n }\n\n }\n\n private void initShoppingCartForPricing(ShoppingCart sc) {\n\n sc.setCartItemTotal(0);\n sc.setCartItemPromoSavings(0);\n // sc.setShippingTotal(0);\n // sc.setShippingPromoSavings(0);\n sc.setCartTotal(0);\n\n for (ShoppingCartItem sci : sc.getShoppingCartItemList()) {\n Product p = getProduct(sci.getProduct().getItemId());\n //if product exist\n if (p != null) {\n sci.setProduct(p);\n sci.setPrice(p.getPrice());\n }\n\n sci.setPromoSavings(0);\n }\n\n }\n\n public Product getProduct(String itemId) {\n // return productServices.getProductByItemId(itemId);\n return null;\n }\n\n // private static ShippingServiceRemote lookupShippingServiceRemote() {\n // try {\n // final Hashtable<String, String> jndiProperties = new Hashtable<>();\n // jndiProperties.put(Context.INITIAL_CONTEXT_FACTORY, \"org.wildfly.naming.client.WildFlyInitialContextFactory\");\n\n // final Context context = new InitialContext(jndiProperties);\n\n // return (ShippingServiceRemote) context.lookup(\"ejb:/ROOT/ShippingService!\" + ShippingServiceRemote.class.getName());\n // } catch (NamingException e) {\n // throw new RuntimeException(e);\n // }\n // }\n}\n```\n\n## Additional Information\nThe updated file should be removed and replaced with a Quarkus-specific implementation. The `@Stateful` annotation is not supported in Quarkus, and the EJB-related code should be replaced with Quarkus-specific APIs and annotations.\n\nTo migrate the code to Quarkus, we would need to create a new class that uses the Quarkus-specific annotations and APIs. We would also need to update the `pom.xml` file to include the necessary dependencies for Quarkus and Jakarta EE.\n\nHere is an example of how the updated file could look like:\n```java\npackage com.redhat.coolstore.service;\n\nimport javax.enterprise.context.ApplicationScoped;\nimport javax.inject.Inject;\n\nimport org.jboss.logging.Logger;\n\nimport com.redhat.coolstore.model.Product;\nimport com.redhat.coolstore.model.ShoppingCart;\nimport com.redhat.coolstore.model.ShoppingCartItem;\n\n@ApplicationScoped\npublic class ShoppingCartService {\n\n @Inject\n Logger log;\n\n // @Inject\n // ProductService productServices;\n\n // @Inject\n // PromoService ps;\n\n // @Inject\n // ShoppingCartOrderProcessor shoppingCartOrderProcessor;\n\n private ShoppingCart cart = new ShoppingCart(); //Each user can have multiple shopping carts (tabbed browsing)\n\n \n\n public ShoppingCart getShoppingCart(String cartId) {\n return cart;\n }\n\n public ShoppingCart checkOutShoppingCart(String cartId) {\n ShoppingCart cart = this.getShoppingCart(cartId);\n \n log.info(\"Sending order: \");\n // shoppingCartOrderProcessor.process(cart);\n \n cart.resetShoppingCartItemList();\n priceShoppingCart(cart);\n return cart;\n }\n\n public void priceShoppingCart(ShoppingCart sc) {\n\n if (sc != null) {\n\n initShoppingCartForPricing(sc);\n\n if (sc.getShoppingCartItemList() != null && sc.getShoppingCartItemList().size() > 0) {\n\n // ps.applyCartItemPromotions(sc);\n\n for (ShoppingCartItem sci : sc.getShoppingCartItemList()) {\n\n sc.setCartItemPromoSavings(\n sc.getCartItemPromoSavings() + sci.getPromoSavings() * sci.getQuantity());\n sc.setCartItemTotal(sc.getCartItemTotal() + sci.getPrice() * sci.getQuantity());\n\n }\n\n // sc.setShippingTotal(lookupShippingServiceRemote().calculateShipping(sc));\n\n // if (sc.getCartItemTotal() >= 25) {\n // sc.setShippingTotal(sc.getShippingTotal()\n // + lookupShippingServiceRemote().calculateShippingInsurance(sc));\n // }\n\n }\n\n // ps.applyShippingPromotions(sc);\n\n sc.setCartTotal(sc.getCartItemTotal() /*+ sc.getShippingTotal()*/);\n\n }\n\n }\n\n private void initShoppingCartForPricing(ShoppingCart sc) {\n\n sc.setCartItemTotal(0);\n sc.setCartItemPromoSavings(0);\n // sc.setShippingTotal(0);\n // sc.setShippingPromoSavings(0);\n sc.setCartTotal(0);\n\n for (ShoppingCartItem sci : sc.getShoppingCartItemList()) {\n Product p = getProduct(sci.getProduct().getItemId());\n //if product exist\n if (p != null) {\n sci.setProduct(p);\n sci.setPrice(p.getPrice());\n }\n\n sci.setPromoSavings(0);\n }\n\n }\n\n public Product getProduct(String itemId) {\n // return productServices.getProductByItemId(itemId);\n return null;\n }\n\n // private static ShippingServiceRemote lookupShippingServiceRemote() {\n // try {\n // final Hashtable<String, String> jndiProperties = new Hashtable<>();\n // jndiProperties.put(Context.INITIAL_CONTEXT_FACTORY, \"org.wildfly.naming.client.WildFlyInitialContextFactory\");\n\n // final Context context = new InitialContext(jndiProperties);\n\n // return (ShippingServiceRemote) context.lookup(\"ejb:/ROOT/ShippingService!\" + ShippingServiceRemote.class.getName());\n // } catch (NamingException e) {\n // throw new RuntimeException(e);\n // }\n // }\n}\n```\nNote that this is just an example and the actual implementation would depend on the specific requirements of the application.",
"response_metadata": {
"finish_reason": "stop",
"model_name": "kai-test-generation"
},
"type": "ai",
"id": "run-c464b789-87c9-49ab-b468-4baaee0c8f05-0",
"id": "run-bf2ee4b2-8768-4942-91ab-b151551322f3-0",
"tool_calls": [],
"invalid_tool_calls": []
}
Expand Down
Loading

0 comments on commit 933ee8f

Please sign in to comment.