Merge branch 'master' into 0.80-SNAPSHOT
Change-Id: I16aad7f314233dcbec533d18ba3de600531b9953
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 94edcf2..4cd1904 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,16 +6,7 @@
version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
- directory: "/full" # Location of package manifests
+ directory: "/" # Location of package manifests
schedule:
interval: "daily"
- ignore:
- # Jetty >= 12 has API changes
- - dependency-name: "org.eclipse.jetty:jetty-*"
- versions:
- - ">= 12.0.0"
- # Hibernate >=6.2 is incompatible
- - dependency-name: "org.hibernate.orm:hibernate-*"
- versions:
- - ">= 6.2.0"
open-pull-requests-limit: 50
diff --git a/Changes b/Changes
index 94bdd20..23235d7 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,13 @@
- Add corpus support at VirtualCorpusRewrite (#806)
- Add apiVersion to rewrite (#806)
+# version 0.79.1
+
+- Bug fixes & Spring 6.2.11 upgrade (kupietz)
+- Migrate to Hibernate 7x (kupietz)
+- Make statistics in VC list configurable (default: false)
+- Add request log using jetty. (default: disabled)
+
# version 0.79
- Implement timeout rewrite
diff --git a/pom.xml b/pom.xml
index c4f7d20..fdec52f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,19 @@
<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jersey.version>3.1.5</jersey.version>
- <hibernate.ehcache.version>6.0.0.Alpha7</hibernate.ehcache.version>
- <hibernate.version>6.1.7.Final</hibernate.version>
- <spring.version>6.1.21</spring.version>
+ <jersey.version>3.1.11</jersey.version>
+ <hibernate.version>7.1.3.Final</hibernate.version>
+ <spring.version>6.2.11</spring.version>
<!-- spring6.version is used in jersey and defined here
to make sure that jersey uses the correct spring version-->
<spring6.version>${spring.version}</spring6.version>
- <jetty.version>11.0.24</jetty.version>
- <flyway.version>10.6.0</flyway.version>
- <log4j.version>2.22.1</log4j.version>
- <krill.version>[0.64.2,)</krill.version>
- <koral.version>[0.44,)</koral.version>
+ <jetty.version>12.1.1</jetty.version>
+ <flyway.version>11.13.2</flyway.version>
+ <log4j.version>2.25.2</log4j.version>
+ <krill.version>[0.64.4,)</krill.version>
+ <koral.version>[0.47,)</koral.version>
+ <!-- Align JBoss Logging with Hibernate Validator 9 requirements -->
+ <jboss.logging.version>3.6.1.Final</jboss.logging.version>
</properties>
<profiles>
<profile>
@@ -31,7 +32,7 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.1</version>
<executions>
<!-- option 1 -->
<execution>
@@ -94,7 +95,7 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.1</version>
<executions>
<!--option 2 -->
<execution>
@@ -197,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.14.1</version>
<configuration>
<compilerVersion>${java.version}</compilerVersion>
<source>${java.version}</source>
@@ -214,7 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -227,7 +228,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.2.5</version>
+ <version>3.5.4</version>
<configuration>
<reuseForks>true</reuseForks>
<forkCount>1</forkCount>
@@ -371,7 +372,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>2.0.11</version>
+ <version>2.0.17</version>
+ </dependency>
+
+ <!-- Explicitly pin JBoss Logging to a version compatible with HV 9 -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss.logging.version}</version>
</dependency>
<!-- Java Assist -->
@@ -437,13 +445,13 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
<version>${jetty.version}</version>
</dependency>
@@ -472,7 +480,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.0.0</version>
+ <version>3.50.3.0</version>
</dependency>
@@ -487,7 +495,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.9.0</version>
+ <version>2.13.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -514,17 +522,7 @@
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${hibernate.version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.ehcache.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Remove hibernate-ehcache (Ehcache 2 integration removed in modern Hibernate) -->
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-c3p0</artifactId>
@@ -542,13 +540,13 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>3.0.2</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>8.0.1.Final</version>
+ <version>9.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -560,31 +558,47 @@
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
+ </dependency>
+ <!-- Ensure jakarta.transaction.* classes are available for Hibernate 6 -->
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
+ <version>6.1.0</version>
</dependency>
<!-- Utilities -->
<dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>2.10.9.2</version>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.12.6</version>
+ <version>2.14.0</version>
</dependency>
+ <!-- Apache Commons Lang 3 (maintained) -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.19.0</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.15.1</version>
+ <version>2.20.0</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.8.0</version>
+ <version>1.10.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -595,7 +609,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.11.0</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -612,21 +626,21 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
- <version>6.0.11</version>
+ <version>7.0.3</version>
</dependency>
<!-- OAuth -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
- <version>11.9.1</version>
+ <version>11.29.2</version>
</dependency>
<!-- Project Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.30</version>
+ <version>1.18.42</version>
</dependency>
<!-- Test -->
@@ -639,7 +653,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.10.1</version>
+ <version>6.0.0</version>
<scope>test</scope>
</dependency>
<!-- Jersey Test -->
diff --git a/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java b/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java
index e2f4c59..95e3071 100644
--- a/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java
+++ b/src/main/java/de/ids_mannheim/korap/authentication/LdapAuth3.java
@@ -214,7 +214,9 @@
jlog.debug("{}: connect: successfull.", ldapConfig.useSSL ? "LDAPS" : "LDAP");
}
catch (LDAPException e) {
- jlog.error("Connecting to LDAP Server: failed: '{}'!\n", e);
+ String fullStackTrace = org.apache.commons.lang3.exception.ExceptionUtils
+ .getStackTrace(e);
+ jlog.error("Connecting to LDAP Server: failed: '{}'!\n", fullStackTrace);
ldapTerminate(lc);
return new LdapAuth3Result(null, isTimeout(e) ? LDAP_AUTH_RTIMEOUT : LDAP_AUTH_RCONNECT);
diff --git a/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java b/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java
index d606c76..47fcf76 100644
--- a/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java
+++ b/src/main/java/de/ids_mannheim/korap/config/FullConfiguration.java
@@ -66,6 +66,7 @@
private String namedVCPath;
private boolean createInitialSuperClient;
+ private boolean vcListStatisticsEnabled;
public FullConfiguration (Properties properties) throws Exception {
super(properties);
@@ -96,6 +97,8 @@
setMaxNumberOfUserQueries(Integer.parseInt(
properties.getProperty("max.user.persistent.queries", "20")));
+ setVcListStatisticsEnabled(Boolean.valueOf(properties.getProperty(
+ "vc.list.statistics.enabled", "false")));
}
private void setSecurityConfiguration (Properties properties)
@@ -427,4 +430,14 @@
this.maxNumberOfUserQueries = maxNumberOfUserQueries;
}
+ public boolean isVcListStatisticsEnabled () {
+ return vcListStatisticsEnabled;
+ }
+
+ public void setVcListStatisticsEnabled (boolean vcListStatisticsEnabled) {
+ this.vcListStatisticsEnabled = vcListStatisticsEnabled;
+ }
+
+
+
}
diff --git a/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
index 6545719..d1e95d7 100644
--- a/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
+++ b/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
@@ -118,6 +118,7 @@
// another variable might be needed to define which metadata fields are restricted
private boolean isMetadataRestricted = false;
private boolean totalResultCacheEnabled;
+ private boolean requestLogEnabled = false;
private int guestTimeout;
private int loginTimeout;
@@ -146,6 +147,8 @@
properties.getProperty("security.secure.random.algorithm", ""));
setMessageDigestAlgorithm(
properties.getProperty("security.md.algorithm", "MD5"));
+ requestLogEnabled = Boolean.valueOf(properties.getProperty(
+ "log.request.enabled","false"));
}
/**
diff --git a/src/main/java/de/ids_mannheim/korap/constant/TokenType.java b/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
index ac3f55c..bc9205c 100644
--- a/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
+++ b/src/main/java/de/ids_mannheim/korap/constant/TokenType.java
@@ -23,4 +23,4 @@
public String displayName () {
return StringUtils.capitalize(name().toLowerCase());
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java b/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
index 6c68c13..b2c09cf 100644
--- a/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
+++ b/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
@@ -165,7 +165,36 @@
return new HashSet<Role>(resultList);
}
- public Role retrieveRoleByGroupIdQueryIdPrivilege (int groupId, int queryId,
+ /**
+ * Retrieve all roles associated with a given query id, including their members.
+ */
+ public List<Role> retrieveRolesByQueryIdWithMembers(int queryId) {
+ CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+ CriteriaQuery<Role> cq = cb.createQuery(Role.class);
+
+ Root<Role> role = cq.from(Role.class);
+ role.fetch(Role_.userGroupMembers, JoinType.LEFT);
+ role.fetch(Role_.userGroup, JoinType.INNER);
+ // query is optional for some roles, but we filter roles linked to the query
+ cq.select(role);
+ cq.where(cb.equal(role.get(Role_.query).get(QueryDO_.id), queryId));
+
+ TypedQuery<Role> q = entityManager.createQuery(cq);
+ return q.getResultList();
+ }
+
+ /**
+ * Bulk delete all roles associated with a given query id.
+ */
+ public void deleteRolesByQueryId(int queryId) {
+ CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+ CriteriaDelete<Role> delete = cb.createCriteriaDelete(Role.class);
+ Root<Role> role = delete.from(Role.class);
+ delete.where(cb.equal(role.get(Role_.query).get(QueryDO_.id), queryId));
+ entityManager.createQuery(delete).executeUpdate();
+ }
+
+ public Role retrieveRoleByGroupIdQueryIdPrivilege(int groupId, int queryId,
PrivilegeType p) throws KustvaktException {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
diff --git a/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java b/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
index 2545122..8627f1d 100644
--- a/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
+++ b/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
@@ -111,7 +111,23 @@
"groupId: " + groupId);
}
- // EM: this seems weird
+ // Before deleting the group, detach role associations from members to
+ // avoid transient role references during flush
+ CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+ CriteriaQuery<UserGroupMember> cq = cb.createQuery(UserGroupMember.class);
+ Root<UserGroupMember> memberRoot = cq.from(UserGroupMember.class);
+ cq.select(memberRoot);
+ cq.where(cb.equal(memberRoot.get(UserGroupMember_.group).get("id"), groupId));
+ @SuppressWarnings("unchecked")
+ List<UserGroupMember> members = entityManager.createQuery(cq).getResultList();
+ for (UserGroupMember m : members) {
+ if (!entityManager.contains(m)) {
+ m = entityManager.merge(m);
+ }
+ m.setRoles(new HashSet<>());
+ entityManager.merge(m);
+ }
+
if (!entityManager.contains(group)) {
group = entityManager.merge(group);
}
diff --git a/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java b/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
index 86ab9dd..e2da736 100644
--- a/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
+++ b/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
@@ -42,12 +42,38 @@
public void addMember (UserGroupMember member) throws KustvaktException {
ParameterChecker.checkObjectValue(member, "userGroupMember");
+ if (member.getRoles() != null) {
+ java.util.Set<Role> normalized = new java.util.HashSet<Role>();
+ for (Role role : member.getRoles()) {
+ if (role.getId() == 0) {
+ entityManager.persist(role);
+ normalized.add(role);
+ } else {
+ Role attached = entityManager.contains(role) ? role : entityManager.merge(role);
+ normalized.add(attached);
+ }
+ }
+ member.setRoles(normalized);
+ }
entityManager.persist(member);
entityManager.flush();
}
public void updateMember (UserGroupMember member) throws KustvaktException {
ParameterChecker.checkObjectValue(member, "UserGroupMember");
+ if (member.getRoles() != null) {
+ java.util.Set<Role> normalized = new java.util.HashSet<Role>();
+ for (Role role : member.getRoles()) {
+ if (role.getId() == 0) {
+ entityManager.persist(role);
+ normalized.add(role);
+ } else {
+ Role attached = entityManager.contains(role) ? role : entityManager.merge(role);
+ normalized.add(attached);
+ }
+ }
+ member.setRoles(normalized);
+ }
entityManager.merge(member);
}
@@ -76,7 +102,7 @@
Root<UserGroupMember> root = query.from(UserGroupMember.class);
Predicate predicate = criteriaBuilder.and(
- criteriaBuilder.equal(root.get(UserGroupMember_.group),
+ criteriaBuilder.equal(root.get(UserGroupMember_.group).get("id"),
groupId),
criteriaBuilder.equal(root.get(UserGroupMember_.userId),
userId));
@@ -108,7 +134,7 @@
Join<UserGroupMember, Role> memberRole = root.join("roles");
Predicate predicate = criteriaBuilder.and(
- criteriaBuilder.equal(root.get(UserGroupMember_.group),
+ criteriaBuilder.equal(root.get(UserGroupMember_.group).get("id"),
groupId),
criteriaBuilder.equal(memberRole.get(Role_.NAME), role));
@@ -136,7 +162,7 @@
Root<UserGroupMember> root = query.from(UserGroupMember.class);
Predicate predicate = criteriaBuilder.and(criteriaBuilder
- .equal(root.get(UserGroupMember_.group), groupId));
+ .equal(root.get(UserGroupMember_.group).get("id"), groupId));
query.select(root);
query.where(predicate);
diff --git a/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java b/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
index d5d54ae..30f690c 100644
--- a/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/UserGroupMember.java
@@ -4,6 +4,7 @@
import de.ids_mannheim.korap.constant.PredefinedRole;
import jakarta.persistence.Column;
+import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
@@ -50,7 +51,7 @@
* describe a member.
*
*/
- @ManyToMany(fetch = FetchType.EAGER)
+ @ManyToMany(fetch = FetchType.EAGER, cascade = { CascadeType.MERGE })
@JoinTable(name = "group_member_role", joinColumns = @JoinColumn(name = "group_member_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"), uniqueConstraints = @UniqueConstraint(columnNames = {
"group_member_id", "role_id" }))
private Set<Role> roles;
diff --git a/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java b/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
index 4b1c17e..7f79e7b 100644
--- a/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
+++ b/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
@@ -47,9 +47,9 @@
final SSLUtil clientSslUtil = new SSLUtil(new TrustAllTrustManager());
config.setListenerConfigs(
- InMemoryListenerConfig.createLDAPConfig("LDAP", // Listener name
- InetAddress.getByName("localhost"), // Listen address. (null = listen on all interfaces)
- ldapConfig.port, // Listen port (0 = automatically choose an available port)
+ InMemoryListenerConfig.createLDAPConfig("LDAP",
+ InetAddress.getLoopbackAddress(),
+ ldapConfig.port,
clientSslUtil.createSSLSocketFactory()));
server = new InMemoryDirectoryServer(config);
diff --git a/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
index 5cbd362..7465bcf 100644
--- a/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
+++ b/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
@@ -13,14 +13,18 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.CustomRequestLog;
+import org.eclipse.jetty.server.ForwardedRequestCustomizer;
+import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.RequestLogWriter;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ShutdownHandler;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
import org.glassfish.jersey.server.ServerProperties;
import org.glassfish.jersey.servlet.ServletContainer;
import org.springframework.web.context.ContextLoaderListener;
@@ -39,7 +43,7 @@
public abstract class KustvaktBaseServer {
private Logger log = LogManager.getLogger(KustvaktBaseServer.class);
-
+
protected static KustvaktConfiguration config;
protected static String springConfig = "default-config.xml";
@@ -153,21 +157,48 @@
servletHolder.setInitOrder(1);
contextHandler.addServlet(servletHolder, config.getBaseURL());
- ServerConnector connector = new ServerConnector(server);
+
+ HttpConfiguration httpConfig = new HttpConfiguration();
+ // EM: support for X-Forwarded headers
+ httpConfig.addCustomizer( new ForwardedRequestCustomizer() );
+ httpConfig.setRequestHeaderSize(64000);
+ HttpConnectionFactory connectionFactory =
+ new HttpConnectionFactory(httpConfig);
+
+ ServerConnector connector = new ServerConnector(server,
+ connectionFactory);
connector.setPort(kargs.port);
connector.setIdleTimeout(60000);
- connector.getConnectionFactory(HttpConnectionFactory.class)
- .getHttpConfiguration().setRequestHeaderSize(64000);
+ //connector.getConnectionFactory(HttpConnectionFactory.class)
+ // .getHttpConfiguration().setRequestHeaderSize(64000);
+
+ // MK:
+ // Jetty 12: Use ShutdownHandler as a wrapper instead of building a HandlerList.
+ // Older code (Jetty 11):
+ // ShutdownHandler shutdownHandler = new ShutdownHandler(adminToken, true, false);
+ // HandlerList handlers = new HandlerList();
+ // handlers.addHandler(shutdownHandler);
+ // handlers.addHandler(contextHandler);
+ // server.setHandler(handlers);
- ShutdownHandler shutdownHandler = new ShutdownHandler(adminToken, true,
- false);
-
- HandlerList handlers = new HandlerList();
- handlers.addHandler(shutdownHandler);
- handlers.addHandler(contextHandler);
-
- server.setHandler(handlers);
-
+ // Try the simplest available constructor first; adapt if Jetty's signature differs.
+ ShutdownHandler shutdownHandler;
+ try {
+ // Preferred (if available): token + graceful flag
+ shutdownHandler = new ShutdownHandler(adminToken, true);
+ }
+ catch (NoSuchMethodError e) {
+ // Fallback: only token constructor
+ shutdownHandler = new ShutdownHandler(adminToken);
+ }
+ shutdownHandler.setHandler(contextHandler);
+ server.setHandler(shutdownHandler);
+
+ // setup request log
+ if (config.isRequestLogEnabled()) {
+ server.setRequestLog(createRequestLog());
+ }
+
server.setConnectors(new Connector[] { connector });
try {
log.info("Starting server on port: " + kargs.port);
@@ -182,6 +213,18 @@
}
}
+ private RequestLog createRequestLog() {
+ RequestLogWriter logWriter = new RequestLogWriter();
+ logWriter.setFilename("data/logs/jetty-requests.log");
+ logWriter.setAppend(true);
+ logWriter.setRetainDays(30);
+
+ // format: time, client IP, method + URI, status, bytes
+ String logFormat = "%{yyyy-MM-dd HH:mm:ss}t %{client}a \"%r\" %s %O";
+ RequestLog requestLog = new CustomRequestLog(logWriter, logFormat);
+ return requestLog;
+ }
+
@Setter
public static class KustvaktArgs {
diff --git a/src/main/java/de/ids_mannheim/korap/service/QueryService.java b/src/main/java/de/ids_mannheim/korap/service/QueryService.java
index 5c2bea7..70af091 100644
--- a/src/main/java/de/ids_mannheim/korap/service/QueryService.java
+++ b/src/main/java/de/ids_mannheim/korap/service/QueryService.java
@@ -146,24 +146,34 @@
Iterator<QueryDO> i = queryList.iterator();
while (i.hasNext()) {
query = i.next();
- String json = "";
- String statistics = null;
- if (queryType.equals(QueryType.VIRTUAL_CORPUS)) {
- if (query.isCached()) {
- List<String> cqList = new ArrayList<>(1);
- cqList.add("referTo " + query.getName());
- json = buildKoralQueryFromCorpusQuery(cqList, apiVersion);
- }
- else {
- json = query.getKoralQuery();
- }
- statistics = krill.getStatistics(json);
- }
+ String statistics = computeStatisticsForVC(query, queryType,
+ apiVersion);
QueryDto dto = converter.createQueryDto(query, statistics);
dtos.add(dto);
}
return dtos;
}
+
+ private String computeStatisticsForVC (QueryDO query, QueryType queryType,
+ double apiVersion)
+ throws KustvaktException {
+ if (config.isVcListStatisticsEnabled() &&
+ queryType.equals(QueryType.VIRTUAL_CORPUS)) {
+ String json = "";
+ if (query.isCached()) {
+ List<String> cqList = new ArrayList<>(1);
+ cqList.add("referTo " + query.getName());
+ json = buildKoralQueryFromCorpusQuery(cqList, apiVersion);
+ }
+ else {
+ json = query.getKoralQuery();
+ }
+ return krill.getStatistics(json);
+ }
+ else {
+ return null;
+ }
+ }
public void deleteQueryByName (String deletedBy, String queryName,
String createdBy, QueryType type) throws KustvaktException {
@@ -178,10 +188,29 @@
else if (query.getCreatedBy().equals(deletedBy)
|| adminDao.isAdmin(deletedBy)) {
- if (query.getType().equals(ResourceType.PUBLISHED)) {
- UserGroup group = userGroupDao
- .retrieveHiddenGroupByQueryName(queryName);
- userGroupDao.deleteGroup(group.getId(), deletedBy);
+ // If published, fetch the hidden group BEFORE deleting roles, so we can remove
+ // it later
+ UserGroup hiddenGroup = null;
+ boolean isPublished = query.getType().equals(ResourceType.PUBLISHED);
+ if (isPublished) {
+ hiddenGroup = userGroupDao.retrieveHiddenGroupByQueryName(queryName);
+ }
+
+ // Detach member-role links and delete all roles linked to the query
+ List<Role> queryRoles = roleDao.retrieveRolesByQueryIdWithMembers(query.getId());
+ for (Role role : queryRoles) {
+ if (role.getUserGroupMembers() != null) {
+ for (UserGroupMember m : role.getUserGroupMembers()) {
+ if (m.getRoles() != null && m.getRoles().remove(role)) {
+ memberDao.updateMember(m);
+ }
+ }
+ }
+ }
+ roleDao.deleteRolesByQueryId(query.getId());
+
+ if (isPublished && hiddenGroup != null) {
+ userGroupDao.deleteGroup(hiddenGroup.getId(), deletedBy);
}
if (type.equals(QueryType.VIRTUAL_CORPUS)
&& VirtualCorpusCache.contains(queryName)) {
diff --git a/src/main/resources/default-config.xml b/src/main/resources/default-config.xml
index a4a30d9..c82010f 100644
--- a/src/main/resources/default-config.xml
+++ b/src/main/resources/default-config.xml
@@ -125,9 +125,7 @@
<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
<prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
<prop key="hibernate.cache.use_second_level_cache">${hibernate.cache.use_second_level_cache}
- </prop>
- <prop key="hibernate.cache.provider_class">${hibernate.cache.provider}</prop>
- <prop key="hibernate.cache.region.factory_class">${hibernate.cache.region.factory}</prop>
+ </prop>
<prop key="hibernate.jdbc.time_zone">${hibernate.jdbc.time_zone}</prop>
</props>
</property>
diff --git a/src/main/resources/default-lite-config.xml b/src/main/resources/default-lite-config.xml
index d7b08e8..75a3004 100644
--- a/src/main/resources/default-lite-config.xml
+++ b/src/main/resources/default-lite-config.xml
@@ -147,6 +147,8 @@
<!-- Initialization -->
<!-- <bean id="annotationParser" class="de.ids_mannheim.korap.annotation.AnnotationParser"
scope="singleton" /> -->
+ <!-- Provide a no-op VC loader to satisfy SearchController's Runnable dependency in lite mode -->
+ <bean id="vcLoader" class="de.ids_mannheim.korap.init.DummyNamedVCLoaderImpl" />
<!-- Search Engine -->
<bean id="search_krill"
class="de.ids_mannheim.korap.web.SearchKrill">
@@ -204,4 +206,4 @@
class="de.ids_mannheim.korap.rewrite.RewriteHandler">
<constructor-arg ref="rewriteTasks" />
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/main/resources/kustvakt-lite.conf b/src/main/resources/kustvakt-lite.conf
index ba32850..4649206 100644
--- a/src/main/resources/kustvakt-lite.conf
+++ b/src/main/resources/kustvakt-lite.conf
@@ -1,3 +1,6 @@
+# This is the default configuration for Kustvakt lite version
+# Copy this file to data/kustvakt-lite.conf and adjust settings
+
# Krill settings
# index dir
@@ -17,7 +20,6 @@
current.api.version = v1.0
# multiple versions separated by space
supported.api.version = v1.0
-
# default
kustvakt.base.url=/api/*
@@ -25,6 +27,12 @@
server.port=8089
server.host=localhost
+# log
+log.request.enabled = false
+
+# Cache
+cache.total.results.enabled = true
+
# Pipe (optional)
# pipe.host=https://korap.ids-mannheim.de (default)
diff --git a/src/main/resources/kustvakt.conf b/src/main/resources/kustvakt.conf
index e45ea32..31642af 100644
--- a/src/main/resources/kustvakt.conf
+++ b/src/main/resources/kustvakt.conf
@@ -1,3 +1,6 @@
+# This is the default configuration for Kustvakt full version
+# Copy this file to data/kustvakt.conf and adjust settings
+
#Krill
krill.indexDir= sample-index
@@ -21,10 +24,17 @@
server.port=8089
server.host=localhost
+# log
+log.request.enabled = false
+
+# Cache
+cache.total.results.enabled = true
+
# Timeout
# timeout.guest = 10000 (default)
# timeout.login = 90000 (default)
+
# Pipe (optional)
# pipe.host=https://korap.ids-mannheim.de
@@ -37,6 +47,10 @@
default.foundry.morphology = marmot
default.foundry.surface = base
+# Virtual corpus and queries
+max.user.persistent.queries = 5
+# max.token.context.size = 40
+vc.list.statistics.enabled = false
# Availability regex only support |
# It should be removed/commented when the data doesn't contain availability field.
@@ -64,6 +78,7 @@
# scopes separated by space
oauth2.default.scopes = search match_info
oauth2.client.credentials.scopes = client_info
+oauth2.initial.super.client = false
## see SecureRandom Number Generation Algorithms
## optional
diff --git a/src/main/resources/properties/hibernate.properties b/src/main/resources/properties/hibernate.properties
index e394a88..bd073e5 100644
--- a/src/main/resources/properties/hibernate.properties
+++ b/src/main/resources/properties/hibernate.properties
@@ -3,6 +3,7 @@
hibernate.show_sql=false
hibernate.cache.use_query_cache=false
hibernate.cache.use_second_level_cache=false
-hibernate.cache.provider=org.hibernate.cache.EhCacheProvider
-hibernate.cache.region.factory=org.hibernate.cache.ehcache.EhCacheRegionFactory
-hibernate.jdbc.time_zone=UTC
\ No newline at end of file
+hibernate.jdbc.time_zone=UTC
+# Ehcache 2 integration removed; disable legacy cache settings
+hibernate.cache.provider=
+hibernate.cache.region.factory=
diff --git a/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java b/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java
index d73d5e0..113b4c4 100644
--- a/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java
+++ b/src/test/java/de/ids_mannheim/korap/authentication/APIAuthenticationTest.java
@@ -64,6 +64,6 @@
context = auth.getTokenContext(authToken);
TokenType tokenType = context.getTokenType();
assertEquals(TokenType.API, tokenType);
- assertEquals(context.getUsername(), "testUser");
+ assertEquals("testUser", context.getUsername());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java b/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java
index 9e6f120..0f9734a 100644
--- a/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java
+++ b/src/test/java/de/ids_mannheim/korap/authentication/AuthenticationFilterTest.java
@@ -21,9 +21,9 @@
.request().header(Attributes.AUTHORIZATION, "Blah blah").get();
String entity = response.readEntity(String.class);
JsonNode n = JsonUtils.readTree(entity);
- assertEquals(n.at("/errors/0/0").asText(), "2001");
- assertEquals(n.at("/errors/0/1").asText(),
- "Authentication scheme is not supported.");
- assertEquals(n.at("/errors/0/2").asText(), "Blah");
+ assertEquals("2001", n.at("/errors/0/0").asText());
+ assertEquals("Authentication scheme is not supported.",
+ n.at("/errors/0/1").asText());
+ assertEquals("Blah", n.at("/errors/0/2").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java b/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java
index dfdeb1c..d6b81f5 100644
--- a/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java
+++ b/src/test/java/de/ids_mannheim/korap/authentication/LdapAuth3Test.java
@@ -18,6 +18,7 @@
import static de.ids_mannheim.korap.authentication.LdapAuth3.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LdapAuth3Test {
@@ -71,16 +72,20 @@
}
@Test
- public void loginWithTimeout () throws LDAPException
- {
- // To trigger a timeout inside login(), we load TEST_LDAP_TIMEOUT_CONF which:
- // - sets a timeout for LDAP operations to the lowest value possible = 1ms;
- // - sets the host to be on the network, not localhost, to obtain a response time > 1ms.
-
- assertEquals(LDAP_AUTH_RTIMEOUT,
- LdapAuth3.login("testuser123", "password", TEST_LDAP_TIMEOUT_CONF));
+ public void loginWithTimeout() throws LDAPException {
+ // To trigger a timeout inside login(), we load TEST_LDAP_TIMEOUT_CONF which:
+ // - sets a timeout for LDAP operations to the lowest value possible = 1ms;
+ // - sets the host to be on the network, not localhost, to obtain a response
+ // time > 1ms.
+ // Depending on network behavior, the connection may fail immediately
+ // (connection refused) or actually time out. Both outcomes indicate an
+ // unreachable LDAP server under the configured constraints and are acceptable
+ // here.
+ int rc = LdapAuth3.login("testuser123", "password", TEST_LDAP_TIMEOUT_CONF);
+ assertTrue(rc == LDAP_AUTH_RTIMEOUT || rc == LDAP_AUTH_RCONNECT,
+ "Expected timeout or connection error, but got code=" + rc);
}
-
+
@Test
public void loginWithExtraProfileNameWorks () throws LDAPException {
assertEquals(LDAP_AUTH_ROK,
@@ -198,48 +203,46 @@
@Test
public void gettingMailAttributeForUid () throws LDAPException {
- assertEquals(LdapAuth3.getEmail("testuser", TEST_LDAP_CONF),
- "testuser@example.com");
- assertEquals(LdapAuth3.getEmail("testuser2", TEST_LDAPS_CONF),
- "peter@example.org");
+ assertEquals("testuser@example.com",
+ LdapAuth3.getEmail("testuser", TEST_LDAP_CONF));
+ assertEquals("peter@example.org",
+ LdapAuth3.getEmail("testuser2", TEST_LDAPS_CONF));
assertEquals(null, LdapAuth3.getEmail("non-exsting", TEST_LDAPS_CONF));
}
@Test
public void gettingUsernameForEmail () throws LDAPException {
- assertEquals(
- LdapAuth3.getUsername("testuser@example.com", TEST_LDAP_CONF),
- "idsTestUser");
- assertEquals(
- LdapAuth3.getUsername("peter@example.org", TEST_LDAPS_CONF),
- "testuser2");
+ assertEquals("idsTestUser",
+ LdapAuth3.getUsername("testuser@example.com", TEST_LDAP_CONF));
+ assertEquals("testuser2",
+ LdapAuth3.getUsername("peter@example.org", TEST_LDAPS_CONF));
assertEquals(null,
LdapAuth3.getUsername("non-exsting", TEST_LDAPS_CONF));
- assertEquals(LdapAuth3.getUsername("testUser2", TEST_LDAPS_CONF),
- "testuser2");
+ assertEquals("testuser2",
+ LdapAuth3.getUsername("testUser2", TEST_LDAPS_CONF));
// login with uid, get idsC2Profile username
- assertEquals(LdapAuth3.getUsername("testUser", TEST_LDAPS_CONF),
- "idsTestUser");
+ assertEquals("idsTestUser",
+ LdapAuth3.getUsername("testUser", TEST_LDAPS_CONF));
}
@Test
public void gettingMailAttributeForNotRegisteredUserWorks ()
throws LDAPException {
- assertEquals(LdapAuth3.getEmail("not_registered_user", TEST_LDAP_CONF),
- "not_registered_user@example.com");
+ assertEquals("not_registered_user@example.com",
+ LdapAuth3.getEmail("not_registered_user", TEST_LDAP_CONF));
}
@Test
public void gettingMailAttributeForBlockedUserWorks ()
throws LDAPException {
- assertEquals(LdapAuth3.getEmail("nameOfBlockedUser", TEST_LDAP_CONF),
- "nameOfBlockedUser@example.com");
+ assertEquals("nameOfBlockedUser@example.com",
+ LdapAuth3.getEmail("nameOfBlockedUser", TEST_LDAP_CONF));
}
@Test
public void canLoadLdapConfig () {
LDAPConfig ldapConfig = new LDAPConfig(TEST_LDAPS_CONF);
assertEquals(3269, ldapConfig.port);
- assertEquals(ldapConfig.host, "localhost");
+ assertEquals("localhost", ldapConfig.host);
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java b/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java
index 45b65fe..810dacd 100644
--- a/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java
+++ b/src/test/java/de/ids_mannheim/korap/authentication/LdapOAuth2Test.java
@@ -85,8 +85,8 @@
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
assertEquals(2023, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "LDAP Authentication failed due to unknown user or password!");
+ assertEquals("LDAP Authentication failed due to unknown user or password!",
+ node.at("/errors/0/1").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
index 12a0969..d5773a9 100644
--- a/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
+++ b/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
@@ -73,9 +73,14 @@
"experimental", false, "system", null, null);
});
- assertEquals(exception.getMessage(),
- "Converting `org.hibernate.exception.GenericJDBCException` "
- + "to JPA `PersistenceException` : could not execute statement");
+ String msg = exception.getMessage();
+ // Hibernate 7 exposes provider/DB-specific message; assert key parts
+ org.junit.jupiter.api.Assertions.assertTrue(
+ msg.contains("could not execute statement"),
+ () -> "Unexpected message: " + msg);
+ org.junit.jupiter.api.Assertions.assertTrue(
+ msg.contains("UNIQUE") || msg.contains("constraint"),
+ () -> "Expected unique constraint error in message: " + msg);
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
index ca675cf..c611cbc 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/CollectionQueryBuilderTest.java
@@ -24,8 +24,8 @@
b.with("corpusSigle=WPD");
JsonNode node = JsonUtils.readTree(b.toJSON());
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:doc");
- assertEquals(node.at("/collection/key").asText(), "corpusSigle");
+ assertEquals("koral:doc", node.at("/collection/@type").asText());
+ assertEquals("corpusSigle", node.at("/collection/key").asText());
}
@Test
@@ -34,13 +34,13 @@
b.with("corpusSigle=WPD & textClass=freizeit");
JsonNode node = JsonUtils.readTree(b.toJSON());
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
- assertEquals(node.at("/collection/operands/0/key").asText(),
- "corpusSigle");
- assertEquals(node.at("/collection/operands/1/key").asText(),
- "textClass");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
+ assertEquals("corpusSigle",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/1/key").asText());
}
@Test
@@ -78,22 +78,21 @@
c.with("corpusSigle=WPD");
JsonNode node = JsonUtils.readTree(c.toJSON());
assertNotNull(node);
- assertEquals(node.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/0/@type").asText(),
- "koral:docGroup");
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("koral:docGroup",
+ node.at("/collection/operands/0/@type").asText());
assertEquals(2, node.at("/collection/operands").size());
assertEquals(2, node.at("/collection/operands/0/operands").size());
assertEquals(2,
node.at("/collection/operands/0/operands/0/operands").size());
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
- assertEquals(node.at("/collection/operands/0/operation").asText(),
- "operation:or");
- assertEquals(
- node.at("/collection/operands/0/operands/0/operation").asText(),
- "operation:and");
- assertEquals(node.at("/collection/operands/1/value").asText(), "WPD");
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
+ assertEquals("operation:or",
+ node.at("/collection/operands/0/operation").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operands/0/operands/0/operation").asText());
+ assertEquals("WPD", node.at("/collection/operands/1/value").asText());
}
@Test
@@ -105,22 +104,18 @@
c.with("(corpusSigle=BRZ13 | corpusSigle=AZPS)");
JsonNode node = JsonUtils.readTree(c.toJSON());
assertNotNull(node);
- assertEquals(node.at("/collection/operands/0/@type").asText(),
- "koral:docGroup");
- assertEquals(node.at("/collection/operands/1/@type").asText(),
- "koral:docGroup");
- assertEquals(
- node.at("/collection/operands/1/operands/0/value").asText(),
- "BRZ13");
- assertEquals(
- node.at("/collection/operands/1/operands/1/value").asText(),
- "AZPS");
- assertEquals(
- node.at("/collection/operands/0/operands/0/value").asText(),
- "random title");
- assertEquals(
- node.at("/collection/operands/0/operands/1/value").asText(),
- "wissenschaft");
+ assertEquals("koral:docGroup",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("koral:docGroup",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("BRZ13",
+ node.at("/collection/operands/1/operands/0/value").asText());
+ assertEquals("AZPS",
+ node.at("/collection/operands/1/operands/1/value").asText());
+ assertEquals("random title",
+ node.at("/collection/operands/0/operands/0/value").asText());
+ assertEquals("wissenschaft",
+ node.at("/collection/operands/0/operands/1/value").asText());
}
@Test
@@ -135,24 +130,24 @@
b.with("textClass=freizeit");
JsonNode res = (JsonNode) b.rebaseCollection();
assertNotNull(res);
- assertEquals(res.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(res.at("/collection/operation").asText(), "operation:and");
- assertEquals(res.at("/collection/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(res.at("/collection/operands/1/value").asText(),
- "freizeit");
- assertEquals(res.at("/collection/operands/1/key").asText(),
- "textClass");
- assertEquals(res.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(res.at("/collection/operands/0/value").asText(), "WPD");
- assertEquals(res.at("/collection/operands/0/key").asText(),
- "corpusSigle");
+ assertEquals("koral:docGroup", res.at("/collection/@type").asText());
+ assertEquals("operation:and", res.at("/collection/operation").asText());
+ assertEquals("koral:doc",
+ res.at("/collection/operands/0/@type").asText());
+ assertEquals("freizeit",
+ res.at("/collection/operands/1/value").asText());
+ assertEquals("textClass",
+ res.at("/collection/operands/1/key").asText());
+ assertEquals("koral:doc",
+ res.at("/collection/operands/1/@type").asText());
+ assertEquals("WPD", res.at("/collection/operands/0/value").asText());
+ assertEquals("corpusSigle",
+ res.at("/collection/operands/0/key").asText());
// check also that query is still there
- assertEquals(res.at("/query/@type").asText(), "koral:token");
- assertEquals(res.at("/query/wrap/@type").asText(), "koral:term");
- assertEquals(res.at("/query/wrap/key").asText(), "Haus");
- assertEquals(res.at("/query/wrap/layer").asText(), "lemma");
+ assertEquals("koral:token", res.at("/query/@type").asText());
+ assertEquals("koral:term", res.at("/query/wrap/@type").asText());
+ assertEquals("Haus", res.at("/query/wrap/key").asText());
+ assertEquals("lemma", res.at("/query/wrap/layer").asText());
}
@Test
@@ -164,13 +159,13 @@
c.with("corpusSigle=BRZ13");
JsonNode base = (JsonNode) c.rebaseCollection();
assertNotNull(base);
- assertEquals(base.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(base.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(base.at("/collection/operands/1/value").asText(), "BRZ13");
- assertEquals(base.at("/collection/operands/0/@type").asText(),
- "koral:docGroup");
- assertEquals(base.at("/collection/operands/0/operands").size(), 2);
+ assertEquals("koral:docGroup", base.at("/collection/@type").asText());
+ assertEquals("koral:doc",
+ base.at("/collection/operands/1/@type").asText());
+ assertEquals("BRZ13", base.at("/collection/operands/1/value").asText());
+ assertEquals("koral:docGroup",
+ base.at("/collection/operands/0/@type").asText());
+ assertEquals(2, base.at("/collection/operands/0/operands").size());
}
@Test
@@ -187,9 +182,9 @@
JsonNode node = (JsonNode) test.rebaseCollection();
node = b.mergeWith(node);
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
assertEquals(2, node.at("/collection/operands").size());
}
@@ -246,8 +241,8 @@
test.or().with("textClass=wissenschaft | textClass=politik");
JsonNode node = (JsonNode) test.rebaseCollection();
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operation").asText(), "operation:or");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:or", node.at("/collection/operation").asText());
assertEquals(2, node.at("/collection/operands/1/operands").size());
}
@@ -263,9 +258,9 @@
test.and().with("textClass=wissenschaft | textClass=politik");
JsonNode node = (JsonNode) test.rebaseCollection();
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
assertEquals(2, node.at("/collection/operands/1/operands").size());
}
@@ -281,9 +276,9 @@
test.with("textClass=wissenschaft | textClass=politik");
JsonNode node = (JsonNode) test.rebaseCollection();
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
assertEquals(2, node.at("/collection/operands/1/operands").size());
}
@@ -299,17 +294,17 @@
JsonNode node = total.and()
.mergeWith((JsonNode) builder.rebaseCollection());
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
- assertEquals(node.at("/collection/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/0/key").asText(),
- "textClass");
- assertEquals(node.at("/collection/operands/1/key").asText(),
- "corpusSigle");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("corpusSigle",
+ node.at("/collection/operands/1/key").asText());
}
@Test
@@ -326,7 +321,7 @@
JsonNode node = total.and()
.mergeWith((JsonNode) builder.rebaseCollection());
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:doc");
- assertEquals(node.at("/collection/key").asText(), "textClass");
+ assertEquals("koral:doc", node.at("/collection/@type").asText());
+ assertEquals("textClass", node.at("/collection/key").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java b/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
index 08d71f5..eaacfdf 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/KoralNodeTest.java
@@ -23,7 +23,7 @@
ObjectNode node = JsonUtils.createObjectNode();
KoralNode knode = KoralNode.wrapNode(node);
knode.put("value_1", "setting_1");
- assertEquals(knode.rawNode().toString(), "{\"value_1\":\"setting_1\"}");
+ assertEquals("{\"value_1\":\"setting_1\"}", knode.rawNode().toString());
}
@Test
@@ -33,7 +33,7 @@
KoralNode knode = KoralNode.wrapNode(node);
knode.remove("value_1",
new RewriteIdentifier("value_1", "", "settings_1"));
- assertEquals(knode.rawNode().toString(), "{}");
+ assertEquals("{}", knode.rawNode().toString());
}
@Test
@@ -43,8 +43,8 @@
KoralNode knode = KoralNode.wrapNode(node);
knode.replace("value_1", "settings_2",
new RewriteIdentifier("value_1", "setting_1", ""));
- assertEquals(knode.rawNode().toString(),
- "{\"value_1\":\"settings_2\"}");
+ assertEquals("{\"value_1\":\"settings_2\"}",
+ knode.rawNode().toString());
}
// todo: 21.10.15 --> if a node is injected, that node must contain a "rewrites" reference?!
diff --git a/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java b/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
index bf389db..f94f92a 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
@@ -20,8 +20,8 @@
mm.put("k1", Arrays.asList(new String[] { "a", "b", "c" }));
mm.put("k2", Arrays.asList(new String[] { "d", "e", "f" }));
Map<String, String> map = MapUtils.toMap(mm);
- assertEquals(map.get("k1"), "a b c");
- assertEquals(map.get("k2"), "d e f");
+ assertEquals("a b c", map.get("k1"));
+ assertEquals("d e f", map.get("k2"));
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java b/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
index 7eda84d..268d355 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/MetaQueryBuilderTest.java
@@ -18,7 +18,7 @@
MetaQueryBuilder m = QueryBuilderUtil.defaultMetaBuilder(0, 1, 5,
"sentence", false);
Map<?, ?> map = m.raw();
- assertEquals(map.get("context"), "sentence");
+ assertEquals("sentence", map.get("context"));
assertEquals(1, map.get("startPage"));
assertEquals(0, map.get("startIndex"));
assertEquals(false, map.get("cutOff"));
diff --git a/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java b/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java
index 634530b..7804051 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/RegexTest.java
@@ -14,7 +14,7 @@
String s = "ah[\"-\"]";
Matcher m = AnnotationParser.quotePattern.matcher(s);
if (m.find()) {
- assertEquals(m.group(1), "-");
+ assertEquals("-", m.group(1));
}
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java b/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java
index f7dfb3a..97dcdd0 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/StringUtilsTest.java
@@ -27,8 +27,8 @@
public void testBasicHttpSplit () throws KustvaktException {
String s2 = new String(Base64.encodeBase64("test:testPass".getBytes()));
String[] f2 = TransferEncoding.decodeBase64(s2);
- assertEquals(f2[0], "test");
- assertEquals(f2[1], "testPass");
+ assertEquals("test", f2[0]);
+ assertEquals("testPass", f2[1]);
HttpAuthorizationHandler handler = new HttpAuthorizationHandler();
String s1 = "basic "
+ new String(Base64.encodeBase64("test:testPass".getBytes()));
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
index 1eafe27..648292f 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/AvailabilityRewriteTest.java
@@ -60,9 +60,9 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(0, node.at("/"+collectionNodeName+"/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals(0, node.at("/collection/operands").size());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
@Disabled
@@ -79,12 +79,12 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/@type").asText(),
- "koral:docGroup");
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/operands/0/key").asText(),
- "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:docGroup",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/0/operands/0/key").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
// fixme: will probably fail when one doc groups are being refactored
@@ -103,14 +103,14 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/@type").asText(), "koral:docGroup");
- assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/key").asText(),
- "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/key").asText(),
- "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("textClass",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/1/key").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
@Disabled
@@ -127,11 +127,11 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/@type").asText(), "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/key").asText(), "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/value").asText(), "wissenschaft");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:doc", node.at("/collection/@type").asText());
+ assertEquals("textClass", node.at("/collection/key").asText());
+ assertEquals("wissenschaft", node.at("/collection/value").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
@Disabled
@@ -149,10 +149,10 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(result,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/@type").asText(), "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/key").asText(), "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:doc", node.at("/collection/@type").asText());
+ assertEquals("textClass", node.at("/collection/key").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
@Disabled
@@ -170,14 +170,14 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/@type").asText(), "koral:docGroup");
- assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
@Test
@@ -192,18 +192,18 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/key").asText(),
- "availability");
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/value").asText(),
- "CC.*");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/operands/0/key").asText(),
- "docSigle");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/operands/1/key").asText(),
- "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
-// assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/scope").asText(),
+ assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("availability",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("CC.*",
+ node.at("/collection/operands/0/value").asText());
+ assertEquals("docSigle",
+ node.at("/collection/operands/1/operands/0/key").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/1/operands/1/key").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
+// assertEquals(node.at("/collection/rewrites/0/scope").asText(),
// "availability(FREE)");
}
@@ -241,16 +241,17 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/@type").asText(), "koral:docGroup");
- assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/@type").asText(),
- "koral:docGroup");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/@type").asText(),
- "koral:docGroup");
- assertEquals(1, node.at("/"+collectionNodeName+"/operands/0/operands").size());
- assertEquals(1, node.at("/"+collectionNodeName+"/operands/1/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:docGroup",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("koral:docGroup",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals(1, node.at("/collection/operands/0/operands").size());
+ assertEquals(1, node.at("/collection/operands/1/operands").size());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
@Disabled
@@ -269,23 +270,24 @@
JsonNode node = JsonUtils.readTree(handler.processQuery(org,
User.UserFactory.getUser("test_user"), API_VERSION_DOUBLE));
assertNotNull(node);
- assertEquals(node.at("/"+collectionNodeName+"/@type").asText(), "koral:docGroup");
- assertEquals(2, node.at("/"+collectionNodeName+"/operands").size());
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/key").asText(),
- "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/operands/0/value").asText(),
- "wissenschaft");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/key").asText(),
- "textClass");
- assertEquals(node.at("/"+collectionNodeName+"/operands/1/value").asText(),
- "freizeit");
- assertEquals(node.at("/"+collectionNodeName+"/rewrites/0/@type").asText(),
- "koral:rewrite");
+
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals(2, node.at("/collection/operands").size());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("wissenschaft",
+ node.at("/collection/operands/0/value").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("textClass",
+ node.at("/collection/operands/1/key").asText());
+ assertEquals("freizeit",
+ node.at("/collection/operands/1/value").asText());
+ assertEquals("koral:rewrite",
+ node.at("/collection/rewrites/0/@type").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java
index 609a9e8..bdc5ba6 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/FoundryRewriteTest.java
@@ -70,9 +70,9 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals(node.at("/query/wrap/foundry").asText(), "opennlp");
- assertEquals(node.at("/query/wrap/rewrites/0/scope").asText(),
- "foundry");
+ assertEquals("opennlp", node.at("/query/wrap/foundry").asText());
+ assertEquals("foundry",
+ node.at("/query/wrap/rewrites/0/scope").asText());
}
@Test
@@ -90,9 +90,9 @@
String result = rewriteHandler.processQuery(s.toJSON(),
new KorAPUser(username), API_VERSION_DOUBLE);
JsonNode node = JsonUtils.readTree(result);
- assertEquals(node.at("/query/wrap/foundry").asText(), "corenlp");
- assertEquals(node.at("/query/wrap/rewrites/0/scope").asText(),
- "foundry");
+ assertEquals("corenlp", node.at("/query/wrap/foundry").asText());
+ assertEquals("foundry",
+ node.at("/query/wrap/rewrites/0/scope").asText());
testRewriteLemmaFoundryWithUserSetting(username);
testDeleteSetting(username);
@@ -107,9 +107,9 @@
JsonNode node = JsonUtils.readTree(result);
// EM: only for testing, in fact, opennlp lemma does not
// exist!
- assertEquals(node.at("/query/wrap/foundry").asText(), "opennlp");
- assertEquals(node.at("/query/wrap/rewrites/0/scope").asText(),
- "foundry");
+ assertEquals("opennlp", node.at("/query/wrap/foundry").asText());
+ assertEquals("foundry",
+ node.at("/query/wrap/rewrites/0/scope").asText());
}
@Test
@@ -133,10 +133,10 @@
assertFalse(node.at("/query/wrap/foundry").isMissingNode());
assertEquals(config.getDefault_lemma(),
node.at("/query/wrap/foundry").asText());
- assertEquals(node.at("/query/wrap/layer").asText(), "lemma");
+ assertEquals("lemma", node.at("/query/wrap/layer").asText());
assertFalse(node.at("/query/wrap/rewrites").isMissingNode());
- assertEquals(node.at("/query/wrap/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:rewrite",
+ node.at("/query/wrap/rewrites/0/@type").asText());
}
@Test
@@ -151,10 +151,10 @@
assertFalse(node.at("/query/wrap/foundry").isMissingNode());
assertEquals(config.getDefault_pos(),
node.at("/query/wrap/foundry").asText());
- assertEquals(node.at("/query/wrap/layer").asText(), "pos");
+ assertEquals("pos", node.at("/query/wrap/layer").asText());
assertFalse(node.at("/query/wrap/rewrites").isMissingNode());
- assertEquals(node.at("/query/wrap/rewrites/0/@type").asText(),
- "koral:rewrite");
+ assertEquals("koral:rewrite",
+ node.at("/query/wrap/rewrites/0/@type").asText());
}
@Test
@@ -166,7 +166,7 @@
new KorAPUser("test"), API_VERSION_DOUBLE);
JsonNode node = JsonUtils.readTree(result);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/@type").asText(), "koral:termGroup");
+ assertEquals("koral:termGroup", node.at("/query/wrap/@type").asText());
assertFalse(node.at("/query/wrap/operands/0/foundry").isMissingNode());
assertFalse(node.at("/query/wrap/operands/0/rewrites").isMissingNode());
assertFalse(node.at("/query/wrap/operands/1/foundry").isMissingNode());
@@ -182,7 +182,7 @@
new KorAPUser("test"), API_VERSION_DOUBLE);
JsonNode node = JsonUtils.readTree(result);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/@type").asText(), "koral:termGroup");
+ assertEquals("koral:termGroup", node.at("/query/wrap/@type").asText());
assertFalse(node.at("/query/wrap/operands/0/foundry").isMissingNode());
assertFalse(node.at("/query/wrap/operands/0/rewrites").isMissingNode());
assertFalse(node.at("/query/wrap/operands/1/foundry").isMissingNode());
@@ -196,7 +196,7 @@
String result = rewriteHandler.processQuery(s.toJSON(),
new KorAPUser("test"), API_VERSION_DOUBLE);
JsonNode node = JsonUtils.readTree(result);
- assertEquals(node.at("/query/wrap/@type").asText(), "koral:term");
+ assertEquals("koral:term", node.at("/query/wrap/@type").asText());
assertFalse(node.at("/query/wrap/foundry").isMissingNode());
assertFalse(node.at("/query/wrap/rewrites").isMissingNode());
}
diff --git a/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java b/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java
index 9e3f334..27eed8c 100644
--- a/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java
+++ b/src/test/java/de/ids_mannheim/korap/rewrite/QueryReferenceRewriteTest.java
@@ -61,8 +61,8 @@
.get();
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals(node.at("/query/operands/1/@type").asText(),
- "koral:token");
+ assertEquals("koral:token",
+ node.at("/query/operands/1/@type").asText());
node = node.at("/query/operands/1/rewrites");
assertEquals(1, node.size());
diff --git a/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java b/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java
index 5584fb7..235805d 100644
--- a/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java
+++ b/src/test/java/de/ids_mannheim/korap/user/DataFactoryTest.java
@@ -44,7 +44,7 @@
assertTrue(factory.addValue(node, "field_2", 20));
assertTrue(factory.addValue(node, "field_3", true));
Object value = factory.getValue(node, "field_1");
- assertEquals(value, "value_1");
+ assertEquals("value_1", value);
value = factory.getValue(node, "field_2");
assertEquals(20, value);
value = factory.getValue(node, "field_3");
@@ -55,7 +55,7 @@
assertTrue(factory.addValue(node, "", 10));
assertTrue(factory.addValue(node, "", false));
value = factory.getValue(node, "/0");
- assertEquals(value, "value_2");
+ assertEquals("value_2", value);
value = factory.getValue(node, "/1");
assertEquals(10, value);
value = factory.getValue(node, "/2");
@@ -77,11 +77,11 @@
assertTrue(factory.addValue(node2, "field_4", "value_2"));
assertTrue(factory.addValue(node2, "field_7", "value_3"));
JsonNode node_new = (JsonNode) factory.merge(node, node2);
- assertEquals(node_new.path("field_1").asText(), "value_new");
- assertEquals(node_new.path("field_2").asText(), "value_next");
+ assertEquals("value_new", node_new.path("field_1").asText());
+ assertEquals("value_next", node_new.path("field_2").asText());
assertEquals(true, node_new.path("field_3").asBoolean());
- assertEquals(node_new.path("field_4").asText(), "value_2");
- assertEquals(node_new.path("field_7").asText(), "value_3");
+ assertEquals("value_2", node_new.path("field_4").asText());
+ assertEquals("value_3", node_new.path("field_7").asText());
}
@Test
@@ -106,7 +106,7 @@
assertTrue(factory.addValue(node, "field_2", 20));
assertTrue(factory.addValue(node, "field_3", true));
Object value = factory.getValue(node, "field_1");
- assertEquals(value, "value_1");
+ assertEquals("value_1", value);
value = factory.getValue(node, "field_2");
assertEquals(20, value);
value = factory.getValue(node, "field_3");
@@ -115,14 +115,14 @@
assertTrue(factory.removeValue(node, "field_2"));
assertTrue(factory.removeValue(node, "field_3"));
assertNotNull(node);
- assertEquals(node.toString(), "{}");
+ assertEquals("{}", node.toString());
data = "[]";
node = JsonUtils.readTree(data);
assertTrue(factory.addValue(node, "", "value_2"));
assertTrue(factory.addValue(node, "", 10));
assertTrue(factory.addValue(node, "", false));
value = factory.getValue(node, "/0");
- assertEquals(value, "value_2");
+ assertEquals("value_2", value);
value = factory.getValue(node, "/1");
assertEquals(10, value);
value = factory.getValue(node, "/2");
@@ -132,7 +132,7 @@
assertTrue(factory.removeValue(node, "1"));
assertTrue(factory.removeValue(node, "2"));
assertNotNull(node);
- assertEquals(node.toString(), "[]");
+ assertEquals("[]", node.toString());
}
@Test
@@ -150,7 +150,7 @@
factory.addValue(node, "field_3", array);
assertNotNull(node);
assertEquals(10, node.at("/field_3/0").asInt());
- assertEquals(node.at("/field_3/1").asText(), "v1");
- assertEquals(node.at("/field_3/2").asText(), "v2");
+ assertEquals("v1", node.at("/field_3/1").asText());
+ assertEquals("v2", node.at("/field_3/2").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java b/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
index 499208f..3e3d2de 100644
--- a/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
+++ b/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
@@ -32,7 +32,7 @@
Userdata userData = new UserSettingProcessor();
userData.read(new HashMap<>(), false);
String jsonSettings = userData.serialize();
- assertEquals(jsonSettings, "{}");
+ assertEquals("{}", jsonSettings);
}
@Test
@@ -40,7 +40,7 @@
Userdata userData = new UserSettingProcessor();
userData.read(null, false);
String jsonSettings = userData.serialize();
- assertEquals(jsonSettings, "{}");
+ assertEquals("{}", jsonSettings);
}
// EM: based on MH code, supposedly to validate entries like email
@@ -114,12 +114,12 @@
settings.read(m, true);
assertNotEquals(m.size(), settings.size());
assertEquals(settings.defaultFields().length, settings.size());
- assertEquals(settings.get(Attributes.DEFAULT_FOUNDRY_RELATION),
- "rel_1");
- assertEquals(settings.get(Attributes.DEFAULT_FOUNDRY_POS), "pos_1");
- assertEquals(settings.get(Attributes.DEFAULT_FOUNDRY_LEMMA), "lemma_1");
- assertEquals(settings.get(Attributes.DEFAULT_FOUNDRY_CONSTITUENT),
- "const_1");
+ assertEquals("rel_1",
+ settings.get(Attributes.DEFAULT_FOUNDRY_RELATION));
+ assertEquals("pos_1", settings.get(Attributes.DEFAULT_FOUNDRY_POS));
+ assertEquals("lemma_1", settings.get(Attributes.DEFAULT_FOUNDRY_LEMMA));
+ assertEquals("const_1",
+ settings.get(Attributes.DEFAULT_FOUNDRY_CONSTITUENT));
assertEquals(10, settings.get(Attributes.PAGE_LENGTH));
}
@@ -134,7 +134,7 @@
details.setData(JsonUtils.toJSON(m));
String[] missing = details.findMissingFields();
assertEquals(1, missing.length);
- assertEquals(missing[0], "email");
+ assertEquals("email", missing[0]);
details.checkRequired();
});
}
@@ -153,7 +153,7 @@
array.add("message");
details.setField("errors", array);
assertEquals(100, details.get("/errors/0"));
- assertEquals(details.get("/errors/1"), "message");
+ assertEquals("message", details.get("/errors/1"));
}
@Test
@@ -166,7 +166,7 @@
UserDetails details2 = new UserDetails(-1);
details2.setField(Attributes.COUNTRY, "Germany");
details.update(details2);
- assertEquals(details.get(Attributes.FIRSTNAME), "first");
- assertEquals(details.get(Attributes.COUNTRY), "Germany");
+ assertEquals("first", details.get(Attributes.FIRSTNAME));
+ assertEquals("Germany", details.get(Attributes.COUNTRY));
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java b/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java
index 9260033..afa723d 100644
--- a/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/InitialSuperClientTest.java
@@ -56,8 +56,8 @@
assertTrue(!node.at("/access_token").isMissingNode());
assertTrue(!node.at("/refresh_token").isMissingNode());
assertTrue(!node.at("/expires_in").isMissingNode());
- assertEquals(node.at("/scope").asText(), "all");
- assertEquals(node.at("/token_type").asText(), "Bearer");
+ assertEquals("all", node.at("/scope").asText());
+ assertEquals("Bearer", node.at("/token_type").asText());
}
private void removeSuperClientFile () {
diff --git a/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java b/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java
index 0a025bd..7339292 100644
--- a/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/SearchKrillTest.java
@@ -51,8 +51,8 @@
String matchinfo = krill.getMatch("WPD/AAA.00002/p169-197",
config.getFreeLicensePattern());
JsonNode node = JsonUtils.readTree(matchinfo);
- assertEquals(node.at("/errors/0/1").asText(),
- "Invalid match identifier");
+ assertEquals("Invalid match identifier",
+ node.at("/errors/0/1").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
index e6737bb..21df3a8 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/AnnotationControllerTest.java
@@ -41,16 +41,16 @@
String entity = response.readEntity(String.class);
JsonNode n = JsonUtils.readTree(entity);
n = n.get(0);
- assertEquals(n.get("code").asText(), "opennlp");
- assertEquals(n.get("description").asText(), "OpenNLP");
+ assertEquals("opennlp", n.get("code").asText());
+ assertEquals("OpenNLP", n.get("description").asText());
assertEquals(1, n.get("layers").size());
n = n.get("layers").get(0);
- assertEquals(n.get("code").asText(), "p");
- assertEquals(n.get("description").asText(), "Part-of-Speech");
+ assertEquals("p", n.get("code").asText());
+ assertEquals("Part-of-Speech", n.get("description").asText());
assertEquals(52, n.get("keys").size());
n = n.get("keys").get(0);
- assertEquals(n.get("code").asText(), "ADJA");
- assertEquals(n.get("description").asText(), "Attributive Adjective");
+ assertEquals("ADJA", n.get("code").asText());
+ assertEquals("Attributive Adjective", n.get("description").asText());
assertTrue(n.get("values") == null);
}
@@ -62,21 +62,21 @@
String entity = response.readEntity(String.class);
JsonNode n = JsonUtils.readTree(entity);
n = n.get(0);
- assertEquals(n.get("code").asText(), "mate");
- assertEquals(n.get("description").asText(), "Mate");
+ assertEquals("mate", n.get("code").asText());
+ assertEquals("Mate", n.get("description").asText());
assertEquals(1, n.get("layers").size());
n = n.get("layers").get(0);
- assertEquals(n.get("code").asText(), "m");
- assertEquals(n.get("description").asText(), "Morphology");
+ assertEquals("m", n.get("code").asText());
+ assertEquals("Morphology", n.get("description").asText());
assertEquals(8, n.get("keys").size());
n = n.get("keys").get(1);
- assertEquals(n.get("code").asText(), "case");
- assertEquals(n.get("description").asText(), "Case");
+ assertEquals("case", n.get("code").asText());
+ assertEquals("Case", n.get("description").asText());
assertEquals(5, n.get("values").size());
n = n.get("values");
Iterator<Entry<String, JsonNode>> fields = n.fields();
Entry<String, JsonNode> e = fields.next();
- assertEquals(e.getKey(), "*");
- assertEquals(e.getValue().asText(), "Undefined");
+ assertEquals("*", e.getKey());
+ assertEquals("Undefined", e.getValue().asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
index a087682..f83feb6 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/AvailabilityTest.java
@@ -303,19 +303,19 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String json = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(json);
- assertEquals(node.at("/collection/operation").asText(),
- "operation:and");
- assertEquals(node.at("/collection/operands/0/match").asText(),
- "match:eq");
- assertEquals(node.at("/collection/operands/0/type").asText(),
- "type:regex");
- assertEquals(node.at("/collection/operands/0/key").asText(),
- "availability");
- assertEquals(node.at("/collection/operands/0/value").asText(),
- "CC.*");
- assertEquals(node.at("/collection/operands/1/match").asText(),
- "match:eq");
- assertEquals(node.at("/collection/operands/1/value").asText(), "ACA.*");
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
+ assertEquals("match:eq",
+ node.at("/collection/operands/0/match").asText());
+ assertEquals("type:regex",
+ node.at("/collection/operands/0/type").asText());
+ assertEquals("availability",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("CC.*",
+ node.at("/collection/operands/0/value").asText());
+ assertEquals("match:eq",
+ node.at("/collection/operands/1/match").asText());
+ assertEquals("ACA.*", node.at("/collection/operands/1/value").asText());
}
@@ -620,7 +620,7 @@
String json = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(json);
assertTrue(node.at("/collection/rewrites").isMissingNode());
- assertEquals(node.at("/collection/operation").asText(), "operation:or");
+ assertEquals("operation:or", node.at("/collection/operation").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java
index 1f73561..41b27f7 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/MatchInfoControllerTest.java
@@ -28,10 +28,10 @@
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
assertNotNull(node);
- assertEquals(node.at("/textSigle").asText(), "GOE/AGA/01784");
- assertEquals(node.at("/title").asText(), "Belagerung von Mainz");
- assertEquals(node.at("/author").asText(),
- "Goethe, Johann Wolfgang von");
+ assertEquals("GOE/AGA/01784", node.at("/textSigle").asText());
+ assertEquals("Belagerung von Mainz", node.at("/title").asText());
+ assertEquals("Goethe, Johann Wolfgang von",
+ node.at("/author").asText());
assertTrue(node.at("/snippet").asText()
.startsWith("<span class=\"context-left\"></span>"
+ "<span class=\"match\">"));
@@ -94,17 +94,17 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
JsonNode node = JsonUtils.readTree(entity);
assertNotNull(node);
- assertEquals(node.at("/textSigle").asText(), "GOE/AGI/04846");
- assertEquals(node.at("/title").asText(),
- "Zweiter römischer Aufenthalt");
- assertEquals(node.at("/subTitle").asText(),
- "vom Juni 1787 bis April 1788");
- assertEquals(node.at("/author").asText(),
- "Goethe, Johann Wolfgang von");
+ assertEquals("GOE/AGI/04846", node.at("/textSigle").asText());
+ assertEquals("Zweiter römischer Aufenthalt",
+ node.at("/title").asText());
+ assertEquals("vom Juni 1787 bis April 1788",
+ node.at("/subTitle").asText());
+ assertEquals("Goethe, Johann Wolfgang von",
+ node.at("/author").asText());
assertTrue(node.at("/snippet").asText()
.startsWith("<span class=\"context-left\"></span>"
+ "<span class=\"match\">"));
- assertEquals(node.at("/availability").asText(), "QAO-NC-LOC:ids");
+ assertEquals("QAO-NC-LOC:ids", node.at("/availability").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java
index dcc63d7..fba7687 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/MetadataControllerTest.java
@@ -27,7 +27,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
- assertEquals(node.at("/document/fields/0/key").asText(), "author");
+ assertEquals("author", node.at("/document/fields/0/key").asText());
}
@Test
@@ -39,8 +39,8 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
- assertEquals(node.at("/document/fields/0/key").asText(), "author");
- assertEquals(node.at("/document/fields/1/key").asText(), "title");
+ assertEquals("author", node.at("/document/fields/0/key").asText());
+ assertEquals("title", node.at("/document/fields/1/key").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
index 34548ae..05378f7 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/MultipleCorpusQueryTest.java
@@ -25,16 +25,16 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
- node = node.at("/corpus/operands/1");
- assertEquals(node.at("/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/operation").asText(), "operation:and");
+ node = node.at("/collection/operands/1");
+ assertEquals("koral:docGroup", node.at("/@type").asText());
+ assertEquals("operation:and", node.at("/operation").asText());
assertEquals(2, node.at("/operands").size());
- assertEquals(node.at("/operands/0/@type").asText(), "koral:doc");
- assertEquals(node.at("/operands/0/match").asText(), "match:eq");
- assertEquals(node.at("/operands/0/key").asText(), "pubPlace");
- assertEquals(node.at("/operands/0/value").asText(), "München");
- assertEquals(node.at("/operands/1/key").asText(), "textSigle");
- assertEquals(node.at("/operands/1/value").asText(), "GOE/AGA/01784");
+ assertEquals("koral:doc", node.at("/operands/0/@type").asText());
+ assertEquals("match:eq", node.at("/operands/0/match").asText());
+ assertEquals("pubPlace", node.at("/operands/0/key").asText());
+ assertEquals("München", node.at("/operands/0/value").asText());
+ assertEquals("textSigle", node.at("/operands/1/key").asText());
+ assertEquals("GOE/AGA/01784", node.at("/operands/1/value").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java
index 363b844..a9981f0 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/QueryReferenceControllerTest.java
@@ -44,7 +44,7 @@
assertEquals(resourceType.displayName(), node.at("/type").asText());
assertEquals(queryCreator, node.at("/createdBy").asText());
assertEquals(query, node.at("/query").asText());
- assertEquals(node.at("/queryLanguage").asText(), "poliqarp");
+ assertEquals("poliqarp", node.at("/queryLanguage").asText());
}
private void testUpdateQuery (String qName, String qCreator,
@@ -191,8 +191,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "queryLanguage is null");
- assertEquals(node.at("/errors/0/2").asText(), "queryLanguage");
+ assertEquals("queryLanguage is null", node.at("/errors/0/1").asText());
+ assertEquals("queryLanguage", node.at("/errors/0/2").asText());
}
@Test
@@ -211,8 +211,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "query is null");
- assertEquals(node.at("/errors/0/2").asText(), "query");
+ assertEquals("query is null", node.at("/errors/0/1").asText());
+ assertEquals("query", node.at("/errors/0/2").asText());
}
@Test
@@ -231,8 +231,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "type is null");
- assertEquals(node.at("/errors/0/2").asText(), "type");
+ assertEquals("type is null", node.at("/errors/0/1").asText());
+ assertEquals("type", node.at("/errors/0/2").asText());
}
private void testDeleteQueryByName (String qName, String qCreator,
@@ -294,10 +294,10 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.NO_RESOURCE_FOUND,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Query dory/non-existing-query is not found.");
- assertEquals(node.at("/errors/0/2").asText(),
- "dory/non-existing-query");
+ assertEquals("Query dory/non-existing-query is not found.",
+ node.at("/errors/0/1").asText());
+ assertEquals("dory/non-existing-query",
+ node.at("/errors/0/2").asText());
}
public void testListAvailableQueryForDory ()
@@ -311,11 +311,11 @@
throws ProcessingException, KustvaktException {
JsonNode node = testListAvailableQuery("pearl");
assertEquals(1, node.size());
- assertEquals(node.at("/0/name").asText(), "system-q");
+ assertEquals("system-q", node.at("/0/name").asText());
assertEquals(ResourceType.SYSTEM.displayName(),
node.at("/0/type").asText());
- assertEquals(node.at("/0/description").asText(), "\"system\" query");
- assertEquals(node.at("/0/query").asText(), "[]");
+ assertEquals("\"system\" query", node.at("/0/description").asText());
+ assertEquals("[]", node.at("/0/query").asText());
// assertEquals("koral:token", node.at("/0/koralQuery/@type").asText());
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
index 5c70f57..1ee965e 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/QuerySerializationControllerTest.java
@@ -35,8 +35,8 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/collection/key").asText(), "corpusSigle");
- assertEquals(node.at("/collection/value").asText(), "WPD13");
+ assertEquals("corpusSigle", node.at("/collection/key").asText());
+ assertEquals("WPD13", node.at("/collection/value").asText());
}
@Test
@@ -50,8 +50,8 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertEquals(101, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(),
- "[Cannot found public Corpus with ids: [ZUW19]]");
+ assertEquals("[Cannot found public Corpus with ids: [ZUW19]]",
+ node.at("/errors/0/2").asText());
}
@Test
@@ -65,8 +65,8 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertEquals(101, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(),
- "[Cannot found public Corpus with ids: [BRZ10]]");
+ assertEquals("[Cannot found public Corpus with ids: [BRZ10]]",
+ node.at("/errors/0/2").asText());
}
@Test
@@ -84,9 +84,9 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/collection/@type").asText(), "koral:doc");
- assertEquals(node.at("/collection/key").asText(), "corpusSigle");
- assertEquals(node.at("/collection/value").asText(), "BRZ10");
+ assertEquals("koral:doc", node.at("/collection/@type").asText());
+ assertEquals("corpusSigle", node.at("/collection/key").asText());
+ assertEquals("BRZ10", node.at("/collection/value").asText());
}
@Test
@@ -110,7 +110,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
assertTrue(node.isObject());
- assertEquals(node.path("name").asText(), "Weimarer Werke");
+ assertEquals("Weimarer Werke", node.path("name").asText());
// Get virtual collections
response = target().path(API_VERSION).path("collection").request()
.header(Attributes.AUTHORIZATION,
@@ -146,23 +146,23 @@
node = JsonUtils.readTree(ent);
assertNotNull(node);
// System.out.println("NODE " + ent);
- assertEquals(node.at("/collection/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/collection/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/0/key").asText(),
- "creationDate");
- assertEquals(node.at("/collection/operands/0/value").asText(), "1775");
- assertEquals(node.at("/collection/operands/0/type").asText(),
- "type:date");
- assertEquals(node.at("/collection/operands/0/match").asText(),
- "match:geq");
- assertEquals(node.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/1/key").asText(),
- "corpusSigle");
- assertEquals(node.at("/collection/operands/1/value").asText(), "GOE");
- assertEquals(node.at("/collection/operands/1/match").asText(),
- "match:eq");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("creationDate",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("1775", node.at("/collection/operands/0/value").asText());
+ assertEquals("type:date",
+ node.at("/collection/operands/0/type").asText());
+ assertEquals("match:geq",
+ node.at("/collection/operands/0/match").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("corpusSigle",
+ node.at("/collection/operands/1/key").asText());
+ assertEquals("GOE", node.at("/collection/operands/1/value").asText());
+ assertEquals("match:eq",
+ node.at("/collection/operands/1/match").asText());
}
@Test
@@ -176,17 +176,17 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/collection/operands/0/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/0/key").asText(),
- "corpusSigle");
- assertEquals(node.at("/collection/operands/0/value").asText(), "GOE");
- assertEquals(node.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/1/key").asText(),
- "creationDate");
- assertEquals(node.at("/collection/operands/1/value").asText(),
- "1810-01-01");
+ assertEquals("koral:doc",
+ node.at("/collection/operands/0/@type").asText());
+ assertEquals("corpusSigle",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("GOE", node.at("/collection/operands/0/value").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("creationDate",
+ node.at("/collection/operands/1/key").asText());
+ assertEquals("1810-01-01",
+ node.at("/collection/operands/1/value").asText());
}
@Test
@@ -196,17 +196,17 @@
.queryParam("page", "5").queryParam("cutoff", "true")
.queryParam("q", "[pos=ADJA]").queryParam("ql", "poliqarp")
.request().method("GET");
- assertEquals(response.getStatus(), Status.OK.getStatusCode());
+ assertEquals(Status.OK.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals(node.at("/meta/context").asText(), "sentence");
+ assertEquals("sentence", node.at("/meta/context").asText());
assertEquals(20, node.at("/meta/count").asInt());
assertEquals(5, node.at("/meta/startPage").asInt());
assertEquals(true, node.at("/meta/cutOff").asBoolean());
- assertEquals(node.at("/query/wrap/@type").asText(), "koral:term");
- assertEquals(node.at("/query/wrap/layer").asText(), "pos");
- assertEquals(node.at("/query/wrap/match").asText(), "match:eq");
- assertEquals(node.at("/query/wrap/key").asText(), "ADJA");
+ assertEquals("koral:term", node.at("/query/wrap/@type").asText());
+ assertEquals("pos", node.at("/query/wrap/layer").asText());
+ assertEquals("match:eq", node.at("/query/wrap/match").asText());
+ assertEquals("ADJA", node.at("/query/wrap/key").asText());
}
@Test
@@ -217,10 +217,10 @@
.queryParam("page", "5").queryParam("offset", "2")
.queryParam("cutoff", "true").queryParam("q", "[pos=ADJA]")
.queryParam("ql", "poliqarp").request().method("GET");
- assertEquals(response.getStatus(), Status.OK.getStatusCode());
+ assertEquals(Status.OK.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals(node.at("/meta/context").asText(), "sentence");
+ assertEquals("sentence", node.at("/meta/context").asText());
assertEquals(20, node.at("/meta/count").asInt());
assertEquals(2, node.at("/meta/startIndex").asInt());
assertEquals(true, node.at("/meta/cutOff").asBoolean());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/ResourceControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/ResourceControllerTest.java
index b31d934..6a5112a 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/ResourceControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/ResourceControllerTest.java
@@ -27,10 +27,10 @@
JsonNode n0 = n.get(0);
assertEquals("http://hdl.handle.net/10932/00-03B6-558F-4E10-6201-1",
n0.at("/resourceId").asText());
- assertEquals(n0.at("/titles/de").asText(),
- "Deutsche Wikipedia Artikel 2017");
- assertEquals(n0.at("/titles/en").asText(),
- "German Wikipedia Articles 2017");
+ assertEquals("Deutsche Wikipedia Artikel 2017",
+ n0.at("/titles/de").asText());
+ assertEquals("German Wikipedia Articles 2017",
+ n0.at("/titles/en").asText());
assertEquals(1, n0.at("/languages").size());
assertEquals(6, n0.at("/layers").size());
assertEquals("IDS Mannheim", n0.at("/institution").asText());
@@ -43,10 +43,10 @@
JsonNode n1 = n.get(1);
assertEquals("http://hdl.handle.net/10932/00-03B6-558F-5EA0-6301-B",
n1.at("/resourceId").asText());
- assertEquals(n1.at("/titles/de").asText(),
- "Deutsche Wikipedia-Diskussionskorpus 2017");
- assertEquals(n1.at("/titles/en").asText(),
- "German Wikipedia talk corpus 2017");
+ assertEquals("Deutsche Wikipedia-Diskussionskorpus 2017",
+ n1.at("/titles/de").asText());
+ assertEquals("German Wikipedia talk corpus 2017",
+ n1.at("/titles/en").asText());
assertEquals(1, n1.at("/languages").size());
assertEquals(6, n1.at("/layers").size());
assertEquals("IDS Mannheim", n1.at("/institution").asText());
@@ -57,10 +57,10 @@
JsonNode n3 = n.get(3);
assertEquals("Wikipedia-Diskussionsseiten",
n3.at("/resourceId").asText());
- assertEquals(n3.at("/titles/de").asText(),
- "Wikipedia-Diskussionsseiten");
- assertEquals(n3.at("/titles/en").asText(),
- "Wikipedia Talk Pages");
+ assertEquals("Wikipedia-Diskussionsseiten",
+ n3.at("/titles/de").asText());
+ assertEquals("Wikipedia Talk Pages",
+ n3.at("/titles/en").asText());
assertEquals(1, n3.at("/languages").size());
assertEquals(6, n3.at("/layers").size());
assertEquals("IDS Mannheim", n3.at("/institution").asText());
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java
index d2d4fed..8ba4927 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/ResourceInfoControllerTest.java
@@ -62,9 +62,9 @@
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
assertNotEquals(0, node.size());
- assertEquals(node.path("name").asText(), "Goethe Virtual Collection");
- assertEquals(node.path("description").asText(),
- "Goethe works from 1810");
+ assertEquals("Goethe Virtual Collection", node.path("name").asText());
+ assertEquals("Goethe works from 1810",
+ node.path("description").asText());
}
@Test
@@ -78,8 +78,8 @@
assertNotNull(node);
assertNotEquals(0, node.size());
assertEquals(101, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(),
- "[Cannot found public VirtualCollection with ids: [WPD15-VC]]");
+ assertEquals("[Cannot found public VirtualCollection with ids: [WPD15-VC]]",
+ node.at("/errors/0/2").asText());
}
@Test
@@ -104,7 +104,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
assertTrue(node.isObject());
- assertEquals(node.path("id").asText(), "WPD13");
+ assertEquals("WPD13", node.path("id").asText());
}
@Test
@@ -116,7 +116,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
assertTrue(node.isObject());
- assertEquals(node.path("id").asText(), "GOE");
+ assertEquals("GOE", node.path("id").asText());
}
@Test
@@ -152,8 +152,8 @@
assertNotNull(node);
assertNotEquals(0, node.size());
assertEquals(101, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(),
- "[Cannot found public Corpus with ids: [ZUW19]]");
+ assertEquals("[Cannot found public Corpus with ids: [ZUW19]]",
+ node.at("/errors/0/2").asText());
}
// EM: queries for an unauthorized corpus get the same responses /
@@ -170,7 +170,7 @@
assertNotNull(node);
assertNotEquals(0, node.size());
assertEquals(101, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(),
- "[Cannot found public Corpus with ids: [BRZ10]]");
+ assertEquals("[Cannot found public Corpus with ids: [BRZ10]]",
+ node.at("/errors/0/2").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
index da68e6a..55a31b6 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/SearchControllerTest.java
@@ -61,10 +61,10 @@
public void testApiWelcomeMessage () {
Response response = target().path(API_VERSION).path("").request().get();
assertEquals(Status.OK.getStatusCode(), response.getStatus());
- assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
- "Wes8Bd4h1OypPqbWF5njeQ==");
+ assertEquals("Wes8Bd4h1OypPqbWF5njeQ==",
+ response.getHeaders().getFirst("X-Index-Revision"));
String message = response.readEntity(String.class);
- assertEquals(message, config.getApiWelcomeMessage());
+ assertEquals(config.getApiWelcomeMessage(), message);
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
index 6b3dc7f..03b1ded 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPipeTest.java
@@ -96,7 +96,7 @@
assertEquals(200, connection.getResponseCode());
BufferedReader br = new BufferedReader(
new InputStreamReader(connection.getInputStream(), "utf-8"));
- assertEquals(br.readLine(), "{test}");
+ assertEquals("{test}", br.readLine());
}
@Test
@@ -120,8 +120,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(2, node.at("/query/wrap/key").size());
assertEquals(1, node.at("/collection/rewrites").size());
- assertEquals(node.at("/collection/rewrites/0/operation").asText(),
- "operation:injection");
+ assertEquals("operation:injection",
+ node.at("/collection/rewrites/0/operation").asText());
assertEquals(freeCorpusAccess,
node.at("/collection/rewrites/0/_comment").asText());
node = node.at("/query/wrap/rewrites");
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
index 230b6ff..db5b538 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/SearchPublicMetadataTest.java
@@ -66,10 +66,10 @@
assertEquals(allCorpusAccess,
node.at("/collection/rewrites/0/_comment").asText());
assertTrue(node.at("/matches/0/snippet").isMissingNode());
- assertEquals(node.at("/matches/0/author").asText(),
- "Goethe, Johann Wolfgang von");
- assertEquals(node.at("/matches/0/title").asText(),
- "Italienische Reise");
+ assertEquals("Goethe, Johann Wolfgang von",
+ node.at("/matches/0/author").asText());
+ assertEquals("Italienische Reise",
+ node.at("/matches/0/title").asText());
// assertEquals(3, node.at("/matches/0").size());
}
@@ -85,9 +85,9 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.NON_PUBLIC_FIELD_IGNORED,
node.at("/warnings/0/0").asInt());
- assertEquals(node.at("/warnings/0/1").asText(),
- "The requested non public fields are ignored");
- assertEquals(node.at("/warnings/0/2").asText(), "snippet");
+ assertEquals("The requested non public fields are ignored",
+ node.at("/warnings/0/1").asText());
+ assertEquals("snippet", node.at("/warnings/0/2").asText());
}
// EM: The API is disabled
@@ -131,9 +131,9 @@
node = node.at("/operands/1");
assertEquals("koral:docGroupRef", node.at("/@type").asText());
assertEquals("system-vc", node.at("/ref").asText());
-// assertEquals(node.at("/value").asText(), "GOE");
-// assertEquals(node.at("/match").asText(), "match:eq");
-// assertEquals(node.at("/key").asText(), "corpusSigle");
+// assertEquals("GOE", node.at("/value").asText());
+// assertEquals("match:eq", node.at("/match").asText());
+// assertEquals("corpusSigle", node.at("/key").asText());
}
@@ -150,7 +150,7 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(), "guest");
+ assertEquals("guest", node.at("/errors/0/2").asText());
deleteVC("dory-vc", "dory", "dory");
deleteVC("group-vc", "dory", "dory");
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
index a311a63..97b50c6 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/StatisticsControllerTest.java
@@ -32,8 +32,8 @@
Response response = target().path(API_VERSION).path("statistics")
.queryParam("cq", corpusQuery).request().get();
assert Status.OK.getStatusCode() == response.getStatus();
- assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
- "Wes8Bd4h1OypPqbWF5njeQ==");
+ assertEquals("Wes8Bd4h1OypPqbWF5njeQ==",
+ response.getHeaders().getFirst("X-Index-Revision"));
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertEquals(0,node.get("documents").asInt());
@@ -45,7 +45,7 @@
Response response = requestTokenWithDoryPassword(superClientId,
clientSecret);
JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
- assertEquals(node.at("/scope").asText(), "all");
+ assertEquals("all", node.at("/scope").asText());
String accessToken = node.at("/access_token").asText();
String corpusQuery = "corpusSigle=GOE";
@@ -157,8 +157,8 @@
+ "\"koral:doc\", \"key\": \"availability\", \"match\": "
+ "\"match:eq\", \"type\": \"type:regex\", \"value\": "
+ "\"CC.*\"} }"));
- assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
- "Wes8Bd4h1OypPqbWF5njeQ==");
+ assertEquals("Wes8Bd4h1OypPqbWF5njeQ==",
+ response.getHeaders().getFirst("X-Index-Revision"));
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
@@ -180,8 +180,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
node.at("/errors/0/0").asInt());
- assertEquals("VC is not found",
- node.at("/errors/0/1").asText());
+ assertTrue(node.at("/errors/0/1").asText().contains(" is not found"));
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java
index 1d130b6..3b93f65 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/TokenExpiryTest.java
@@ -68,8 +68,8 @@
assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
JsonNode node = JsonUtils.readTree(ent);
assertEquals(StatusCodes.EXPIRED, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Access token is expired");
+ assertEquals("Access token is expired",
+ node.at("/errors/0/1").asText());
}
// cannot be tested dynamically
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java
index e7e7ef3..64cd0d0 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/UserSettingControllerTest.java
@@ -72,7 +72,7 @@
JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(), "key/");
+ assertEquals("key/", node.at("/errors/0/2").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerAdminTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerAdminTest.java
index 6a5e77e..7982294 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerAdminTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerAdminTest.java
@@ -146,7 +146,7 @@
.header(HttpHeaders.X_FORWARDED_FOR, "149.27.0.32").get();
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
- assertEquals(entity, "[]");
+ assertEquals("[]", entity);
}
private void testListByStatusAll ()
@@ -282,7 +282,7 @@
JsonNode node = listGroup(testUser);
node = node.get(0);
assertEquals(3, node.get("members").size());
- assertEquals(node.at("/members/1/userId").asText(), "nemo");
+ assertEquals("nemo", node.at("/members/1/userId").asText());
}
private void testAddMember (String groupName)
@@ -301,7 +301,7 @@
JsonNode node = listGroup(testUser);
node = node.get(0);
assertEquals(4, node.get("members").size());
- assertEquals(node.at("/members/3/userId").asText(), "darla");
+ assertEquals("darla", node.at("/members/3/userId").asText());
assertEquals(1, node.at("/members/1/privileges").size());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerTest.java
index 292c8e0..a1754fd 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupControllerTest.java
@@ -64,7 +64,7 @@
node.at("/errors/0/0").asInt());
// assertEquals("User-group name must only contains letters, numbers, "
// + "underscores, hypens and spaces", node.at("/errors/0/1").asText());
- assertEquals(node.at("/errors/0/2").asText(), "invalid-group-name$");
+ assertEquals("invalid-group-name$", node.at("/errors/0/2").asText());
}
@Test
@@ -76,9 +76,9 @@
JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "groupName must contain at least 3 characters");
- assertEquals(node.at("/errors/0/2").asText(), "groupName");
+ assertEquals("groupName must contain at least 3 characters",
+ node.at("/errors/0/1").asText());
+ assertEquals("groupName", node.at("/errors/0/2").asText());
}
@Test
@@ -94,7 +94,7 @@
JsonNode node = listUserGroups(username);
assertEquals(1, node.size());
node = node.get(0);
- assertEquals(node.get("name").asText(), "new-user-group");
+ assertEquals("new-user-group", node.get("name").asText());
assertEquals(description, node.get("description").asText());
assertEquals(username, node.get("owner").asText());
assertEquals(1, node.get("members").size());
@@ -144,8 +144,8 @@
assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: dory");
+ assertEquals("Unauthorized operation for user: dory",
+ node.at("/errors/0/1").asText());
deleteGroupByName(marlinGroupName, "marlin");
}
@@ -175,8 +175,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
assertEquals(StatusCodes.NOT_ALLOWED, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Operation 'delete group owner'is not allowed.");
+ assertEquals("Operation 'delete group owner'is not allowed.",
+ node.at("/errors/0/1").asText());
deleteGroupByName(marlinGroupName, "marlin");
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupListTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupListTest.java
index 51c1d50..1dc4270 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupListTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupListTest.java
@@ -24,18 +24,18 @@
JsonNode node = listUserGroups("dory");
JsonNode group = node.get(0);
- assertEquals(group.at("/name").asText(), "dory-group");
- assertEquals(group.at("/owner").asText(), "dory");
+ assertEquals("dory-group", group.at("/name").asText());
+ assertEquals("dory", group.at("/owner").asText());
assertEquals(3, group.at("/members").size());
- assertEquals(group.at("/members/0/userId").asText(), "dory");
- assertEquals(group.at("/members/0/roles").size(), 1);
- assertEquals(group.at("/members/0/roles/0").asText(), "GROUP_ADMIN");
- assertEquals(group.at("/members/0/privileges").size(), 5);
+ assertEquals("dory", group.at("/members/0/userId").asText());
+ assertEquals(1, group.at("/members/0/roles").size());
+ assertEquals("GROUP_ADMIN", group.at("/members/0/roles/0").asText());
+ assertEquals(5, group.at("/members/0/privileges").size());
- assertEquals(group.at("/members/1/userId").asText(), "marlin");
- assertEquals(group.at("/members/1/roles").size(), 1);
- assertEquals(group.at("/members/1/roles/0").asText(), "GROUP_MEMBER");
+ assertEquals("marlin", group.at("/members/1/userId").asText());
+ assertEquals(1, group.at("/members/1/roles").size());
+ assertEquals("GROUP_MEMBER", group.at("/members/1/roles/0").asText());
testListNemoGroups();
testListMarlinGroups();
@@ -46,8 +46,8 @@
public void testListNemoGroups () throws KustvaktException {
JsonNode node = listUserGroups("nemo");
- assertEquals(node.at("/0/name").asText(), "dory-group");
- assertEquals(node.at("/0/owner").asText(), "dory");
+ assertEquals("dory-group", node.at("/0/name").asText());
+ assertEquals("dory", node.at("/0/owner").asText());
// group members are not allowed to see other members
assertTrue(node.at("/0/members").isMissingNode());
// System.out.println(node.toPrettyString());
@@ -69,7 +69,7 @@
assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: guest");
+ assertEquals("Unauthorized operation for user: guest",
+ node.at("/errors/0/1").asText());
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java
index 10ce9ba..2630e44 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupMemberTest.java
@@ -57,8 +57,8 @@
"Username: nemo exists in the user-group: "
+ "dory-group",
node.at("/errors/0/1").asText());
- assertEquals(node.at("/errors/0/2").asText(),
- "[nemo, dory-group]");
+ assertEquals("[nemo, dory-group]",
+ node.at("/errors/0/2").asText());
}
private void testAddMemberToDeletedGroup () throws KustvaktException {
@@ -153,8 +153,8 @@
assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: "+deletedBy);
+ assertEquals("Unauthorized operation for user: "+deletedBy,
+ node.at("/errors/0/1").asText());
}
private void testDeleteMemberUnauthorizedByMember (String groupName,
@@ -166,8 +166,8 @@
assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: "+deletedBy);
+ assertEquals("Unauthorized operation for user: "+deletedBy,
+ node.at("/errors/0/1").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupTestBase.java b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupTestBase.java
index 7bff0bd..126c89c 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupTestBase.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupTestBase.java
@@ -83,7 +83,7 @@
JsonNode node = listUserGroups(username);
node = node.get(0);
assertEquals(2, node.get("members").size());
- assertEquals(node.at("/members/1/userId").asText(), memberUsername);
+ assertEquals(memberUsername, node.at("/members/1/userId").asText());
assertEquals(1, node.at("/members/1/privileges").size());
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java
index 4c82125..34e9c9a 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java
@@ -123,7 +123,7 @@
.put(Entity.json(json));
assertEquals(Status.NO_CONTENT.getStatusCode(), response.getStatus());
JsonNode node = testAdminListVC(testUser);
- assertEquals(node.at("/0/description").asText(), "edited vc");
+ assertEquals("edited vc", node.at("/0/description").asText());
}
private void testDeletePrivateVC (String vcCreator, String vcName)
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java
index 27815bc..bc3e0c3 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerTest.java
@@ -68,7 +68,7 @@
// list user VC
JsonNode node = listVC(testUser);
assertEquals(2, node.size());
- assertEquals(node.get(1).get("name").asText(), "new_vc");
+ assertEquals("new_vc", node.get(1).get("name").asText());
testCreateVC_sameName(testUser, "new_vc", ResourceType.PRIVATE);
@@ -163,8 +163,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ACCESS_TOKEN,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Access token is invalid");
+ assertEquals("Access token is invalid",
+ node.at("/errors/0/1").asText());
checkWWWAuthenticateHeader(response);
}
@@ -190,8 +190,8 @@
assertEquals(Status.UNAUTHORIZED.getStatusCode(), response.getStatus());
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.EXPIRED, node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Access token is expired");
+ assertEquals("Access token is expired",
+ node.at("/errors/0/1").asText());
checkWWWAuthenticateHeader(response);
}
@@ -227,8 +227,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "queryName must contain at least 3 characters");
+ assertEquals("queryName must contain at least 3 characters",
+ node.at("/errors/0/1").asText());
}
@Test
@@ -244,8 +244,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: guest");
+ assertEquals("Unauthorized operation for user: guest",
+ node.at("/errors/0/1").asText());
checkWWWAuthenticateHeader(response);
}
@@ -264,8 +264,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "corpusQuery is null");
- assertEquals(node.at("/errors/0/2").asText(), "corpusQuery");
+ assertEquals("corpusQuery is null", node.at("/errors/0/1").asText());
+ assertEquals("corpusQuery", node.at("/errors/0/2").asText());
}
@Test
@@ -280,8 +280,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "request entity is null");
- assertEquals(node.at("/errors/0/2").asText(), "request entity");
+ assertEquals("request entity is null", node.at("/errors/0/1").asText());
+ assertEquals("request entity", node.at("/errors/0/2").asText());
}
@Test
@@ -299,8 +299,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "type is null");
- assertEquals(node.at("/errors/0/2").asText(), "type");
+ assertEquals("type is null", node.at("/errors/0/1").asText());
+ assertEquals("type", node.at("/errors/0/2").asText());
}
@Test
@@ -413,13 +413,13 @@
editVC("dory", "dory", "dory-vc", json);
// check VC
JsonNode node = retrieveVCInfo("dory", "dory", "dory-vc");
- assertEquals(node.at("/description").asText(), "edited vc");
+ assertEquals("edited vc", node.at("/description").asText());
// 2nd edit
json = "{\"description\": \"test vc\"}";
editVC("dory", "dory", "dory-vc", json);
// check VC
node = retrieveVCInfo("dory", "dory", "dory-vc");
- assertEquals(node.at("/description").asText(), "test vc");
+ assertEquals("test vc", node.at("/description").asText());
deleteVC("dory-vc", "dory", "dory");
}
@@ -444,34 +444,31 @@
throws ProcessingException, KustvaktException {
createDoryVC();
JsonNode node = testRetrieveKoralQuery("dory", "dory-vc");
- node = node.at("/"+COLLECTION_NODE_NAME);
- assertEquals(node.at("/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/operation").asText(),
- "operation:and");
- assertEquals(2, node.at("/operands").size());
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
+ assertEquals(2, node.at("/collection/operands").size());
String json = "{\"corpusQuery\": \"corpusSigle=WPD17\"}";
editVC("dory", "dory", "dory-vc", json);
node = testRetrieveKoralQuery("dory", "dory-vc");
- node = node.at("/"+COLLECTION_NODE_NAME);
- assertEquals(node.at("/@type").asText(), "koral:doc");
- assertEquals(node.at("/key").asText(), "corpusSigle");
- assertEquals(node.at("/value").asText(), "WPD17");
+ assertEquals("koral:doc", node.at("/collection/@type").asText());
+ assertEquals("corpusSigle", node.at("/collection/key").asText());
+ assertEquals("WPD17", node.at("/collection/value").asText());
json = "{\"corpusQuery\": \"corpusSigle=GOE AND creationDate since "
+ "1820\"}";
editVC("dory", "dory", "dory-vc", json);
node = testRetrieveKoralQuery("dory", "dory-vc");
- node = node.at("/"+COLLECTION_NODE_NAME);
- assertEquals(node.at("/@type").asText(), "koral:docGroup");
- assertEquals(node.at("/operation").asText(),
- "operation:and");
- assertEquals(node.at("/operands/0/key").asText(),
- "corpusSigle");
- assertEquals(node.at("/operands/0/value").asText(), "GOE");
- assertEquals(node.at("/operands/1/key").asText(),
- "creationDate");
- assertEquals(node.at("/operands/1/value").asText(), "1820");
+ assertEquals("koral:docGroup", node.at("/collection/@type").asText());
+ assertEquals("operation:and",
+ node.at("/collection/operation").asText());
+ assertEquals("corpusSigle",
+ node.at("/collection/operands/0/key").asText());
+ assertEquals("GOE", node.at("/collection/operands/0/value").asText());
+ assertEquals("creationDate",
+ node.at("/collection/operands/1/key").asText());
+ assertEquals("1820", node.at("/collection/operands/1/value").asText());
deleteVC("dory-vc", "dory", "dory");
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusFieldTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusFieldTest.java
index 48e9c6b..9525926 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusFieldTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusFieldTest.java
@@ -74,14 +74,14 @@
throws IOException, QueryException, KustvaktException {
vcLoader.loadVCToCache("named-vc1", "/vc/named-vc1.jsonld");
JsonNode n = testRetrieveField("system", "named-vc1", "textSigle");
- assertEquals(n.at("/@context").asText(),
- "http://korap.ids-mannheim.de/ns/KoralQuery/v0.3/context.jsonld");
- assertEquals(n.at("/corpus/key").asText(), "textSigle");
+ assertEquals("http://korap.ids-mannheim.de/ns/KoralQuery/v0.3/context.jsonld",
+ n.at("/@context").asText());
+ assertEquals("textSigle", n.at("/corpus/key").asText());
assertEquals(2, n.at("/corpus/value").size());
n = testRetrieveField("system", "named-vc1", "author");
assertEquals(2, n.at("/corpus/value").size());
- assertEquals(n.at("/corpus/value/0").asText(),
- "Goethe, Johann Wolfgang von");
+ assertEquals("Goethe, Johann Wolfgang von",
+ n.at("/corpus/value/0").asText());
testRetrieveUnknownTokens();
testRetrieveProhibitedField("system", "named-vc1", "tokens");
testRetrieveProhibitedField("system", "named-vc1", "base");
@@ -91,7 +91,7 @@
private void testRetrieveUnknownTokens ()
throws ProcessingException, KustvaktException {
JsonNode n = testRetrieveField("system", "named-vc1", "unknown");
- assertEquals(n.at("/corpus/key").asText(), "unknown");
+ assertEquals("unknown", n.at("/corpus/key").asText());
assertEquals(0, n.at("/corpus/value").size());
}
@@ -111,7 +111,7 @@
JsonNode n = testRetrieveField("system", "named-vc3", "textSigle");
n = n.at("/corpus/value");
assertEquals(1, n.size());
- assertEquals(n.get(0).asText(), "GOE/AGI/00000");
+ assertEquals("GOE/AGI/00000", n.get(0).asText());
testDeleteVC("named-vc3", "system", admin);
}
@@ -131,8 +131,8 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: dory");
+ assertEquals("Unauthorized operation for user: dory",
+ node.at("/errors/0/1").asText());
testDeleteVC("named-vc3", "system", admin);
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java
index 875c818..d9922cb 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java
@@ -25,7 +25,7 @@
public void testRetrieveSystemVC ()
throws KustvaktException {
JsonNode node = retrieveVCInfo(testUser, "system", "system-vc");
- assertEquals(node.at("/name").asText(), "system-vc");
+ assertEquals("system-vc", node.at("/name").asText());
assertEquals(ResourceType.SYSTEM.displayName(),
node.at("/type").asText());
// assertEquals("koral:doc", node.at("/koralQuery/collection/@type").asText());
@@ -48,7 +48,7 @@
Response response = target().path(API_VERSION).path("vc")
.path("~system").path("system-vc").request().get();
JsonNode node = JsonUtils.readTree(response.readEntity(String.class));
- assertEquals(node.at("/name").asText(), "system-vc");
+ assertEquals("system-vc", node.at("/name").asText());
assertEquals(ResourceType.SYSTEM.displayName(),
node.at("/type").asText());
}
@@ -58,7 +58,7 @@
throws KustvaktException {
createDoryVC();
JsonNode node = retrieveVCInfo("dory", "dory", "dory-vc");
- assertEquals(node.at("/name").asText(), "dory-vc");
+ assertEquals("dory-vc", node.at("/name").asText());
assertEquals(ResourceType.PRIVATE.displayName(),
node.at("/type").asText());
@@ -89,14 +89,14 @@
createAccess("dory", "group-vc", doryGroupName, "dory");
JsonNode node = retrieveVCInfo("nemo", "dory", "group-vc");
- assertEquals(node.at("/name").asText(), "group-vc");
+ assertEquals("group-vc", node.at("/name").asText());
assertEquals(ResourceType.PROJECT.displayName(),
node.at("/type").asText());
addMember(doryGroupName, "pearl", "dory");
node = retrieveVCInfo("pearl", "dory", "group-vc");
- assertEquals(node.at("/name").asText(), "group-vc");
+ assertEquals("group-vc", node.at("/name").asText());
assertEquals(ResourceType.PROJECT.displayName(),
node.at("/type").asText());
@@ -142,7 +142,7 @@
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
- assertEquals(node.at("/name").asText(), "dory-vc");
+ assertEquals("dory-vc", node.at("/name").asText());
deleteVC("dory-vc", "dory", "dory");
}
@@ -158,7 +158,7 @@
String entity = response.readEntity(String.class);
assertEquals(Status.OK.getStatusCode(), response.getStatus());
JsonNode node = JsonUtils.readTree(entity);
- assertEquals(node.at("/name").asText(), "group-vc");
+ assertEquals("group-vc", node.at("/name").asText());
assertEquals(ResourceType.PROJECT.displayName(),
node.at("/type").asText());
deleteVC("group-vc", "dory", "dory");
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java
index 9946649..2526fda 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusReferenceTest.java
@@ -38,9 +38,9 @@
JsonNode node = testSearchWithRef_VC1();
assertEquals(StatusCodes.NO_RESOURCE_FOUND,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Virtual corpus system/named-vc1 is not found.");
- assertEquals(node.at("/errors/0/2").asText(), "system/named-vc1");
+ assertEquals("Virtual corpus system/named-vc1 is not found.",
+ node.at("/errors/0/1").asText());
+ assertEquals("system/named-vc1", node.at("/errors/0/2").asText());
}
@Test
@@ -166,7 +166,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertEquals(StatusCodes.NO_RESOURCE_FOUND,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(), "username/vc1");
+ assertEquals("username/vc1", node.at("/errors/0/2").asText());
}
@Test
@@ -179,7 +179,7 @@
JsonNode node = JsonUtils.readTree(ent);
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/2").asText(), "guest");
+ assertEquals("guest", node.at("/errors/0/2").asText());
deleteVC("dory-vc", "dory", "dory");
}
@@ -194,17 +194,17 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertTrue(node.at("/matches").size() > 0);
- assertEquals(node.at("/collection/operands/0/value").asText(),
- "CC.*");
- assertEquals(node.at("/collection/operands/1/@type").asText(),
- "koral:doc");
- assertEquals(node.at("/collection/operands/1/value").asText(), "GOE");
- assertEquals(node.at("/collection/operands/1/key").asText(),
- "corpusSigle");
+ assertEquals("CC.*",
+ node.at("/collection/operands/0/value").asText());
+ assertEquals("koral:doc",
+ node.at("/collection/operands/1/@type").asText());
+ assertEquals("GOE", node.at("/collection/operands/1/value").asText());
+ assertEquals("corpusSigle",
+ node.at("/collection/operands/1/key").asText());
node = node.at("/collection/operands/1");
- assertEquals(node.at("/rewrites/0/operation").asText(),
- "operation:override");
+ assertEquals("operation:override",
+ node.at("/rewrites/0/operation").asText());
assertEquals("koral:docGroupRef",
node.at("/rewrites/0/original/@type").asText());
assertEquals("marlin/published-vc",
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusSharingTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusSharingTest.java
index cb24364..02ec480 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusSharingTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusSharingTest.java
@@ -315,8 +315,8 @@
JsonNode node = listRolesByGroup("nemo", "dory-group");
assertEquals(StatusCodes.AUTHORIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Unauthorized operation for user: nemo");
+ assertEquals("Unauthorized operation for user: nemo",
+ node.at("/errors/0/1").asText());
deleteGroupByName(doryGroupName, "dory");
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
index 21716ac..e15f9aa 100644
--- a/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchControllerTest.java
@@ -55,10 +55,10 @@
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
- assertEquals(node.at("/query/wrap/foundry").asText(), "opennlp");
- assertEquals(node.at("/meta/context").asText(), "sentence");
- assertEquals(node.at("/meta/count").asText(), "13");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
+ assertEquals("opennlp", node.at("/query/wrap/foundry").asText());
+ assertEquals("sentence", node.at("/meta/context").asText());
+ assertEquals("13", node.at("/meta/count").asText());
}
// EM: The API is disabled
@@ -86,9 +86,9 @@
Response response = target().path(API_VERSION).path("").request().get();
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String message = response.readEntity(String.class);
- assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
- "Wes8Bd4h1OypPqbWF5njeQ==");
- assertEquals(message, config.getApiWelcomeMessage());
+ assertEquals("Wes8Bd4h1OypPqbWF5njeQ==",
+ response.getHeaders().getFirst("X-Index-Revision"));
+ assertEquals(config.getApiWelcomeMessage(), message);
}
@Test
@@ -101,9 +101,9 @@
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
- assertEquals(node.at("/meta/context").asText(), "base/s:s");
- assertEquals(node.at("/meta/count").asText(), "13");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
+ assertEquals("base/s:s", node.at("/meta/context").asText());
+ assertEquals("13", node.at("/meta/count").asText());
assertNotEquals(0, node.at("/matches").size());
}
@@ -134,8 +134,8 @@
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
- assertEquals(node.at("/query/wrap/foundry").asText(), "opennlp");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
+ assertEquals("opennlp", node.at("/query/wrap/foundry").asText());
}
// EM: The API is disabled
@@ -150,7 +150,7 @@
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
assertNotEquals(0, node.at("/matches").size());
}
@@ -165,10 +165,10 @@
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
assertNotEquals(0, node.at("/matches").size());
- assertEquals(node.at("/meta/fields").toString(),
- "[\"author\",\"docSigle\"]");
+ assertEquals("[\"author\",\"docSigle\"]",
+ node.at("/meta/fields").toString());
}
@Test
@@ -181,10 +181,10 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/textSigle").asText(), "GOE/AGA/01784");
- assertEquals(node.at("/matchID").asText(),
- "match-GOE/AGA/01784-p36-46(5)37-45(2)38-42");
- assertEquals(node.at("/title").asText(), "Belagerung von Mainz");
+ assertEquals("GOE/AGA/01784", node.at("/textSigle").asText());
+ assertEquals("match-GOE/AGA/01784-p36-46(5)37-45(2)38-42",
+ node.at("/matchID").asText());
+ assertEquals("Belagerung von Mainz", node.at("/title").asText());
}
@Test
@@ -197,12 +197,12 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/snippet").asText(),
- "<span class=\"context-left\"></span><span class=\"match\">der alte freie Weg nach Mainz war gesperrt, ich mußte über die Schiffbrücke bei Rüsselsheim; in Ginsheim ward <mark>gefüttert; der Ort ist sehr zerschossen; dann über die Schiffbrücke</mark> auf die Nonnenaue, wo viele Bäume niedergehauen lagen, sofort auf dem zweiten Teil der Schiffbrücke über den größern Arm des Rheins.</span><span class=\"context-right\"></span>");
- assertEquals(node.at("/textSigle").asText(), "GOE/AGA/01784");
- assertEquals(node.at("/matchID").asText(),
- "match-GOE/AGA/01784-p36-46(5)37-45(2)38-42");
- assertEquals(node.at("/title").asText(), "Belagerung von Mainz");
+ assertEquals("<span class=\"context-left\"></span><span class=\"match\">der alte freie Weg nach Mainz war gesperrt, ich mußte über die Schiffbrücke bei Rüsselsheim; in Ginsheim ward <mark>gefüttert; der Ort ist sehr zerschossen; dann über die Schiffbrücke</mark> auf die Nonnenaue, wo viele Bäume niedergehauen lagen, sofort auf dem zweiten Teil der Schiffbrücke über den größern Arm des Rheins.</span><span class=\"context-right\"></span>",
+ node.at("/snippet").asText());
+ assertEquals("GOE/AGA/01784", node.at("/textSigle").asText());
+ assertEquals("match-GOE/AGA/01784-p36-46(5)37-45(2)38-42",
+ node.at("/matchID").asText());
+ assertEquals("Belagerung von Mainz", node.at("/title").asText());
}
@Test
@@ -215,12 +215,12 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/textSigle").asText(), "GOE/AGA/01784");
- assertEquals(node.at("/matchID").asText(),
- "match-GOE/AGA/01784-p36-46(5)37-45(2)38-42");
- assertEquals(node.at("/snippet").asText(),
- "<span class=\"context-left\"><span class=\"more\"></span></span><span class=\"match\"><mark>gefüttert; der Ort ist sehr zerschossen; dann über die Schiffbrücke</mark></span><span class=\"context-right\"><span class=\"more\"></span></span>");
- assertEquals(node.at("/title").asText(), "Belagerung von Mainz");
+ assertEquals("GOE/AGA/01784", node.at("/textSigle").asText());
+ assertEquals("match-GOE/AGA/01784-p36-46(5)37-45(2)38-42",
+ node.at("/matchID").asText());
+ assertEquals("<span class=\"context-left\"><span class=\"more\"></span></span><span class=\"match\"><mark>gefüttert; der Ort ist sehr zerschossen; dann über die Schiffbrücke</mark></span><span class=\"context-right\"><span class=\"more\"></span></span>",
+ node.at("/snippet").asText());
+ assertEquals("Belagerung von Mainz", node.at("/title").asText());
}
@Test
@@ -233,7 +233,7 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/textSigle").asText(), "GOE/AGA/01784");
+ assertEquals("GOE/AGA/01784", node.at("/textSigle").asText());
assertEquals(
"<span class=\"context-left\"></span><span class=\"match\">"
+ "der alte freie Weg nach Mainz war gesperrt, ich mußte über die "
@@ -244,9 +244,9 @@
+ "zweiten Teil der Schiffbrücke über den größern Arm des Rheins.</span>"
+ "<span class=\"context-right\"></span>",
node.at("/snippet").asText());
- assertEquals(node.at("/matchID").asText(),
- "match-GOE/AGA/01784-p36-46(5)37-45(2)38-42");
- assertEquals(node.at("/title").asText(), "Belagerung von Mainz");
+ assertEquals("match-GOE/AGA/01784-p36-46(5)37-45(2)38-42",
+ node.at("/matchID").asText());
+ assertEquals("Belagerung von Mainz", node.at("/title").asText());
}
@Test
@@ -258,8 +258,8 @@
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
assertNotNull(node);
- assertEquals(node.at("/textSigle").asText(), "GOE/AGA/01784");
- assertEquals(node.at("/title").asText(), "Belagerung von Mainz");
+ assertEquals("GOE/AGA/01784", node.at("/textSigle").asText());
+ assertEquals("Belagerung von Mainz", node.at("/title").asText());
}
// EM: The API is disabled
@@ -276,10 +276,10 @@
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
- assertEquals(node.at("/collection/operands/0/value").asText(),
- "Politik");
- assertEquals(node.at("/collection/operands/1/value").asText(), "WPD");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
+ assertEquals("Politik",
+ node.at("/collection/operands/0/value").asText());
+ assertEquals("WPD", node.at("/collection/operands/1/value").asText());
response = target().path(API_VERSION).path("search")
.queryParam("q", "[orth=das]").queryParam("ql", "poliqarp")
.queryParam("fields", "author, docSigle")
@@ -294,10 +294,10 @@
query = response.readEntity(String.class);
node = JsonUtils.readTree(query);
assertNotNull(node);
- assertEquals(node.at("/query/wrap/layer").asText(), "orth");
- assertEquals(node.at("/collection/operands/0/value").asText(),
- "Politik");
- assertEquals(node.at("/collection/operands/1/value").asText(), "WPD");
+ assertEquals("orth", node.at("/query/wrap/layer").asText());
+ assertEquals("Politik",
+ node.at("/collection/operands/0/value").asText());
+ assertEquals("WPD", node.at("/collection/operands/1/value").asText());
}
@Test
@@ -328,7 +328,7 @@
assertFalse(node.at("/hasSnippet").asBoolean());
assertTrue(node.at("/hasTokens").asBoolean());
assertTrue(node.at("/snippet").isMissingNode());
- assertEquals(node.at("/tokens/match/0").asText(), "die");
+ assertEquals("die", node.at("/tokens/match/0").asText());
assertTrue(node.at("/tokens/match/1").isMissingNode());
}
@@ -345,32 +345,32 @@
while (fieldIter.hasNext()) {
JsonNode field = (JsonNode) fieldIter.next();
String key = field.at("/key").asText();
- assertEquals(field.at("/@type").asText(), "koral:field");
+ assertEquals("koral:field", field.at("/@type").asText());
switch (key) {
case "textSigle":
- assertEquals(field.at("/type").asText(), "type:string");
- assertEquals(field.at("/value").asText(), "GOE/AGA/01784");
+ assertEquals("type:string", field.at("/type").asText());
+ assertEquals("GOE/AGA/01784", field.at("/value").asText());
checkC++;
break;
case "author":
- assertEquals(field.at("/type").asText(), "type:text");
- assertEquals(field.at("/value").asText(),
- "Goethe, Johann Wolfgang von");
+ assertEquals("type:text", field.at("/type").asText());
+ assertEquals("Goethe, Johann Wolfgang von",
+ field.at("/value").asText());
checkC++;
break;
case "docSigle":
- assertEquals(field.at("/type").asText(), "type:string");
- assertEquals(field.at("/value").asText(), "GOE/AGA");
+ assertEquals("type:string", field.at("/type").asText());
+ assertEquals("GOE/AGA", field.at("/value").asText());
checkC++;
break;
case "docTitle":
- assertEquals(field.at("/type").asText(), "type:text");
- assertEquals(field.at("/value").asText(),
- "Goethe: Autobiographische Schriften II, (1817-1825, 1832)");
+ assertEquals("type:text", field.at("/type").asText());
+ assertEquals("Goethe: Autobiographische Schriften II, (1817-1825, 1832)",
+ field.at("/value").asText());
checkC++;
break;
case "pubDate":
- assertEquals(field.at("/type").asText(), "type:date");
+ assertEquals("type:date", field.at("/type").asText());
assertEquals(1982, field.at("/value").asInt());
checkC++;
break;
@@ -386,7 +386,7 @@
.request().accept(MediaType.APPLICATION_JSON).get();
assertEquals(HttpStatus.PERMANENT_REDIRECT_308, response.getStatus());
URI location = response.getLocation();
- assertEquals(location.getPath(), "/api/v1.0/search");
+ assertEquals("/api/v1.0/search", location.getPath());
}
@Test
@@ -396,7 +396,7 @@
.request().accept(MediaType.APPLICATION_JSON).get();
assertEquals(HttpStatus.PERMANENT_REDIRECT_308, response.getStatus());
URI location = response.getLocation();
- assertEquals(location.getPath(), "/api/v1.0/search");
+ assertEquals("/api/v1.0/search", location.getPath());
}
@Test
@@ -447,10 +447,10 @@
String entity = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(entity);
assertTrue(node.at("/matches/0/snippet").isMissingNode());
- assertEquals(node.at("/matches/0/author").asText(),
- "Goethe, Johann Wolfgang von");
- assertEquals(node.at("/matches/0/title").asText(),
- "Italienische Reise");
+ assertEquals("Goethe, Johann Wolfgang von",
+ node.at("/matches/0/author").asText());
+ assertEquals("Italienische Reise",
+ node.at("/matches/0/title").asText());
// assertEquals(3, node.at("/matches/0").size());
}
@@ -466,9 +466,9 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.NON_PUBLIC_FIELD_IGNORED,
node.at("/warnings/0/0").asInt());
- assertEquals(node.at("/warnings/0/1").asText(),
- "The requested non public fields are ignored");
- assertEquals(node.at("/warnings/0/2").asText(), "snippet");
+ assertEquals("The requested non public fields are ignored",
+ node.at("/warnings/0/1").asText());
+ assertEquals("snippet", node.at("/warnings/0/2").asText());
}
@Test
@@ -481,7 +481,7 @@
JsonNode node = JsonUtils.readTree(entity);
assertEquals(StatusCodes.INVALID_ARGUMENT,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(), "page must start from 1");
+ assertEquals("page must start from 1", node.at("/errors/0/1").asText());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
index da7b7e9..e3cf7ce 100644
--- a/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/lite/LiteSearchPipeTest.java
@@ -92,7 +92,7 @@
assertEquals(200, connection.getResponseCode());
BufferedReader br = new BufferedReader(
new InputStreamReader(connection.getInputStream(), "utf-8"));
- assertEquals(br.readLine(), "{test}");
+ assertEquals("{test}", br.readLine());
}
@Test
diff --git a/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
index 06c86c1..2de23f7 100644
--- a/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/lite/LiteStatisticControllerTest.java
@@ -26,8 +26,8 @@
.queryParam("cq", "textType=Abhandlung & corpusSigle=GOE")
.request().method("GET");
assertEquals(Status.OK.getStatusCode(), response.getStatus());
- assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
- "Wes8Bd4h1OypPqbWF5njeQ==");
+ assertEquals("Wes8Bd4h1OypPqbWF5njeQ==",
+ response.getHeaders().getFirst("X-Index-Revision"));
String query = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(query);
assertEquals(2, node.at("/documents").asInt());
@@ -71,8 +71,8 @@
+ "\"CC.*\"} }"));
assertEquals(Status.OK.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
- assertEquals(response.getHeaders().getFirst("X-Index-Revision"),
- "Wes8Bd4h1OypPqbWF5njeQ==");
+ assertEquals("Wes8Bd4h1OypPqbWF5njeQ==",
+ response.getHeaders().getFirst("X-Index-Revision"));
JsonNode node = JsonUtils.readTree(ent);
assertEquals(2, node.at("/documents").asInt());
assertEquals(72770, node.at("/tokens").asInt());
@@ -90,10 +90,9 @@
assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
String ent = response.readEntity(String.class);
JsonNode node = JsonUtils.readTree(ent);
- assertEquals(node.at("/errors/0/0").asInt(),
- de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION);
- assertEquals(node.at("/errors/0/1").asText(),
- "VC is not found");
+ assertEquals(de.ids_mannheim.korap.util.StatusCodes.MISSING_COLLECTION,
+ node.at("/errors/0/0").asInt());
+ assertTrue(node.at("/errors/0/1").asText().contains(" is not found"));
}
@Test
@@ -108,8 +107,8 @@
JsonNode node = JsonUtils.readTree(ent);
assertEquals(StatusCodes.DESERIALIZATION_FAILED,
node.at("/errors/0/0").asInt());
- assertEquals(node.at("/errors/0/1").asText(),
- "Failed deserializing json object: { \"collection\" : }");
+ assertEquals("Failed deserializing json object: { \"collection\" : }",
+ node.at("/errors/0/1").asText());
}
@Test
diff --git a/src/test/resources/kustvakt-test.conf b/src/test/resources/kustvakt-test.conf
index 029fcfb..efd9e29 100644
--- a/src/test/resources/kustvakt-test.conf
+++ b/src/test/resources/kustvakt-test.conf
@@ -49,6 +49,8 @@
# Virtual corpus and queries
max.user.persistent.queries = 5
max.token.context.size = 40
+# default false
+vc.list.statistics.enabled = true
# Availability regex only support |
# It should be removed/commented when the data doesn't contain availability field.
diff --git a/src/test/resources/test-config-dnb.xml b/src/test/resources/test-config-dnb.xml
index 63d4baf..138d52e 100644
--- a/src/test/resources/test-config-dnb.xml
+++ b/src/test/resources/test-config-dnb.xml
@@ -85,7 +85,6 @@
class="org.flywaydb.core.api.configuration.ClassicConfiguration">
<!-- drop existing tables and create new tables -->
<property name="validateOnMigrate" value="true" />
- <property name="cleanOnValidationError" value="true" />
<property name="baselineOnMigrate" value="false" />
<property name="locations"
value="#{'${jdbc.schemaPath}'.split(',')}" />
diff --git a/src/test/resources/test-config-icc.xml b/src/test/resources/test-config-icc.xml
index 545c7a4..f226068 100644
--- a/src/test/resources/test-config-icc.xml
+++ b/src/test/resources/test-config-icc.xml
@@ -85,9 +85,7 @@
class="org.flywaydb.core.api.configuration.ClassicConfiguration">
<!-- drop existing tables and create new tables -->
<property name="validateOnMigrate" value="true" />
- <property name="cleanOnValidationError" value="true" />
<property name="baselineOnMigrate" value="false" />
- <property name="cleanDisabled" value="false" />
<property name="locations"
value="#{'${jdbc.schemaPath}'.split(',')}" />
<property name="dataSource" ref="dataSource" />
diff --git a/src/test/resources/test-config.xml b/src/test/resources/test-config.xml
index 5fd5ff2..05311db 100644
--- a/src/test/resources/test-config.xml
+++ b/src/test/resources/test-config.xml
@@ -110,7 +110,6 @@
class="org.flywaydb.core.api.configuration.ClassicConfiguration">
<!-- drop existing tables and create new tables -->
<property name="validateOnMigrate" value="true" />
- <property name="cleanOnValidationError" value="true" />
<property name="baselineOnMigrate" value="false" />
<property name="locations"
value="#{'${jdbc.schemaPath}'.split(',')}" />
@@ -148,11 +147,8 @@
<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
<prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
<prop key="hibernate.cache.use_second_level_cache">${hibernate.cache.use_second_level_cache}
- </prop>
- <prop key="hibernate.cache.provider_class">${hibernate.cache.provider}</prop>
- <prop key="hibernate.cache.region.factory_class">${hibernate.cache.region.factory}</prop>
- <prop key="hibernate.jdbc.time_zone">${hibernate.jdbc.time_zone}</prop>
- <!-- <prop key="net.sf.ehcache.configurationResourceName">classpath:ehcache.xml</prop> -->
+ </prop>
+ <prop key="hibernate.jdbc.time_zone">${hibernate.jdbc.time_zone}</prop>
</props>
</property>
</bean>
diff --git a/src/test/resources/test-hibernate.properties b/src/test/resources/test-hibernate.properties
index e394a88..63697a7 100644
--- a/src/test/resources/test-hibernate.properties
+++ b/src/test/resources/test-hibernate.properties
@@ -3,6 +3,6 @@
hibernate.show_sql=false
hibernate.cache.use_query_cache=false
hibernate.cache.use_second_level_cache=false
-hibernate.cache.provider=org.hibernate.cache.EhCacheProvider
-hibernate.cache.region.factory=org.hibernate.cache.ehcache.EhCacheRegionFactory
-hibernate.jdbc.time_zone=UTC
\ No newline at end of file
+hibernate.jdbc.time_zone=UTC
+hibernate.cache.provider=
+hibernate.cache.region.factory=