Merge remote-tracking branch 'origin/development' into 211_Peer_reviewing_functionality

src/main/java/at/ac/uibk/gitsearch/config/ElasticsearchConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
 @Configuration
 public class ElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
 
-    @Value("${spring.elasticsearch.uris}")
+    @Value("${spring.elasticsearch.rest.uris}")
     private String elasticSearchUrls;
 
     @Bean

src/main/java/at/ac/uibk/gitsearch/service/EditorialPagesService.java

@@ -36,7 +36,7 @@ public class EditorialPagesService {
     public EditorialPageDTO getContent(String path) throws GitLabApiException {
         String encodedPath;
         encodedPath = URLEncoder.encode(path, StandardCharsets.UTF_8);
-        final WikiPage page = gitLabRepository.getGitLabApi().getWikisApi().getPage(editorialProject, encodedPath);
+        final WikiPage page = gitLabRepository.getAdminGitLabApi().getWikisApi().getPage(editorialProject, encodedPath);
         return new EditorialPageDTO(path, page.getContent());
     }
 

src/main/resources/config/application-dev.yml

@@ -60,7 +60,8 @@ spring:
   jpa:
     database-platform: tech.jhipster.domain.util.FixedH2Dialect
   elasticsearch:
-    uris: http://localhost:9200
+    rest:
+      uris: http://localhost:9200
   liquibase:
     # Remove 'faker' if you do not want the sample data to be loaded automatically
     contexts: dev, faker

src/main/resources/config/application-prod.yml

@@ -46,7 +46,9 @@ spring:
         useServerPrepStmts: true
   # jpa:
   elasticsearch:
-    uris: http://localhost:9200
+    rest:
+      # set by spring config
+      # uris: http://sharing_elasticsearch:9200
   # Replace by 'prod, faker' to add the faker context and have sample data loaded in production
   liquibase:
     contexts: prod

src/main/resources/config/application-staging.yml

@@ -57,7 +57,9 @@ spring:
         prepStmtCacheSqlLimit: 2048
         useServerPrepStmts: true
   elasticsearch:
-    uris: http://localhost:9200
+    rest:
+      # set by spring config
+      # uris: http://sharing_elasticsearch:9200
   liquibase:
     # Remove 'faker' if you do not want the sample data to be loaded automatically
     contexts: dev

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -47,6 +47,7 @@
             >
           </li>
           <!-- Just for backup, we add a hidden local login link in the menu -->
+          <!--
           <li>
             <a id="localLogin" class="dropdown-item" href="/login">Local Login</a>
           </li>

src/test/java/at/ac/uibk/gitsearch/repository/search/testESService/ElasticSearchTestConfiguration.java

@@ -107,7 +107,7 @@ public class ElasticSearchTestConfiguration {
     @Autowired
     MetaDataRepository metaDataRepository;
 
-    @Value("${spring.elasticsearch.uris}")
+    @Value("${spring.elasticsearch.rest.uris}")
     private String elasticSearchTestURI;
 
     public void stopTestContainer() {

src/test/resources/config/application.yml

@@ -63,7 +63,8 @@ spring:
   liquibase:
     contexts: test
   elasticsearch:
-    uris: http://localhost:29200
+    rest:
+      uris: http://localhost:29200
   mail:
     host: localhost
   main: