From 6ab6b8ae17bc76cc709440d8bfadeb25ed4f14e5 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Mon, 4 Mar 2019 19:31:39 +0000
Subject: [PATCH] Removed dependency upon net.kemitix:conditional to avoid
 circular dependency (#174)

---
 CHANGELOG.org                                            | 7 +++++++
 builder/pom.xml                                          | 6 ------
 .../net/kemitix/checkstyle/ruleset/builder/Rule.java     | 9 +++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 2be2d75..725937d 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+* [5.3.5] - 2019-03-04
+
+** Removed
+
+   - Removed dependency upon net.kemitix:conditional to avoid circular
+     dependency
+
 * [5.3.4] - 2019-03-01
 
 ** Dependencies
diff --git a/builder/pom.xml b/builder/pom.xml
index b175cf2..8a718dd 100644
--- a/builder/pom.xml
+++ b/builder/pom.xml
@@ -31,7 +31,6 @@
         <map-builder.version>1.0.0</map-builder.version>
         <mockito.version>2.24.5</mockito.version>
         <assertj.version>3.12.1</assertj.version>
-        <conditional.version>0.7.0</conditional.version>
         <classgraph.version>4.8.11</classgraph.version>
 
         <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
@@ -60,11 +59,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>net.kemitix</groupId>
-            <artifactId>conditional</artifactId>
-            <version>${conditional.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.github.classgraph</groupId>
             <artifactId>classgraph</artifactId>
diff --git a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
index 73323a8..b72b71e 100644
--- a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
+++ b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
@@ -24,7 +24,6 @@ package net.kemitix.checkstyle.ruleset.builder;
 import com.speedment.common.mapstream.MapStream;
 import lombok.Getter;
 import lombok.Setter;
-import net.kemitix.conditional.Value;
 
 import java.net.URI;
 import java.util.Comparator;
@@ -155,9 +154,11 @@ public class Rule {
             final String ruleClassname,
             final Rule rule
                           ) {
-        return Value.<String>where(hasProperties(rule))
-                .then(() -> moduleWithParameters(rule, ruleClassname))
-                .otherwise(() -> moduleNoParameters(ruleClassname));
+        if (hasProperties(rule)) {
+            return moduleWithParameters(rule, ruleClassname);
+        } else {
+            return moduleNoParameters(ruleClassname);
+        }
     }
 
     private static String moduleNoParameters(