Feedback

.github/classroom/autograding.json

@@ -3,7 +3,7 @@
     {
       "name": "Initial step",
       "setup": "",
-      "run": "mvn clean package",
+      "run": "mvn clean package -DskipTests=true",
       "input": "",
       "output": "",
       "comparison": "included",
@@ -30,16 +30,6 @@
       "timeout": 10,
       "points": 10
     },
-    {
-      "name": "Initial tests",
-      "setup": "",
-      "run": "mvn -q test",
-      "input": "",
-      "output": "",
-      "comparison": "included",
-      "timeout": 10,
-      "points": 10
-    },
     {
       "name": "Cucumber final tests",
       "setup": "",

.github/workflows/classroom.yml

@@ -8,4 +8,9 @@
         runs-on: ubuntu-latest
         steps:
           - uses: actions/checkout@v2
+          - name: Set up JDK 16
+            uses: actions/setup-java@v2
+            with:
+              java-version: '16'
+              distribution: 'adopt'
           - uses: education/autograding@v1

.github/workflows/pipeline.yml

@@ -76,24 +76,24 @@ jobs:
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/re21
 
-  deploy-app:
-    needs: publish-image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pull the released image
-        run: docker pull ${{ secrets.DOCKER_USERNAME }}/re21
-      - name: connect to the Heroku registry
-        run: |
-          docker login --username=_ \
-                       --password=${{ secrets.HEROKU_API_KEY }} \
-                       registry.heroku.com
-      - name: prepare the released image for deployment
-        run: |
-          docker tag ${{ secrets.DOCKER_USERNAME }}/re21 \
-                 registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
-      - name: push the image to heroku
-        run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
-      - name: release the image into a new container
-        run: heroku container:release web -a ${{ secrets.HEROKU_APP_NAME }}
-        env:
-          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+#  deploy-app:
+#    needs: publish-image
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Pull the released image
+#        run: docker pull ${{ secrets.DOCKER_USERNAME }}/re21
+#      - name: connect to the Heroku registry
+#        run: |
+#          docker login --username=_ \
+#                       --password=${{ secrets.HEROKU_API_KEY }} \
+#                       registry.heroku.com
+#      - name: prepare the released image for deployment
+#        run: |
+#          docker tag ${{ secrets.DOCKER_USERNAME }}/re21 \
+#                 registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
+#      - name: push the image to heroku
+#        run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
+#      - name: release the image into a new container
+#        run: heroku container:release web -a ${{ secrets.HEROKU_APP_NAME }}
+#        env:
+#          HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}

Dockerfile

@@ -4,4 +4,4 @@ FROM openjdk:16-alpine
 ENV PORT=8080
 WORKDIR /app
 COPY target/re-21-SHADED.jar .
-CMD ["java", "-jar", "re-21-SHADED.jar"]
+CMD ["java", "-jar", "re-21-SHADED.jar"]

src/main/java/Order.java

@@ -7,7 +7,6 @@ public class Order {
 
     private List<Drink> contents = new LinkedList<>();
     private double taxes = 0.0;
-
     private String owner;
     public void setOwner(String who) { this.owner = who; }
     private String recipient;

src/test/java/OrderUnitTest.java

@@ -1,12 +1,15 @@
 import org.junit.Test;
+
 import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 
 public class OrderUnitTest {
 
     @Test
     public void empty_order_by_default() {
         Order o = new Order();
+
         o.setOwner("Romeo");
         o.setRecipient("Juliet");
         List<Order.Drink> drinks = o.getDrinks();