Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tasty Pages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SE2 Projekt
Tasty Pages
Commits
f89c30b7
Commit
f89c30b7
authored
1 year ago
by
Karsch Lukas
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/main' into main
parents
cac0c4e4
a6d4cbd7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/mi/hdm/filesystem/FileManager.java
+2
-2
2 additions, 2 deletions
src/main/java/mi/hdm/filesystem/FileManager.java
with
2 additions
and
2 deletions
src/main/java/mi/hdm/filesystem/FileManager.java
+
2
−
2
View file @
f89c30b7
...
...
@@ -219,7 +219,7 @@ public class FileManager {
log
.
info
(
"Deleted {} recipes from the filesystem"
,
deleted
);
}
p
ublic
static
CategoryManager
deserializeCategoryManager
(
String
json
)
{
p
rivate
static
CategoryManager
deserializeCategoryManager
(
String
json
)
{
if
(
json
.
isBlank
())
{
log
.
info
(
"JSON file is blank, creating empty instance of Category Manager"
);
return
new
CategoryManager
();
...
...
@@ -322,7 +322,7 @@ public class FileManager {
);
}
p
ublic
static
Recipe
JSONtoRecipe
(
String
json
)
{
p
rivate
static
Recipe
JSONtoRecipe
(
String
json
)
{
Gson
gson
=
new
GsonBuilder
().
registerTypeAdapter
(
Recipe
.
class
,
new
RecipeTypeAdapter
()).
create
();
return
gson
.
fromJson
(
json
,
Recipe
.
class
);
}
...
...
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