Bladeren bron

use json regex quoting, use compact json representation

tags/v0.5.0
Jonathan Cobb 5 jaren geleden
bovenliggende
commit
5e14451515
3 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. +2
    -1
      bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java
  2. +1
    -1
      utils/abp-parser
  3. +1
    -1
      utils/cobbzilla-utils

+ 2
- 1
bubble-server/src/main/java/bubble/rule/bblock/BubbleBlock.java Bestand weergeven

@@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit;

import static org.cobbzilla.util.daemon.ZillaRuntime.*;
import static org.cobbzilla.util.io.StreamUtil.stream2string;
import static org.cobbzilla.util.json.JsonUtil.COMPACT_MAPPER;
import static org.cobbzilla.util.json.JsonUtil.json;
import static org.cobbzilla.util.security.ShaUtil.sha256_hex;
import static org.cobbzilla.util.string.StringUtil.UTF8cs;
@@ -105,7 +106,7 @@ public class BubbleBlock extends TrafficAnalytics {
} else {
return new FilterMatchResponse()
.setDecision(FilterMatchDecision.match)
.setMeta(new NameAndValue[]{new NameAndValue(META_BLOCK_FILTERS, json(specs))});
.setMeta(new NameAndValue[]{new NameAndValue(META_BLOCK_FILTERS, json(specs, COMPACT_MAPPER))});
}
}
return die("getFilterMatchResponse: invalid decisionType: "+decision.getDecisionType());


+ 1
- 1
utils/abp-parser

@@ -1 +1 @@
Subproject commit 801d5bbf6f4327a407f8af8e7d7788302f348639
Subproject commit 76b5b8b26a95cb1c66512af83b4c9b585544afeb

+ 1
- 1
utils/cobbzilla-utils

@@ -1 +1 @@
Subproject commit cf3d35b3f6dbb2bd3a1b31abb2c1ded41aa15378
Subproject commit d1d7639d04a9ea8db82022b3a72382b8e3d0a5da

Laden…
Annuleren
Opslaan