Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Solidify-Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Solidify
Solidify-Backend
Commits
bc1029ac
Commit
bc1029ac
authored
3 years ago
by
Mathieu.Vonlanthen
Browse files
Options
Downloads
Patches
Plain Diff
feat(HashTool): allow to hash a byte array
parent
be81d0da
No related branches found
No related tags found
1 merge request
!288
feat(HashTool): allow to hash a byte array
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
solidify-util/src/main/java/ch/unige/solidify/util/HashTool.java
+5
-1
5 additions, 1 deletion
...y-util/src/main/java/ch/unige/solidify/util/HashTool.java
solidify-xml/src/main/java/ch/unige/solidify/util/XMLTool.java
+1
-3
1 addition, 3 deletions
...ify-xml/src/main/java/ch/unige/solidify/util/XMLTool.java
with
6 additions
and
4 deletions
solidify-util/src/main/java/ch/unige/solidify/util/HashTool.java
+
5
−
1
View file @
bc1029ac
...
...
@@ -44,8 +44,12 @@ public class HashTool {
}
public
static
String
hash
(
String
algo
,
String
s
)
throws
NoSuchAlgorithmException
{
return
HashTool
.
hash
(
algo
,
s
.
getBytes
());
}
public
static
String
hash
(
String
algo
,
byte
[]
byteArray
)
throws
NoSuchAlgorithmException
{
final
MessageDigest
md
=
MessageDigest
.
getInstance
(
algo
);
md
.
update
(
s
.
getBytes
()
);
md
.
update
(
byteArray
);
final
byte
[]
digest
=
md
.
digest
();
return
DatatypeConverter
.
printHexBinary
(
digest
);
}
...
...
This diff is collapsed.
Click to expand it.
solidify-xml/src/main/java/ch/unige/solidify/util/XMLTool.java
+
1
−
3
View file @
bc1029ac
...
...
@@ -51,7 +51,6 @@ import javax.xml.transform.Transformer;
import
javax.xml.transform.TransformerConfigurationException
;
import
javax.xml.transform.TransformerException
;
import
javax.xml.transform.TransformerFactory
;
import
javax.xml.transform.TransformerFactoryConfigurationError
;
import
javax.xml.transform.dom.DOMResult
;
import
javax.xml.transform.dom.DOMSource
;
import
javax.xml.transform.sax.SAXSource
;
...
...
@@ -410,8 +409,7 @@ public class XMLTool {
return
XML
.
toJSONObject
(
xml
);
}
public
static
void
xml2Stream
(
Marshaller
m
,
OutputStream
out
,
Object
obj
)
throws
JAXBException
,
TransformerFactoryConfigurationError
,
TransformerException
{
public
static
void
xml2Stream
(
Marshaller
m
,
OutputStream
out
,
Object
obj
)
throws
JAXBException
,
TransformerException
{
final
DOMResult
domResult
=
new
DOMResult
();
m
.
marshal
(
obj
,
domResult
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment