Upgrade to Spring-Boot 1.5.15 43/2843/2
authorLott, Christopher (cl778h) <cl778h@att.com>
Fri, 14 Sep 2018 14:56:02 +0000 (10:56 -0400)
committerLott, Christopher (cl778h) <cl778h@att.com>
Fri, 14 Sep 2018 15:31:37 +0000 (11:31 -0400)
Upgrade Swagger version.
Drop unused properties from POM.
Organize imports.

Change-Id: Ic9004ade5cb9dc4009e3087e70c7bab1d84933b9
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
28 files changed:
docs/release-notes.rst
gateway/pom.xml
gateway/src/main/java/org/acumos/federation/gateway/adapter/PeerGateway.java
gateway/src/main/java/org/acumos/federation/gateway/cds/Mapper.java
gateway/src/main/java/org/acumos/federation/gateway/cds/SolutionBuilder.java
gateway/src/main/java/org/acumos/federation/gateway/cds/SolutionRevision.java
gateway/src/main/java/org/acumos/federation/gateway/common/Clients.java
gateway/src/main/java/org/acumos/federation/gateway/common/FederationClient.java
gateway/src/main/java/org/acumos/federation/gateway/config/AdapterConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/config/CDMSClientConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/config/DockerConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/config/GatewayConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/config/NexusConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/config/SwaggerConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/controller/CatalogController.java
gateway/src/main/java/org/acumos/federation/gateway/security/AuthenticationConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/security/Tools.java
gateway/src/main/java/org/acumos/federation/gateway/service/CatalogService.java
gateway/src/main/java/org/acumos/federation/gateway/service/CatalogServiceConfiguration.java
gateway/src/main/java/org/acumos/federation/gateway/service/ContentService.java
gateway/src/main/java/org/acumos/federation/gateway/service/impl/CatalogServiceImpl.java
gateway/src/main/java/org/acumos/federation/gateway/service/impl/CatalogServiceLocalImpl.java
gateway/src/main/java/org/acumos/federation/gateway/service/impl/ContentServiceImpl.java
gateway/src/main/java/org/acumos/federation/gateway/service/impl/ContentServiceLocalImpl.java
gateway/src/main/java/org/acumos/federation/gateway/service/impl/PeerServiceImpl.java
gateway/src/main/java/org/acumos/federation/gateway/service/impl/ServiceImpl.java
gateway/src/main/java/org/acumos/federation/gateway/task/PeerSubscriptionTaskScheduler.java
gateway/src/main/java/org/acumos/federation/gateway/task/TaskConfiguration.java

index 92e1088..d93db6a 100644 (file)
@@ -23,14 +23,14 @@ Federated Gateway Release Notes
 The Federated Gateway server is available as a Docker image in a Docker registry.
 
 Version 1.18.2, 2018-09-13
--------------------------
+--------------------------
 
 * Rely on solution detail API for mapping (ACUMS-1690)
 * Allow configuration of underlying executor and scheduler
 * Do not overwrite user during mapping for local solutions
 
 Version 1.18.1, 2018-09-05
--------------------------
+--------------------------
 
 * Simplified catalog solutions lookup
 * Fix 'self' peer not found (ACUMS-1694)
@@ -39,18 +39,18 @@ Version 1.18.1, 2018-09-05
 * Move solution and revision updates to service interface
 
 Version 1.18.0, 2018-09-05
--------------------------
+--------------------------
 
 * Align with data model changes from CDS 1.18.x
 * Fix subscription update processing (ACUMS-1693)
 
 Version 1.17.1, 2018-09-04
--------------------------
+--------------------------
 
 * Spread the use of configuration beans (ACUMS-1692)
 
 Version 1.17.0, 2018-08-14
--------------------------
+--------------------------
 
 * Align with data model changes from CDS 1.17.x
 * Add revision document federation (ACUMS-1606)
@@ -61,18 +61,18 @@ Version 1.17.0, 2018-08-14
   and /solutions/{solutionId}/revisions/{revisionId}/documents/{documentId}/content
 
 Version 1.16.1, 2018-08-08
--------------------------
+--------------------------
 
 * Temporary patch for tag handling during federation procedures
 
 Version 1.16.0, 2018-08-01
