Merge pull request #2 from DirectProjectJavaRI/develop

Develop

Author: Greg Meyer

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 	   <groupId>org.springframework.boot</groupId>
 	   <artifactId>spring-boot-dependencies</artifactId>
-	   <version>2.1.1.RELEASE</version>
+	   <version>2.1.2.RELEASE</version>
 	</parent>		
 	<scm>
 		<url>scm:git:https://github.com/DirectProject/nhin-d.git</url>
@@ -39,7 +39,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-cloud-dependencies.version>Greenwich.M3</spring-cloud-dependencies.version>
+		<spring-cloud-dependencies.version>Greenwich.RC1</spring-cloud-dependencies.version>
 	</properties>
   	<repositories>
 	    <!-- Temp repository for Spring Boot Milestone -->
@@ -99,7 +99,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -123,14 +122,12 @@
         <dependency>
           <groupId>org.mockito</groupId>
           <artifactId>mockito-core</artifactId>
-          <version>2.21.0</version>
           <scope>test</scope>
         </dependency>	
 		<dependency>
 		    <groupId>com.h2database</groupId>
 		    <artifactId>h2</artifactId>
 		    <scope>test</scope>
-		    <version>1.4.194</version>
 		</dependency>	    		        						
 	</dependencies>
 	<build>
@@ -150,7 +147,6 @@
 		      <plugin>
 		        <groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-source-plugin</artifactId>
-		        <version>2.0.3</version>
 		        <executions>
 		          <execution>
 		            <goals>

src/main/java/org/nhind/config/rest/impl/DefaultCertPolicyService.java

@@ -6,6 +6,7 @@
 import org.nhind.config.rest.CertPolicyService;
 import org.nhind.config.rest.feign.CertificatePolicyClient;
 import org.nhindirect.common.rest.exceptions.ServiceException;
+import org.nhindirect.common.rest.exceptions.ServiceMethodException;
 import org.nhindirect.config.model.CertPolicy;
 import org.nhindirect.config.model.CertPolicyGroup;
 import org.nhindirect.config.model.CertPolicyGroupDomainReltn;
@@ -39,7 +40,16 @@ public Collection<CertPolicy> getPolicies() throws ServiceException
 	@Override
 	public CertPolicy getPolicyByName(String policyName) throws ServiceException 
 	{
-		return certPolClient.getPolicyByName(policyName);
+		try
+		{
+			return certPolClient.getPolicyByName(policyName);
+		}
+		catch (ServiceMethodException e)
+		{
+			if (e.getResponseCode() == 404)
+				return null;
+			throw e;
+		}
 	}
 
 	@Override
@@ -70,7 +80,16 @@ public Collection<CertPolicyGroup> getPolicyGroups() throws ServiceException
 	@Override
 	public CertPolicyGroup getPolicyGroup(String groupName) throws ServiceException 
 	{
-		return certPolClient.getPolicyGroupByName(groupName);		
+		try
+		{
+			return certPolClient.getPolicyGroupByName(groupName);		
+		}
+		catch (ServiceMethodException e)
+		{
+			if (e.getResponseCode() == 404)
+				return null;
+			throw e;
+		}
 	}
 
 	@Override

src/main/java/org/nhind/config/rest/impl/DefaultCertificateService.java

@@ -6,6 +6,7 @@
 import org.nhind.config.rest.CertificateService;
 import org.nhind.config.rest.feign.CertificateClient;
 import org.nhindirect.common.rest.exceptions.ServiceException;
+import org.nhindirect.common.rest.exceptions.ServiceMethodException;
 import org.nhindirect.config.model.Certificate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -44,7 +45,16 @@ public Collection<Certificate> getCertificatesByOwner(String owner) throws Servi
 	public Certificate getCertificatesByOwnerAndThumbprint(
 			String owner, String thumbprint) throws ServiceException 
 	{
-		return certClient.getCertificatesByOwnerAndThumbprint(owner, thumbprint);
+		try
+		{
+			return certClient.getCertificatesByOwnerAndThumbprint(owner, thumbprint);
+		}
+		catch (ServiceMethodException e)
+		{
+			if (e.getResponseCode() == 404)
+				return null;
+			throw e;
+		}
 	}
 
 	@Override

src/main/java/org/nhind/config/rest/impl/DefaultTrustBundleService.java

@@ -7,6 +7,7 @@
 import org.nhind.config.rest.TrustBundleService;
 import org.nhind.config.rest.feign.TrustBundleClient;
 import org.nhindirect.common.rest.exceptions.ServiceException;
+import org.nhindirect.common.rest.exceptions.ServiceMethodException;
 import org.nhindirect.config.model.TrustBundle;
 import org.nhindirect.config.model.TrustBundleDomainReltn;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,16 @@ public Collection<TrustBundleDomainReltn> getAllTrustBundleDomainReltns(boolean
 	@Override
 	public TrustBundle getTrustBundle(String bundleName) throws ServiceException 
 	{
-		return bundleClient.getTrustBundleByName(bundleName);
+		try
+		{
+			return bundleClient.getTrustBundleByName(bundleName);
+		}
+		catch (ServiceMethodException e)
+		{
+			if (e.getResponseCode() == 404)
+				return null;
+			throw e;
+		}
 	}
 
 	@Override