From d8c3791d483ec7406e856e15ab43e340a5109ef9 Mon Sep 17 00:00:00 2001
From: Eirik Steira <eirsteir@stud.ntnu.no>
Date: Tue, 21 Apr 2020 21:56:20 +0200
Subject: [PATCH] Chore/cleanup code
---
.../IDATT1002/controllers/ExploreAlbums.java | 20 ----------
.../components/explore/ImageRow.java | 7 ++--
.../components/exploreAlbums/AlbumHBox.java | 4 +-
.../components/exploreAlbums/ImageHBox.java | 3 +-
.../exploreAlbums/StyledImageView.java | 13 -------
.../java/NTNU/IDATT1002/models/Album.java | 28 -------------
.../java/NTNU/IDATT1002/models/Image.java | 18 ++-------
.../java/NTNU/IDATT1002/models/Login.java | 2 -
src/main/java/NTNU/IDATT1002/models/User.java | 39 -------------------
.../NTNU/IDATT1002/service/TagService.java | 23 -----------
.../NTNU/IDATT1002/utils/Authentication.java | 19 ++++-----
.../IDATT1002/utils/MetaDataExtractor.java | 2 -
12 files changed, 17 insertions(+), 161 deletions(-)
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
index 69055336..60ff0896 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
@@ -165,26 +165,6 @@ public class ExploreAlbums extends PaginatedContent<Album> {
App.setRoot("create_album");
}
- /**
- * Update content to previous "page".
- *
- * @param actionEvent
- * @throws IOException
- */
- public void switchToPrevious(ActionEvent actionEvent) throws IOException {
- //TODO: Make method that updates content
- }
-
- /**
- * Update content to next "page".
- *
- * @param actionEvent
- * @throws IOException
- */
- public void switchToNext(ActionEvent actionEvent) throws IOException {
- //TODO: Make method that updates content
- }
-
/**
* Open specific albums. It takes a clicked element within an album container
* and finds the fx:id of the main parent, (who's id is the same as the album in the database), and
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java b/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java
index 7ae9dac3..c4471498 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java
@@ -11,7 +11,8 @@ import javafx.scene.layout.HBox;
* a number of elements at the same time.
*/
public class ImageRow extends HBox {
- private final int capacity;
+
+ private final int CAPACITY;
private int count;
/**
@@ -20,7 +21,7 @@ public class ImageRow extends HBox {
* @param capacity the amount of columns this row can hold
*/
public ImageRow(int capacity) {
- this.capacity = capacity;
+ this.CAPACITY = capacity;
this.count = 0;
applyStyling();
@@ -51,6 +52,6 @@ public class ImageRow extends HBox {
* Return whether this {@link ImageRow} has reached its capacity.
*/
public boolean isFull() {
- return count >= capacity;
+ return count >= CAPACITY;
}
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/AlbumHBox.java b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/AlbumHBox.java
index 3c035480..1ac8076a 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/AlbumHBox.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/AlbumHBox.java
@@ -50,12 +50,10 @@ public class AlbumHBox extends HBox {
*
* @param component the component node to add to
* @param eventHandler the event handler to set
- * @return the updated node component
*/
- public Node addOnMouseClickedEventHandlerToComponent(
+ public void addOnMouseClickedEventHandlerToComponent(
Node component, EventHandler<? super MouseEvent> eventHandler) {
component.setOnMouseClicked(eventHandler);
- return component;
}
public Node getAlbumImageView() {
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/ImageHBox.java b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/ImageHBox.java
index 2e2d958e..afa0f188 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/ImageHBox.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/ImageHBox.java
@@ -42,10 +42,9 @@ public class ImageHBox extends HBox {
placeholder.setImage(imageToSet);
}
- public Node addOnMouseClickedEventHandlerToComponent(
+ public void addOnMouseClickedEventHandlerToComponent(
Node component, EventHandler<? super MouseEvent> eventHandler) {
component.setOnMouseClicked(eventHandler);
- return component;
}
public Node getImageView() {
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java
index 2041fc5b..49f607f7 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java
@@ -1,7 +1,5 @@
package NTNU.IDATT1002.controllers.components.exploreAlbums;
-import NTNU.IDATT1002.utils.ImageUtil;
-import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
/**
@@ -16,17 +14,6 @@ public class StyledImageView extends ImageView {
this.applyStyling();
}
- /**
- * Create the ImageView to hold given image
- *
- * @param image the image to display
- */
- public StyledImageView(NTNU.IDATT1002.models.Image image) {
- this.applyStyling();
- Image imageToSet = ImageUtil.convertToFXImage(image);
- this.setImage(imageToSet);
- }
-
/**
* Apply styling. Default height and width.
*/
diff --git a/src/main/java/NTNU/IDATT1002/models/Album.java b/src/main/java/NTNU/IDATT1002/models/Album.java
index 7eaa035b..8768801c 100644
--- a/src/main/java/NTNU/IDATT1002/models/Album.java
+++ b/src/main/java/NTNU/IDATT1002/models/Album.java
@@ -131,34 +131,6 @@ public class Album {
images.add(image);
}
- /**
- * Remove given image from the album.
- *
- * @param image the image to add
- */
- public void removeImage(Image image) {
- image.removeAlbum(this);
- images.remove(image);
- }
-
- /**
- * Add given tag to this album
- *
- * @param tag the tag to add
- */
- public void addTag(Tag tag) {
- tags.add(tag);
- }
-
- /**
- * Remove given tag to this album
- *
- * @param tag the tag to add
- */
- public void removeTag(Tag tag) {
- tags.remove(tag);
- }
-
/**
* Check if this and given entity are equal.
* The two are defined as equal if all individual fields are equal.
diff --git a/src/main/java/NTNU/IDATT1002/models/Image.java b/src/main/java/NTNU/IDATT1002/models/Image.java
index aed19db2..aeea1e95 100644
--- a/src/main/java/NTNU/IDATT1002/models/Image.java
+++ b/src/main/java/NTNU/IDATT1002/models/Image.java
@@ -1,7 +1,6 @@
package NTNU.IDATT1002.models;
-import javafx.scene.layout.VBox;
import org.hibernate.annotations.CreationTimestamp;
import javax.persistence.*;
@@ -118,11 +117,11 @@ public class Image {
tags.add(tag);
}
- public List<Tag> getTags() {
- return tags;
- }
+ public List<Tag> getTags() {
+ return tags;
+ }
- public Metadata getMetadata() {
+ public Metadata getMetadata() {
return metadata;
}
@@ -147,15 +146,6 @@ public class Image {
albums.add(album);
}
- /**
- * Remove this image from the given image.
- *
- * @param album the album to remove from
- */
- public void removeAlbum(Album album) {
- albums.remove(album);
- }
-
/**
* Get Geo Location related to this image.
*
diff --git a/src/main/java/NTNU/IDATT1002/models/Login.java b/src/main/java/NTNU/IDATT1002/models/Login.java
index 1566300b..13d2fb17 100644
--- a/src/main/java/NTNU/IDATT1002/models/Login.java
+++ b/src/main/java/NTNU/IDATT1002/models/Login.java
@@ -7,12 +7,10 @@ import javax.validation.constraints.NotBlank;
@Table(name = "login")
public class Login {
-
@Id
@JoinColumn(name = "username")
private String username;
-
@OneToOne(cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
private User user;
diff --git a/src/main/java/NTNU/IDATT1002/models/User.java b/src/main/java/NTNU/IDATT1002/models/User.java
index c813b3a4..7481dfe6 100644
--- a/src/main/java/NTNU/IDATT1002/models/User.java
+++ b/src/main/java/NTNU/IDATT1002/models/User.java
@@ -132,45 +132,6 @@ public class User {
public void setBirthDate(Date birthDate) {
this.birthDate = birthDate;
}
- /**
- * Add given album.
- *
- * @param album the album to add
- */
- public void addAlbum(Album album) {
- albums.add(album);
- album.setUser(this);
- }
-
- /**
- * Remove given album.
- *
- * @param album the album to remove
- */
- public void removeAlbum(Album album) {
- albums.remove(album);
- album.setUser(null);
- }
-
- /**
- * Add given image.
- *
- * @param image the image to add
- */
- public void addImage(Image image) {
- images.add(image);
- image.setUser(this);
- }
-
- /**
- * Remove given image.
- *
- * @param image the image to remove
- */
- public void removeAlbum(Image image) {
- images.remove(image);
- image.setUser(null);
- }
@Override
public boolean equals(Object o) {
diff --git a/src/main/java/NTNU/IDATT1002/service/TagService.java b/src/main/java/NTNU/IDATT1002/service/TagService.java
index 57b875a3..c319309c 100644
--- a/src/main/java/NTNU/IDATT1002/service/TagService.java
+++ b/src/main/java/NTNU/IDATT1002/service/TagService.java
@@ -1,16 +1,12 @@
package NTNU.IDATT1002.service;
-import NTNU.IDATT1002.models.Image;
import NTNU.IDATT1002.models.Tag;
import NTNU.IDATT1002.repository.ImageRepository;
import NTNU.IDATT1002.repository.TagRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.persistence.EntityManager;
import java.util.List;
import java.util.Objects;
-import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -27,8 +23,6 @@ public class TagService {
private ImageRepository imageRepository;
- private static Logger logger = LoggerFactory.getLogger(TagService.class);
-
/**
* Inject entity manager instance to the repositories.
*/
@@ -98,21 +92,4 @@ public class TagService {
return tagRepository.findOrCreate(tag);
}
- /**
- * Adds the given tag to the given album.
- *
- * @param image the album to add the tag to
- * @param tag the tag to add
- * @return the updated album
- */
-
- public Optional<Image> addTagToImage(Image image, Tag tag) {
- Image foundImage = imageRepository.findById(image.getId())
- .orElseThrow(IllegalArgumentException::new);
- Tag foundTag = tagRepository.findOrCreate(tag);
-
- foundImage.addTag(foundTag);
-
- return imageRepository.save(foundImage);
- }
}
diff --git a/src/main/java/NTNU/IDATT1002/utils/Authentication.java b/src/main/java/NTNU/IDATT1002/utils/Authentication.java
index ee94ce07..92a7240e 100644
--- a/src/main/java/NTNU/IDATT1002/utils/Authentication.java
+++ b/src/main/java/NTNU/IDATT1002/utils/Authentication.java
@@ -22,10 +22,6 @@ public class Authentication {
* @return hashed password
*/
public static ArrayList<String> setPassword(String password) {
- String hashedPassword = null;
- ArrayList<String> info = new ArrayList<>();
- StringBuilder sb = new StringBuilder();
-
if (password == null) {
throw new IllegalArgumentException("Input cannot be null");
}
@@ -66,10 +62,7 @@ public class Authentication {
byte[] dbSalt = buildBytes(salt);
String hashedInputPassword = createHashWithPredeterminedSalt(dbSalt, password);
- if(expectedHash.equals(hashedInputPassword)) {
- return true;
- }
- return false;
+ return expectedHash.equals(hashedInputPassword);
}
/**
@@ -88,8 +81,9 @@ public class Authentication {
byte[] bytes = md.digest(password.getBytes());
//Converts the StringBuilder to hexadecimal
- for (int i = 0; i < bytes.length; i++) {
- sb.append((Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1)));
+ for (byte aByte : bytes) {
+ sb.append((Integer.toString((aByte & 0xff) + 0x100, 16)
+ .substring(1)));
}
//Gets the whole hash in hexformat into a string
@@ -119,8 +113,9 @@ public class Authentication {
byte[] bytes = md.digest(password.getBytes());
//Converts the StringBuilder to hexadecimal
- for(int i = 0; i < bytes.length; i++) {
- sb.append((Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1)));
+ for (byte aByte : bytes) {
+ sb.append((Integer.toString((aByte & 0xff) + 0x100, 16)
+ .substring(1)));
}
hashedPassword = sb.toString();
}
diff --git a/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java b/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java
index 88753b9f..19b44d57 100644
--- a/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java
+++ b/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java
@@ -1,7 +1,6 @@
package NTNU.IDATT1002.utils;
import NTNU.IDATT1002.models.GeoLocation;
-import NTNU.IDATT1002.repository.GeoLocatioRepository;
import com.drew.imaging.ImageMetadataReader;
import com.drew.imaging.ImageProcessingException;
import com.drew.metadata.Directory;
@@ -29,7 +28,6 @@ import java.io.IOException;
*/
public class MetaDataExtractor {
- private GeoLocatioRepository geoLocationRepository;
private static Logger logger = LoggerFactory.getLogger(MetaDataExtractor.class);
--
GitLab