Merge pull request #13 from DirectProjectJavaRI/develop

Releasing 7.0.1

Author: Greg Meyer

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nhind</groupId>
 	<artifactId>config-service-jar</artifactId>
-	<version>7.0</version>
+	<version>7.0.1</version>
 	<packaging>jar</packaging>
 	<name>NHIN Direct Java RI config service jar</name>
     <description>NHIN Direct Java RI config service jar.</description>	

src/main/java/org/nhindirect/config/resources/TrustBundleResource.java

@@ -62,6 +62,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.util.UriTemplate;
 
+import edu.emory.mathcs.backport.java.util.Arrays;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -555,6 +556,19 @@ public ResponseEntity<Mono<Void>> updateBundleAttributes(@PathVariable("bundle")
     		return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).cacheControl(noCache).build();
     	}
 
+    	// check to see if the bundle info is the same... if so, then exit
+    	if (entityBundle.getBundleName().equals(bundleData.getBundleName()) &&
+    		entityBundle.getBundleURL().equals(bundleData.getBundleURL()) &&
+    		entityBundle.getRefreshInterval() == bundleData.getRefreshInterval())
+    	{
+    		if (bundleData.getSigningCertificateData() == null && entityBundle.getSigningCertificateData() == null)
+    			return ResponseEntity.status(HttpStatus.NO_CONTENT).cacheControl(noCache).build();
+    		
+    		else if (bundleData.getSigningCertificateData() != null && entityBundle.getSigningCertificateData() != null
+    				&& Arrays.equals(bundleData.getSigningCertificateData(), entityBundle.getSigningCertificateData()))
+    				return ResponseEntity.status(HttpStatus.NO_CONTENT).cacheControl(noCache).build();
+    	}
+    
     	final String oldBundleURL = entityBundle.getBundleURL();
 
     	// if there is a signing certificate in the request, make sure it's valid

src/test/java/org/nhindirect/config/resources/TrustBundleResource_updateBundleAttributesTest.java

@@ -155,6 +155,74 @@ protected void doAssertions(TrustBundle bundle) throws Exception
 			}.perform();
 		}	
 
+		@Test
+		public void testUpdateBundleAttributes_noChange_assertNameChanged()  throws Exception
+		{
+			new TestPlan()
+			{
+				protected Collection<TrustBundle> bundles;
+				
+				@Override
+				protected Collection<TrustBundle> getBundlesToAdd()
+				{
+					try
+					{
+						bundles = new ArrayList<TrustBundle>();
+						
+						TrustBundle bundle = new TrustBundle();
+						bundle.setBundleName("testBundle1");
+						File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
+						bundle.setBundleURL(filePrefix + fl.getAbsolutePath());	
+						bundle.setRefreshInterval(24);
+						bundle.setSigningCertificateData(null);		
+						bundles.add(bundle);
+						
+						return bundles;
+					}
+					catch (Exception e)
+					{
+						throw new RuntimeException (e);
+					}
+				}
+				
+				@Override
+				protected TrustBundle getBundleDataToUpdate() throws Exception
+				{
+					final TrustBundle bundleData = new TrustBundle();
+					bundleData.setBundleName("testBundle1");
+					File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
+					bundleData.setBundleURL(filePrefix + fl.getAbsolutePath());	
+					bundleData.setRefreshInterval(24);
+					bundleData.setSigningCertificateData(null);	
+					
+					return bundleData;
+					
+				}
+				
+				@Override
+				protected String getBundleToUpdate()
+				{
+					return "testBundle1";
+				}
+				
+				@Override 
+				protected String getBundleUpdatedName()
+				{
+					return "testBundle1";
+				}
+				
+				protected void doAssertions(TrustBundle bundle) throws Exception
+				{
+					final TrustBundle addedBundle = this.bundles.iterator().next();
+					
+					assertEquals(getBundleUpdatedName(), bundle.getBundleName());
+					assertNull(bundle.getSigningCertificateAsX509Certificate());
+					assertEquals(addedBundle.getBundleURL(), bundle.getBundleURL());
+					assertEquals(24, bundle.getRefreshInterval());
+				}
+			}.perform();
+		}	
+		
 		@Test
 		public void testUpdateBundleAttributes_newSigningCert_assertSigningCertChanged()  throws Exception
 		{