Skip to content
Snippets Groups Projects
Commit 89b7d1c9 authored by Thiemo Belmega's avatar Thiemo Belmega
Browse files

Minor fixes

parent d8eee47b
No related branches found
No related tags found
No related merge requests found
......@@ -39,6 +39,11 @@
<version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
<version>2.22</version>
</dependency>
</dependencies>
<build>
......
......@@ -2,7 +2,6 @@ package de.unipotsdam.cs.toolup.database;
import de.unipotsdam.cs.toolup.exceptions.InvalidIdException;
import de.unipotsdam.cs.toolup.model.*;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.io.IOException;
import java.sql.PreparedStatement;
......@@ -136,7 +135,7 @@ public class DatabaseController {
break;
}
default:
throw new NotImplementedException();
throw new UnsupportedOperationException();
}
}
......@@ -159,6 +158,18 @@ public class DatabaseController {
}
}
private void updateSingleRelation(
String tableName, String uuid, int uuidColumnNumber,
Collection<String> relatedIds) throws SQLException {
for (String foreignKey : relatedIds) {
PreparedStatement prepQuery;
prepQuery = sqlStatementFactory.getInsertRelation(tableName);
prepQuery.setString(uuidColumnNumber, uuid);
prepQuery.setString((uuidColumnNumber % 2) + 1, foreignKey);
prepQuery.executeUpdate();
}
}
private void insertBO(BusinessObject aBusinessObject,
String tableName) throws SQLException {
......@@ -200,22 +211,11 @@ public class DatabaseController {
break;
}
default:
throw new NotImplementedException();
throw new UnsupportedOperationException();
}
}
private void updateSingleRelation(
String tableName, String uuid, int uuidColumnNumber,
Collection<String> relatedIds) throws SQLException {
for (String foreignKey : relatedIds) {
PreparedStatement prepQuery;
prepQuery = sqlStatementFactory.getInsertRelation(tableName);
prepQuery.setString(uuidColumnNumber, uuid);
prepQuery.setString((uuidColumnNumber % 2) + 1, foreignKey);
prepQuery.executeUpdate();
}
}
private void updateBO(BusinessObject aBusinessObject,
......
package de.unipotsdam.cs.toolup.model;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
......@@ -7,6 +8,7 @@ import java.util.Set;
import static de.unipotsdam.cs.toolup.database.DatabaseController.TABLE_NAME_CATEGORY;
import static de.unipotsdam.cs.toolup.database.DatabaseController.TABLE_NAME_FEATURE;
@XmlRootElement
public class Application extends BusinessObject {
public Application(String uuid, String title, String description, Set<String> relatedCategories, Set<String> relatedFeatures) {
......
......@@ -19,8 +19,8 @@ public class BusinessObjectResource {
protected Response getBusinessObject(String id) {
Response response;
try {
BusinessObject app = DatabaseController.getInstance().load(id);
response = Response.ok(app).build();
BusinessObject bo = DatabaseController.getInstance().load(id);
response = Response.ok(bo.convertToJson()).build();
} catch (SQLException | IOException e) {
e.printStackTrace();
response = Response.serverError().build();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment