Merge branch '3.0.x' of github.com:geonetwork/core-geonetwork into ge…

…ocat_develop Conflicts: core/pom.xml csw-server/pom.xml domain/pom.xml events/pom.xml geoserver harvesters/pom.xml healthmonitor/pom.xml inspire-atom/pom.xml schemas-test/pom.xml schemas/csw-record/pom.xml schemas/dublin-core/pom.xml schemas/iso19110/pom.xml schemas/iso19139/pom.xml schemas/pom.xml schemas/schema-core/pom.xml services/pom.xml services/src/main/java/org/fao/geonet/services/thesaurus/GetKeywords.java web-ui-docs/pom.xml web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js web-ui/src/main/resources/catalog/js/GnFormatterLib.js web-ui/src/main/resources/catalog/js/GnFormatterViewerModule.js web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v300/migrate-default.sql
camptocamp · May 3, 2015 · 0f871b1 · 0f871b1
2 parents fbf4b43 + e7edddd
commit 0f871b1
Show file tree

Hide file tree

Showing 129 changed files with 7,315 additions and 5,198 deletions.
diff --git a/common/src/main/java/org/fao/geonet/utils/AbstractHttpRequest.java b/common/src/main/java/org/fao/geonet/utils/AbstractHttpRequest.java
@@ -285,7 +285,7 @@ protected HttpRequestBase setupHttpMethod() throws IOException {
             }
         }
 
-        if (host == null || port < 0 || protocol == null) {
+        if (host == null || protocol == null) {
             throw new IllegalStateException(String.format(getClass().getSimpleName()+" is not ready to be executed: \n\tprotocol: '%s' " +
                                             "\n\tuserinfo: '%s'\n\thost: '%s' \n\tport: '%s' \n\taddress: '%s'\n\tquery '%s'" +
                                             "\n\tfragment: '%s'", protocol, userInfo, host, port, address, query, fragment));

diff --git a/common/src/main/java/org/fao/geonet/utils/GeonetHttpRequestFactory.java b/common/src/main/java/org/fao/geonet/utils/GeonetHttpRequestFactory.java
@@ -98,7 +98,7 @@ public final XmlRequest createXmlRequest(String host, int port) {
      * @return the XmlRequest.
      */
     public final XmlRequest createXmlRequest(URL url) {
-        final int port = url.getPort() == -1 ? url.getDefaultPort() : url.getPort();
+        final int port = url.getPort();
         final XmlRequest request = createXmlRequest(url.getHost(), port,
                 url.getProtocol());
 
@@ -153,6 +153,7 @@ public ClientHttpResponse execute(HttpUriRequest request,
         final HttpClientBuilder clientBuilder = getDefaultHttpClientBuilder();
         configurator.apply(clientBuilder);
         CloseableHttpClient httpClient = clientBuilder.build();
+
         if (r.isPreemptiveBasicAuth() || r.getHttpClientContext() != null) {
             return new AdaptingResponse(httpClient, httpClient.execute(request, r.getHttpClientContext()));
         } else {

diff --git a/core/src/main/java/org/fao/geonet/kernel/mef/Importer.java b/core/src/main/java/org/fao/geonet/kernel/mef/Importer.java
@@ -525,9 +525,11 @@ public static void importRecord(String uuid,
 			if (dm.existsMetadataUuid(uuid) && !uuidAction.equals(Params.NOTHING)) {
                 // user has privileges to replace the existing metadata
                 if(dm.getAccessManager().canEdit(context, dm.getMetadataId(uuid))) {
-                    dm.deleteMetadata(context, dm.getMetadataId(uuid));
-                    if(Log.isDebugEnabled(Geonet.MEF))
+                    if(Log.isDebugEnabled(Geonet.MEF)) {
                         Log.debug(Geonet.MEF, "Deleting existing metadata with UUID : " + uuid);
+                    }
+                    dm.deleteMetadata(context, dm.getMetadataId(uuid));
+                    dm.flush();
                 }
                 // user does not hav privileges to replace the existing metadata
                 else {

diff --git a/core/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java b/core/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java
@@ -376,24 +376,13 @@ static void buildPrivilegesMetadataInfo(ServiceContext context, Document doc, El
         } else {
             final Collection<Integer> groups = accessManager.getUserGroups(context.getUserSession(), context.getIpAddress(), false);
             operations = Sets.newHashSet();
-            if (context.getUserSession() != null && context.getUserSession().getUserId() != null) {
-                for (ReservedOperation operation : ReservedOperation.values()) {
-                    IndexableField[] opFields = doc.getFields(Geonet.IndexFieldNames.OP_PREFIX + operation.getId());
-
-                    for (IndexableField field : opFields) {
-                        Integer groupId = Integer.valueOf(field.stringValue());
-                        if (groups.contains(groupId)) {
-                            operations.add(operation);
-                            break;
-                        }
-                    }
-                }
-            } else {
-                final IndexableField[] groupsPublished = doc.getFields(Geonet.IndexFieldNames.OP_PREFIX + ReservedOperation.view.getId());
-                for (IndexableField field : groupsPublished) {
+            for (ReservedOperation operation : ReservedOperation.values()) {
+                IndexableField[] opFields = doc.getFields(Geonet.IndexFieldNames.OP_PREFIX + operation.getId());
+
+                for (IndexableField field : opFields) {
                     Integer groupId = Integer.valueOf(field.stringValue());
                     if (groups.contains(groupId)) {
-                        operations.add(ReservedOperation.view);
+                        operations.add(operation);
                         break;
                     }
                 }

diff --git a/core/src/main/java/org/fao/geonet/kernel/search/keyword/KeywordSearchParamsBuilder.java b/core/src/main/java/org/fao/geonet/kernel/search/keyword/KeywordSearchParamsBuilder.java
@@ -58,7 +58,7 @@ public static KeywordSearchParamsBuilder createFromElement(IsoLanguagesMapper ma
             KeywordSearchType searchType = KeywordSearchType.parseString(Util.getParam(params, XmlParams.pTypeSearch, KeywordSearchType.MATCH.name()));
             parsedParams.keyword(keyword, searchType, true);
         }
-        
+
         String uri = Util.getParam(params, XmlParams.pUri, null);
         if(uri != null) {
             parsedParams.uri(uri);