remove TODO and add preconditons to deleteRecipe

.circleci/config.yml

@@ -35,7 +35,7 @@ jobs:
 
       - deploy:
           command: |
-            if [[ "${CIRCLE_BRANCH}" == "develop" || "${CIRCLE_TAG}" =~ [0-9]+(\.[0-9]+)+(-[a-zA-Z]+[0-9]*)* ]]; then
+            if [[ "${CIRCLE_TAG}" =~ [0-9]+(\.[0-9]+)+(-[a-zA-Z]+[0-9]*)* ]]; then
               ./gradlew --stacktrace --continue publish
             fi
 

build.gradle

@@ -37,9 +37,7 @@ allprojects {
     apply plugin: 'nebula.dependency-recommender'
 
     group 'com.palantir.conjure.examples'
-    // TODO: clarify error message
-    // workaround for compileConjureTypescript Error: Expected version to be valid SLS version but found "b02eaaf.dirty"
-    version "0.1.0"
+    version gitVersion()
 
     repositories {
         mavenCentral()

example-server/src/main/java/com/palantir/conjure/examples/resources/RecipeBookResource.java

@@ -39,11 +39,9 @@ public RecipeBookResource(Set<Recipe> recipes) {
     @Override
     public Recipe getRecipe(RecipeName name) {
         Preconditions.checkNotNull(name, "Recipe name must be provided.");
-        Recipe maybeRecipe = this.recipes.get(name);
-        if (maybeRecipe == null) {
-            throw RecipeErrors.recipeNotFound(name);
-        }
-        return maybeRecipe;
+        checkIfRecipeExists(name);
+
+        return recipes.get(name);
     }
 
     @Override
@@ -58,6 +56,13 @@ public Set<Recipe> getAllRecipes() {
 
     @Override
     public void deleteRecipe(RecipeName name) {
+        checkIfRecipeExists(name);
         recipes.remove(name);
     }
+
+    private void checkIfRecipeExists(RecipeName name) {
+        if (!this.recipes.containsKey(name)) {
+            throw RecipeErrors.recipeNotFound(name);
+        }
+    }
 }