simplify package structure

src/main/java/bubble/abp/spec/BlockDecision.java → src/main/java/bubble/abp/BlockDecision.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec;
+package bubble.abp;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/bubble/abp/spec/BlockDecisionType.java → src/main/java/bubble/abp/BlockDecisionType.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec;
+package bubble.abp;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/main/java/bubble/abp/spec/BlockList.java → src/main/java/bubble/abp/BlockList.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec;
+package bubble.abp;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/bubble/abp/spec/BlockListSource.java → src/main/java/bubble/abp/BlockListSource.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec;
+package bubble.abp;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/bubble/abp/spec/BlockSpec.java → src/main/java/bubble/abp/BlockSpec.java

@@ -1,6 +1,6 @@
-package bubble.abp.spec;
+package bubble.abp;
 
-import bubble.abp.spec.selector.BlockSelector;
+import bubble.abp.selector.BlockSelector;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -11,7 +11,7 @@ import org.cobbzilla.util.string.StringUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-import static bubble.abp.spec.selector.BlockSelector.buildSelector;
+import static bubble.abp.selector.BlockSelector.buildSelector;
 import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
 import static org.cobbzilla.util.http.HttpContentTypes.contentType;
 

src/main/java/bubble/abp/spec/BlockSpecTarget.java → src/main/java/bubble/abp/BlockSpecTarget.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec;
+package bubble.abp;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/bubble/abp/spec/selector/AbpClause.java → src/main/java/bubble/abp/selector/AbpClause.java

@@ -1,11 +1,11 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import lombok.*;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import org.cobbzilla.util.collection.ArrayUtil;
 
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorParseError.parseError;
 
 @NoArgsConstructor @Accessors(chain=true)
 @EqualsAndHashCode @ToString @Slf4j

src/main/java/bubble/abp/spec/selector/AbpClauseParseState.java → src/main/java/bubble/abp/selector/AbpClauseParseState.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 public enum AbpClauseParseState {
 

src/main/java/bubble/abp/spec/selector/AbpClauseType.java → src/main/java/bubble/abp/selector/AbpClauseType.java

@@ -1,8 +1,8 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorParseError.parseError;
 
 public enum AbpClauseType {
 

src/main/java/bubble/abp/spec/selector/AbpContains.java → src/main/java/bubble/abp/selector/AbpContains.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import lombok.*;
 import lombok.experimental.Accessors;

src/main/java/bubble/abp/spec/selector/AbpContainsType.java → src/main/java/bubble/abp/selector/AbpContainsType.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/main/java/bubble/abp/spec/selector/AbpProperty.java → src/main/java/bubble/abp/selector/AbpProperty.java

@@ -1,11 +1,11 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.util.StringTokenizer;
 
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorParseError.parseError;
 import static org.cobbzilla.util.json.JsonUtil.jsonQuoteRegex;
 
 @NoArgsConstructor @Accessors(chain=true)

src/main/java/bubble/abp/spec/selector/AbpPropertyType.java → src/main/java/bubble/abp/selector/AbpPropertyType.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/main/java/bubble/abp/spec/selector/BlockSelector.java → src/main/java/bubble/abp/selector/BlockSelector.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -6,8 +6,8 @@ import org.cobbzilla.util.collection.ArrayUtil;
 
 import java.util.StringTokenizer;
 
-import static bubble.abp.spec.selector.SelectorAttributeParseState.*;
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorAttributeParseState.*;
+import static bubble.abp.selector.SelectorParseError.parseError;
 import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
 
 @NoArgsConstructor @Accessors(chain=true)

src/main/java/bubble/abp/spec/selector/SelectorAttribute.java → src/main/java/bubble/abp/selector/SelectorAttribute.java

@@ -1,11 +1,11 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import lombok.*;
 import lombok.experimental.Accessors;
 import org.cobbzilla.util.collection.ArrayUtil;
 import org.cobbzilla.util.collection.NameAndValue;
 
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorParseError.parseError;
 
 @NoArgsConstructor @Accessors(chain=true)
 @ToString(of={"name", "comparison", "value", "style"})

src/main/java/bubble/abp/spec/selector/SelectorAttributeComparison.java → src/main/java/bubble/abp/selector/SelectorAttributeComparison.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/main/java/bubble/abp/spec/selector/SelectorAttributeParseState.java → src/main/java/bubble/abp/selector/SelectorAttributeParseState.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 public enum SelectorAttributeParseState {
 

src/main/java/bubble/abp/spec/selector/SelectorOperator.java → src/main/java/bubble/abp/selector/SelectorOperator.java

@@ -1,8 +1,8 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorParseError.parseError;
 
 public enum SelectorOperator {
 

src/main/java/bubble/abp/spec/selector/SelectorParseError.java → src/main/java/bubble/abp/selector/SelectorParseError.java

@@ -1,4 +1,4 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 public class SelectorParseError extends RuntimeException {
 

src/main/java/bubble/abp/spec/selector/SelectorType.java → src/main/java/bubble/abp/selector/SelectorType.java

@@ -1,8 +1,8 @@
-package bubble.abp.spec.selector;
+package bubble.abp.selector;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
-import static bubble.abp.spec.selector.SelectorParseError.parseError;
+import static bubble.abp.selector.SelectorParseError.parseError;
 
 public enum SelectorType {
 

src/test/java/bubble/abp/spec/BlockListTest.java

@@ -1,5 +1,9 @@
 package bubble.abp.spec;
 
+import bubble.abp.BlockDecision;
+import bubble.abp.BlockDecisionType;
+import bubble.abp.BlockList;
+import bubble.abp.BlockSpec;
 import org.junit.Test;
 
 import java.util.Arrays;

src/test/java/bubble/abp/spec/SelectorTest.java

@@ -1,15 +1,16 @@
 package bubble.abp.spec;
 
-import bubble.abp.spec.selector.*;
+import bubble.abp.BlockListSource;
+import bubble.abp.selector.*;
 import org.cobbzilla.util.collection.NameAndValue;
 import org.junit.Test;
 
 import java.io.InputStream;
 
-import static bubble.abp.spec.selector.SelectorAttributeComparison.*;
-import static bubble.abp.spec.selector.SelectorOperator.encloses;
-import static bubble.abp.spec.selector.SelectorOperator.next;
-import static bubble.abp.spec.selector.SelectorType.*;
+import static bubble.abp.selector.SelectorAttributeComparison.*;
+import static bubble.abp.selector.SelectorOperator.encloses;
+import static bubble.abp.selector.SelectorOperator.next;
+import static bubble.abp.selector.SelectorType.*;
 import static org.cobbzilla.util.daemon.ZillaRuntime.shortError;
 import static org.cobbzilla.util.io.StreamUtil.loadResourceAsStream;
 import static org.junit.Assert.assertEquals;