Checkouted not correctly merged files

Author: milanmajchrak

dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java

@@ -35,7 +35,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.orm.hibernate5.SessionFactoryUtils;
-import org.springframework.scheduling.annotation.Scheduled;
 
 /**
  * Hibernate implementation of the DBConnection.
@@ -108,13 +107,6 @@ protected Transaction getTransaction() {
         return sessionFactory.getCurrentSession().getTransaction();
     }
 
-    // This method will run every 10 seconds
-    @Scheduled(fixedRate = 10000) // Fixed rate in milliseconds
-    public void logConnectionMetrics() {
-        logHibernateStatistics();
-        logDatabaseMetaData();
-    }
-
     /**
      * Check if Hibernate Session is still "alive" / open. An open Session may or may not have an open Transaction
      * (so isTransactionAlive() may return false even if isSessionAlive() returns true). A Session may be reused for

dspace-server-webapp/src/test/java/org/dspace/app/rest/ClarinDiscoveryRestControllerIT.java

@@ -358,8 +358,8 @@ public void discoverFacetsAuthorTestWithPrefix() throws Exception {
                 // up in different items
                 //These authors are order according to count. Only two show up because of the prefix.
                 .andExpect(jsonPath("$._embedded.values", containsInAnyOrder(
-                        FacetValueMatcher.entryAuthor("Smith, Maria".toLowerCase()),
-                        FacetValueMatcher.entryAuthor("Smith, Donald".toLowerCase())
+                        FacetValueMatcher.entryAuthor("Smith, Maria"),
+                        FacetValueMatcher.entryAuthor("Smith, Donald")
                 )))
         ;
     }

dspace/solr/search/conf/schema.xml

@@ -197,17 +197,11 @@
             <!--Treats the entire field as a single token, regardless of its content-->
             <tokenizer class="solr.KeywordTokenizerFactory"/>
 
-            <filter class="solr.LowerCaseFilterFactory" />
+            <!--<filter class="solr.LowerCaseFilterFactory" />-->
             <filter class="solr.TrimFilterFactory" />
         </analyzer>
     </fieldType>
 
-    <fieldType name="noLowKeywordFilter" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-        <analyzer>
-            <tokenizer class="solr.KeywordTokenizerFactory"/>
-        </analyzer>
-    </fieldType>
-
     <!--
      SpellCheck analysis config based off of http://wiki.apache.org/solr/
      SpellCheckingAnalysis
@@ -313,7 +307,7 @@
 	<dynamicField name="*_acid" type="keywordFilter" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
 
     <!--Dynamic field used for sidebar filters & SOLR browse by value -->
-    <dynamicField name="*_filter" type="noLowKeywordFilter" indexed="true" stored="true" multiValued="true" omitNorms="true" />
+    <dynamicField name="*_filter" type="keywordFilter" indexed="true" stored="true" multiValued="true" omitNorms="true" />
     <!--Dynamic field used to index the facet/filter value, split on each word to end,
         so that the facet search can search all words in a facet-->
     <dynamicField name="*_prefix" type="keywordFilter" indexed="true" stored="true" multiValued="true" omitNorms="true" />