Formatted project
Change-Id: I6993ddfab02e06541b4138040280a4777c719562
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
index c8f68b5..beb344c 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
@@ -30,7 +30,7 @@
@Getter
@Setter
@JsonInclude(Include.NON_EMPTY)
-// @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
+ // @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
public class Layer {
private String code;
private String description;
@@ -40,8 +40,8 @@
@Getter
@Setter
@JsonInclude(Include.NON_EMPTY)
-// @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
- public class Key implements Comparable<Key>{
+ // @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
+ public class Key implements Comparable<Key> {
private String code;
private String description;
@@ -50,10 +50,10 @@
public Key (String code) {
this.code = code;
}
-
+
@Override
public int compareTo (Key k) {
- return this.code.compareTo(k.code);
+ return this.code.compareTo(k.code);
}
}
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java
index eb17a8e..ac31ba0 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/InstalledPluginDto.java
@@ -24,7 +24,7 @@
private String redirectUri;
@JsonProperty("installed_date")
private String installedDate;
-
+
public InstalledPluginDto (InstalledPlugin plugin) {
OAuth2Client client = plugin.getClient();
setClientId(client.getId());
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java
index 9687317..84b8b3f 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/QueryAccessDto.java
@@ -22,8 +22,9 @@
@Override
public String toString () {
- return "accessId=" + accessId + ", createdBy=" + createdBy + " , queryId="
- + queryId + ", queryName=" + queryName + ", userGroupId=" + userGroupId
- + ", userGroupName=" + userGroupName;
+ return "accessId=" + accessId + ", createdBy=" + createdBy
+ + " , queryId=" + queryId + ", queryName=" + queryName
+ + ", userGroupId=" + userGroupId + ", userGroupName="
+ + userGroupName;
}
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java
index fe221cf..6d31fd6 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/QueryDto.java
@@ -8,8 +8,9 @@
import lombok.Getter;
import lombok.Setter;
-/** Defines the structure of {@link QueryDO} description to be
- * sent as JSON objects in HTTP responses.
+/**
+ * Defines the structure of {@link QueryDO} description to be
+ * sent as JSON objects in HTTP responses.
*
* @author margaretha
*
@@ -26,12 +27,12 @@
private String description;
private String requiredAccess;
private String createdBy;
-
+
private int numberOfDoc;
private int numberOfParagraphs;
private int numberOfSentences;
private int numberOfTokens;
-
+
private String query;
private String queryLanguage;
private JsonNode koralQuery;
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java
index a2b2732..273d52e 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupDto.java
@@ -9,8 +9,9 @@
import lombok.Getter;
import lombok.Setter;
-/** Defines the structure of UserGroup description, e.g.
- * to be sent as JSON objects in HTTP response.
+/**
+ * Defines the structure of UserGroup description, e.g.
+ * to be sent as JSON objects in HTTP response.
*
* @author margaretha
*
@@ -24,10 +25,10 @@
private String description;
private String owner;
private UserGroupStatus status;
-
+
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<UserGroupMemberDto> members;
-
+
private GroupMemberStatus userMemberStatus;
private List<String> userRoles;
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java b/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java
index bf3cfea..23cfa3d 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java
@@ -6,8 +6,10 @@
import lombok.Getter;
import lombok.Setter;
-/** Defines UserGroupMember description, e.g. to be sent as
- * JSON objects in HTTP Responses.
+/**
+ * Defines UserGroupMember description, e.g. to be sent as
+ * JSON objects in HTTP Responses.
+ *
* @author margaretha
*
*/
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
index b192cfd..a1cc536 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/converter/AnnotationConverter.java
@@ -94,7 +94,7 @@
for (AnnotationKey ak : f.getKeys()) {
Annotation a = ak.getKey();
Map<String, String> values = new TreeMap<>();
-
+
Key key = dto.new Key(a.getCode());
if (language.equals("de")) {
key.setDescription(a.getGermanDescription());
@@ -136,16 +136,14 @@
private Map<String, List<AnnotationLayer>> createFoundryMap (
List<AnnotationLayer> pairs) {
- Map<String, List<AnnotationLayer>> foundries =
- new HashMap<String, List<AnnotationLayer>>();
+ Map<String, List<AnnotationLayer>> foundries = new HashMap<String, List<AnnotationLayer>>();
for (AnnotationLayer p : pairs) {
String foundryCode = p.getFoundry().getCode();
if (foundries.containsKey(foundryCode)) {
foundries.get(foundryCode).add(p);
}
else {
- List<AnnotationLayer> foundryList =
- new ArrayList<AnnotationLayer>();
+ List<AnnotationLayer> foundryList = new ArrayList<AnnotationLayer>();
foundryList.add(p);
foundries.put(foundryCode, foundryList);
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
index b4ff8eb..d04576c 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/converter/ResourceConverter.java
@@ -23,8 +23,8 @@
public class ResourceConverter {
public List<ResourceDto> convertToResourcesDto (List<Resource> resources) {
- List<ResourceDto> resourceDtoList =
- new ArrayList<ResourceDto>(resources.size());
+ List<ResourceDto> resourceDtoList = new ArrayList<ResourceDto>(
+ resources.size());
ResourceDto dto;
Map<String, String> titles;
HashMap<Integer, String> layers;
diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
index cf5878f..706cc21 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
@@ -43,8 +43,8 @@
}
if (members != null) {
- ArrayList<UserGroupMemberDto> memberDtos =
- new ArrayList<>(members.size());
+ ArrayList<UserGroupMemberDto> memberDtos = new ArrayList<>(
+ members.size());
for (UserGroupMember member : members) {
UserGroupMemberDto memberDto = new UserGroupMemberDto();