sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX::Checkstyle errors

Browse Source
This commit is contained in:
Merel Steenbergen
2019-04-08 15:38:49 +02:00
parent fb22937864
commit f6f74cd2aa
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -18,9 +18,9 @@ apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
apply plugin: 'application' apply plugin: 'application'
application { //application {
mainClassName = 'greenify.server.Application' // mainClassName = 'greenify.server.Application'
} //}
repositories { repositories {
mavenCentral() mavenCentral()

6
src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
View File

@@ -221,7 +221,7 @@ public class ExtraActivityController {
Float footprint = userService.saveFootprint(userService.currentUser.getName()); Float footprint = userService.saveFootprint(userService.currentUser.getName());
controller.updateLeaderboard(); controller.updateLeaderboard();
controller.updateAchievements(); controller.updateAchievements();
} catch (Exception ex) { } catch (InterruptedException ex) {
System.out.println("continue"); System.out.println("continue");
} }
} }
@@ -263,7 +263,7 @@ public class ExtraActivityController {
Float footprint = userService.saveFootprint(userService.currentUser.getName()); Float footprint = userService.saveFootprint(userService.currentUser.getName());
controller.updateAchievements(); controller.updateAchievements();
controller.updateLeaderboard(); controller.updateLeaderboard();
} catch (Exception ex) { } catch (NullPointerException ex) {
System.out.println("continue"); System.out.println("continue");
} }
} }
@@ -278,7 +278,7 @@ public class ExtraActivityController {
Float footprint = userService.saveFootprint(userService.currentUser.getName()); Float footprint = userService.saveFootprint(userService.currentUser.getName());
controller.updateAchievements(); controller.updateAchievements();
controller.updateLeaderboard(); controller.updateLeaderboard();
} catch (Exception ex) { } catch (NullPointerException ex) {
System.out.println("continue"); System.out.println("continue");
} }
} }

2
src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
View File

@@ -487,7 +487,7 @@ public class RegisterWindowController {
} }
try { try {
extraActivityController.updateExtras(); extraActivityController.updateExtras();
} catch (Exception ex) { } catch (NullPointerException ex) {
System.out.println("Continue"); System.out.println("Continue");
} }
Float firstFootprint = userService.saveFirstFootprint(userService.currentUser.getName()); Float firstFootprint = userService.saveFirstFootprint(userService.currentUser.getName());

1
src/Client/src/main/java/greenify/client/controller/UserController.java
View File

@@ -2,7 +2,6 @@ package greenify.client.controller;
import greenify.client.Application; import greenify.client.Application;
import greenify.client.rest.UserService; import greenify.client.rest.UserService;
import greenify.common.ApplicationException;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.Parent; import javafx.scene.Parent;

4
src/Client/src/test/java/FriendTest.java
View File

@@ -1,9 +1,9 @@
import static org.junit.Assert.assertEquals;
import greenify.client.Friend; import greenify.client.Friend;
import org.junit.Test; import org.junit.Test;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import static org.junit.Assert.*;
public class FriendTest { public class FriendTest {
@Test @Test
public void setAndGetTest() { public void setAndGetTest() {

6
src/Client/src/test/java/UserServiceTest.java
View File

@@ -1,3 +1,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import greenify.client.rest.UserService; import greenify.client.rest.UserService;
import greenify.common.UserDto; import greenify.common.UserDto;
import org.junit.Test; import org.junit.Test;
@@ -14,9 +17,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class UserServiceTest { public class UserServiceTest {