--------------------------
+--------------------------
 
 * Aligns with the data model changes from CDS 1.16.x
 * Minor fixes in order to adhere to project coding standards.
 
 Version 1.15.1, 2018-07-31
--------------------------
+--------------------------
 
 * Fixes catalog solution lookup strategy due to used criteria moving to other entities (solution -> revision)
 * Fixes some Sonar complaints
index b75df19..cb8484e 100644 (file)
@@ -31,7 +31,7 @@ limitations under the License.
        <parent>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-parent</artifactId>
-               <version>1.5.14.RELEASE</version>
+               <version>1.5.15.RELEASE</version>
                <!-- silence warning about parent relative path -->
                <relativePath />
        </parent>
@@ -45,13 +45,8 @@ limitations under the License.
                <build.number>0</build.number>
                <skipTests>false</skipTests>
                <!-- dependencies versions -->
-               <slf4j.version>1.7.25</slf4j.version>
                <logback.version>1.2.3</logback.version>
-               <spring.boot.devtools.version>1.5.8.RELEASE</spring.boot.devtools.version>
-               <spring.boot.starter.web.version>1.5.8.RELEASE</spring.boot.starter.web.version>
-               <spring.boot.starter.security.version>1.5.8.RELEASE</spring.boot.starter.security.version>
-               <spring.boot.starter.test.version>1.5.8.RELEASE</spring.boot.starter.test.version>
-               <spring.boot.configuration.processor.version>1.5.8.RELEASE</spring.boot.configuration.processor.version>
+                <springfox.version>2.7.0</springfox.version>
                <!-- Not supplied to all jobs; e.g., Javadoc -->
                <docker.pull.registry>nexus3.acumos.org:10001</docker.pull.registry>
                <!-- Supplied by Jenkins -->
@@ -74,7 +69,7 @@ limitations under the License.
                <dependency>
                        <groupId>org.acumos.common-dataservice</groupId>
                        <artifactId>cmn-data-svc-client</artifactId>
-                       <version>1.18.0</version>
+                       <version>1.18.1</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
@@ -130,12 +125,12 @@ limitations under the License.
                <dependency>
                        <groupId>io.springfox</groupId>
                        <artifactId>springfox-swagger2</artifactId>
-                       <version>2.6.1</version>
+                       <version>${springfox.version}</version>
                </dependency>
                <dependency>
                        <groupId>io.springfox</groupId>
                        <artifactId>springfox-swagger-ui</artifactId>
