Skip to content

created TLP classes as defined in spec #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anlklsim wants to merge 9 commits into
base: master
Choose a base branch
from
Open

created TLP classes as defined in spec #97

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
35620c4
created TLP classes as defined in spec
anlklsim May 10, 2019
f0fb03b
Cleanup to adjust the usage
StephenOTT May 13, 2019
fa2d4c7
Add static vars for common props
StephenOTT May 13, 2019
3962a7b
Add logic to ensure TLP does not have custom props
StephenOTT May 13, 2019
7377b11
cleanup spec
StephenOTT May 13, 2019
38874d4
Update fake data generator to generate TLPs that match the spec
StephenOTT May 13, 2019
c53472d
added example bundle with statement and tlp markings and test spec
anlklsim May 16, 2019
c6da5d5
fixed NPE while testing the TLP bundle spec
anlklsim May 16, 2019
99529b4
Merge remote-tracking branch 'origin/tlp-markings' into tlp-markings
anlklsim May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed NPE while testing the TLP bundle spec
  • Loading branch information
@anlklsim
anlklsim committed May 16, 2019
commit c6da5d5994eb2940b8ffcad820c4c9b19c37eb5b
4 changes: 2 additions & 2 deletions src/main/java/io/digitalstate/stix/json/StixParsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public static BundleObject parseBundle(String bundleJsonString) throws IOExcepti
try {
return getJsonMapper().readValue(bundleJsonString, BundleObject.class);
} catch (IOException ex) {
if (ValidationException.class.isAssignableFrom(ex.getCause().getClass())) {
if (ex.getCause() != null && ValidationException.class.isAssignableFrom(ex.getCause().getClass())) {
throw new StixParserValidationException((ValidationException) ex.getCause());
} else {
throw ex;
Expand All @@ -130,7 +130,7 @@ public static BundleableObject parseObject(String objectJsonString) throws IOExc
try {
return getJsonMapper().readValue(objectJsonString, BundleableObject.class);
} catch (IOException ex) {
if (ValidationException.class.isAssignableFrom(ex.getCause().getClass())) {
if (ex.getCause() != null && ValidationException.class.isAssignableFrom(ex.getCause().getClass())) {
throw new StixParserValidationException((ValidationException) ex.getCause());
} else {
throw ex;
Expand Down