-                       <version>2.6.1</version>
+                       <version>${springfox.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.att.eelf</groupId>
index 7f80c44..a17a013 100644 (file)
@@ -28,21 +28,18 @@ import java.util.Map;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
+import org.acumos.cds.AccessTypeCode;
 //to go away 
 import org.acumos.cds.client.ICommonDataServiceRestClient;
-import org.acumos.federation.gateway.service.impl.AbstractServiceImpl;
-
-import org.acumos.cds.AccessTypeCode;
-import org.acumos.cds.domain.MLPTag;
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPPeer;
 import org.acumos.cds.domain.MLPPeerSubscription;
+import org.acumos.cds.domain.MLPRevisionDescription;
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPSolutionRevision;
-import org.acumos.cds.domain.MLPRevisionDescription;
-import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Artifact;
+import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Solution;
 import org.acumos.federation.gateway.cds.SolutionRevision;
 import org.acumos.federation.gateway.cds.SubscriptionScope;
@@ -51,11 +48,11 @@ import org.acumos.federation.gateway.common.FederationClient;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.config.GatewayCondition;
 import org.acumos.federation.gateway.event.PeerSubscriptionEvent;
-import org.acumos.federation.gateway.service.ServiceContext;
-import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.CatalogService;
+import org.acumos.federation.gateway.service.ContentService;
+import org.acumos.federation.gateway.service.ServiceContext;
 import org.acumos.federation.gateway.service.ServiceException;
-import org.acumos.federation.gateway.util.Errors;
+import org.acumos.federation.gateway.service.impl.AbstractServiceImpl;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Conditional;
@@ -64,7 +61,6 @@ import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpStatusCodeException;
 
index cfa23d3..deb3537 100644 (file)
@@ -21,8 +21,8 @@ package org.acumos.federation.gateway.cds;
 
 import java.io.IOException;
 
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPSolutionRevision;
 
index 3f9c931..79076a4 100644 (file)
  */
 package org.acumos.federation.gateway.cds;
 
-import java.util.Set;
 import java.util.Date;
+import java.util.Set;
 
-import org.acumos.cds.domain.MLPTag;
 import org.acumos.cds.domain.MLPSolutionWeb;
+import org.acumos.cds.domain.MLPTag;
 
 /**
  * Supplements the CDS representation of a solution with related information: revisions.
index 07f6787..d75db66 100644 (file)
@@ -19,8 +19,8 @@
  */
 package org.acumos.federation.gateway.cds;
 
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 import org.acumos.cds.domain.MLPArtifact;
 import org.acumos.cds.domain.MLPDocument;
index ef825e0..10bfa74 100644 (file)
@@ -24,19 +24,17 @@ import java.lang.invoke.MethodHandles;
 
 import org.acumos.cds.client.ICommonDataServiceRestClient;
 import org.acumos.federation.gateway.cds.Mapper;
-import org.acumos.federation.gateway.config.NexusConfiguration;
+import org.acumos.federation.gateway.config.CDMSClientConfiguration;
 import org.acumos.federation.gateway.config.DockerConfiguration;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.config.FederationInterfaceConfiguration;
 import org.acumos.federation.gateway.config.LocalInterfaceConfiguration;
-import org.acumos.federation.gateway.config.CDMSClientConfiguration;
-
+import org.acumos.federation.gateway.config.NexusConfiguration;
+import org.acumos.nexus.client.NexusArtifactClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import org.acumos.nexus.client.NexusArtifactClient;
-
 import com.github.dockerjava.api.DockerClient;
 
 /**
index 2e04542..2334cae 100644 (file)
@@ -38,12 +38,12 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.MediaType;
 import org.springframework.util.Base64Utils;
-import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpStatusCodeException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
index d80026b..1d7c912 100644 (file)
@@ -22,13 +22,13 @@ package org.acumos.federation.gateway.config;
 
 import org.acumos.federation.gateway.common.Clients;
 import org.acumos.federation.gateway.security.AuthenticationConfiguration;
-import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.CatalogService;
+import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.LocalWatchService;
 import org.acumos.federation.gateway.service.PeerService;
 import org.acumos.federation.gateway.service.PeerSubscriptionService;
-import org.acumos.federation.gateway.service.impl.ContentServiceLocalImpl;
 import org.acumos.federation.gateway.service.impl.CatalogServiceLocalImpl;
+import org.acumos.federation.gateway.service.impl.ContentServiceLocalImpl;
 import org.acumos.federation.gateway.service.impl.PeerServiceLocalImpl;
 import org.acumos.federation.gateway.task.TaskConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
index 83a68eb..29e5815 100644 (file)
@@ -22,18 +22,15 @@ package org.acumos.federation.gateway.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.acumos.cds.client.ICommonDataServiceRestClient;
 import org.acumos.cds.client.CommonDataServiceRestClientImpl;
-
+import org.acumos.cds.client.ICommonDataServiceRestClient;
 import org.acumos.federation.gateway.cds.Mapper;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.stereotype.Component;
 
 /**
  * Gathers all CDS connectivity related parameters. Allows one to construct a cds client based on the
index 78b1f1a..752bb70 100644 (file)
@@ -25,10 +25,10 @@ import java.lang.invoke.MethodHandles;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.core.DockerClientConfig;
 
 /**
  * 
index f046e3d..d30c385 100644 (file)
@@ -23,14 +23,14 @@ package org.acumos.federation.gateway.config;
 import org.acumos.federation.gateway.adapter.PeerGateway;
 import org.acumos.federation.gateway.common.Clients;
 import org.acumos.federation.gateway.security.AuthenticationConfiguration;
-import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.CatalogService;
 import org.acumos.federation.gateway.service.CatalogServiceConfiguration;
+import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.PeerService;
 import org.acumos.federation.gateway.service.PeerSubscriptionService;
+import org.acumos.federation.gateway.service.impl.CatalogServiceImpl;
 import org.acumos.federation.gateway.service.impl.ContentServiceImpl;
 import org.acumos.federation.gateway.service.impl.ContentServiceLocalImpl;
-import org.acumos.federation.gateway.service.impl.CatalogServiceImpl;
 import org.acumos.federation.gateway.service.impl.PeerServiceImpl;
 import org.acumos.federation.gateway.service.impl.PeerSubscriptionServiceImpl;
 import org.acumos.federation.gateway.task.TaskConfiguration;
index ee26147..ba0b18f 100644 (file)
@@ -22,11 +22,10 @@ package org.acumos.federation.gateway.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
 import org.acumos.nexus.client.NexusArtifactClient;
 import org.acumos.nexus.client.RepositoryLocation;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 /**
  * 
index 2a86ab8..4df9124 100644 (file)
@@ -20,6 +20,8 @@
 
 package org.acumos.federation.gateway.config;
 
+import java.util.ArrayList;
+
 import org.acumos.federation.gateway.Application;
 import org.acumos.federation.gateway.controller.AbstractController;
 import org.springframework.context.annotation.Bean;
@@ -29,6 +31,7 @@ import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Contact;
+import springfox.documentation.service.VendorExtension;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -48,6 +51,7 @@ public class SwaggerConfiguration {
                                .apiInfo(apiInfo());
        }
 
+       @SuppressWarnings("rawtypes")
        private ApiInfo apiInfo() {
                final String version = Application.class.getPackage().getImplementationVersion();
                ApiInfo apiInfo = new ApiInfo("Acumos Federated Gateway REST API", // title
@@ -56,7 +60,8 @@ public class SwaggerConfiguration {
                                "Terms of service", // TOS
                                new Contact("Federated Acumos - E5 Team", "http://acumos.org", "acumosdev@acumos.org"), // Contact
                                "License of API", // License
-                               "API license URL"); // License URL
+                               "API license URL",
+                               new ArrayList<VendorExtension>()); // vendor extensions
                return apiInfo;
        }
 }
index e4c3d60..20c0a45 100644 (file)
@@ -30,16 +30,16 @@ import java.util.concurrent.Callable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPSolutionRevision;
 import org.acumos.federation.gateway.cds.ArtifactType;
 import org.acumos.federation.gateway.common.API;
 import org.acumos.federation.gateway.common.JsonResponse;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
-import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.CatalogService;
+import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.util.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
index 8791b4b..fad6d51 100644 (file)
@@ -31,9 +31,9 @@ import org.acumos.cds.domain.MLPPeer;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.service.PeerService;
 import org.acumos.federation.gateway.util.Utils;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
index 9bcb26d..9dc7910 100644 (file)
@@ -21,9 +21,8 @@
 package org.acumos.federation.gateway.security;
 
 import java.lang.invoke.MethodHandles;
-
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
index 476e3b6..fe2a61a 100644 (file)
@@ -26,12 +26,12 @@ package org.acumos.federation.gateway.service;
 import java.util.List;
 import java.util.Map;
 
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPSolutionRevision;
-import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Artifact;
+import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Solution;
 import org.acumos.federation.gateway.cds.SolutionRevision;
 
index b9970a2..b9e1a05 100644 (file)
 package org.acumos.federation.gateway.service;
 
 import java.lang.invoke.MethodHandles;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collections;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.boot.json.JsonParser;
-import org.springframework.boot.json.JsonParserFactory;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.acumos.cds.AccessTypeCode;
-import org.acumos.cds.ValidationStatusCode;
-
-import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.cds.Solution;
 import org.acumos.federation.gateway.cds.SolutionRevision;
+import org.acumos.federation.gateway.config.EELFLoggerDelegate;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.json.JsonParserFactory;
+import org.springframework.stereotype.Component;
 
 /**
  * Allows for the configuration of the base selector which determine the solutions exposed through federation.
index f42e502..5aad914 100644 (file)
@@ -23,8 +23,8 @@
  */
 package org.acumos.federation.gateway.service;
 
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 
index 5fac593..6e8e830 100644 (file)
@@ -24,8 +24,8 @@
 package org.acumos.federation.gateway.service.impl;
 
 import java.lang.invoke.MethodHandles;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -37,20 +37,19 @@ import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 
 import org.acumos.cds.AccessTypeCode;
-import org.acumos.cds.ValidationStatusCode;
 import org.acumos.cds.client.ICommonDataServiceRestClient;
-import org.acumos.cds.domain.MLPTag;
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPSolutionRevision;
+import org.acumos.cds.domain.MLPTag;
 import org.acumos.cds.transport.RestPageRequest;
 import org.acumos.cds.transport.RestPageResponse;
-import org.acumos.federation.gateway.cds.Document;
+import org.acumos.federation.gateway.cds.AccessType;
 import org.acumos.federation.gateway.cds.Artifact;
+import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Solution;
 import org.acumos.federation.gateway.cds.SolutionRevision;
-import org.acumos.federation.gateway.cds.AccessType;
 import org.acumos.federation.gateway.cds.ValidationStatus;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.service.CatalogService;
index d861290..a933e94 100644 (file)
@@ -31,12 +31,12 @@ import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPSolutionRevision;
-import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Artifact;
+import org.acumos.federation.gateway.cds.Document;
 import org.acumos.federation.gateway.cds.Mapper;
 import org.acumos.federation.gateway.cds.Solution;
 import org.acumos.federation.gateway.cds.SolutionRevision;
index 9ac01a5..5e1f348 100644 (file)
@@ -28,21 +28,21 @@ import java.io.ByteArrayOutputStream;
 import java.lang.invoke.MethodHandles;
 
 import org.acumos.cds.AccessTypeCode;
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.federation.gateway.cds.ArtifactType;
+import org.acumos.federation.gateway.config.DockerConfiguration;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.config.NexusConfiguration;
-import org.acumos.federation.gateway.config.DockerConfiguration;
 import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.ServiceContext;
 import org.acumos.federation.gateway.service.ServiceException;
 import org.acumos.nexus.client.NexusArtifactClient;
 import org.acumos.nexus.client.data.UploadArtifactInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Identifier;
index 22cf04a..1b02978 100644 (file)
@@ -24,8 +24,8 @@ import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.net.URI;
 
-import org.acumos.cds.domain.MLPDocument;
 import org.acumos.cds.domain.MLPArtifact;
+import org.acumos.cds.domain.MLPDocument;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.service.ContentService;
 import org.acumos.federation.gateway.service.ServiceContext;
index 73478b4..a1600f5 100644 (file)
@@ -31,13 +31,13 @@ import org.acumos.cds.transport.RestPageResponse;
 import org.acumos.federation.gateway.cds.PeerStatus;
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 import org.acumos.federation.gateway.config.FederationInterfaceConfiguration;
+import org.acumos.federation.gateway.security.Tools;
 import org.acumos.federation.gateway.service.PeerService;
 import org.acumos.federation.gateway.service.ServiceContext;
 import org.acumos.federation.gateway.service.ServiceException;
-import org.acumos.federation.gateway.security.Tools;
 import org.acumos.federation.gateway.util.MapBuilder;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  *  CDS based implementation of the hpeer service interface.
index c3a88f1..702c93a 100644 (file)
 package org.acumos.federation.gateway.service.impl;
 
 import java.lang.invoke.MethodHandles;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.acumos.cds.domain.MLPSolution;
 import org.acumos.cds.domain.MLPTag;
-
 import org.acumos.federation.gateway.config.EELFLoggerDelegate;
 
 /**
index 565a9f2..7a97781 100644 (file)
@@ -22,13 +22,12 @@ package org.acumos.federation.gateway.task;
 
 import java.lang.invoke.MethodHandles;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
 import java.util.concurrent.ScheduledFuture;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import org.acumos.cds.domain.MLPPeer;
@@ -41,9 +40,9 @@ import org.acumos.federation.gateway.util.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.scheduling.TaskScheduler;
 import org.springframework.stereotype.Component;
 
 import com.google.common.collect.HashBasedTable;
index 2921d69..b7d4cec 100644 (file)
@@ -22,19 +22,19 @@ package org.acumos.federation.gateway.task;
 
 import java.util.concurrent.Executor;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.AsyncConfigurer;
-import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 
 /**
  * Provides the beans used to setup the peer subscription tasks.