Remove conflict detection (what is it really good for?)

Author: Johannes Stelzer

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/controller/RegistryController.java

@@ -30,7 +30,6 @@
 
 import de.codecentric.boot.admin.model.Application;
 import de.codecentric.boot.admin.registry.ApplicationRegistry;
-import de.codecentric.boot.admin.registry.ApplicationRegistryConflictException;
 
 /**
  * REST controller for controlling registration of managed applications.
@@ -57,12 +56,8 @@ public RegistryController(ApplicationRegistry registry) {
 	@RequestMapping(method = RequestMethod.POST)
 	public ResponseEntity<Application> register(@RequestBody Application app) {
 		LOGGER.debug("Register application {}", app.toString());
-		try {
 			Application registeredApp = registry.register(app);
 			return new ResponseEntity<Application>(registeredApp, HttpStatus.CREATED);
-		} catch (ApplicationRegistryConflictException ex) {
-			return new ResponseEntity<Application>(HttpStatus.CONFLICT);
-		}
 	}
 
 	/**

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/registry/ApplicationIdGenerator.java

@@ -21,7 +21,7 @@ public interface ApplicationIdGenerator {
 
 	/**
 	 * Generate an id based on the given Application
-	 * 
+	 *
 	 * @param a the application the id is computed for.
 	 * @return the application id
 	 */

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/registry/ApplicationRegistry.java

@@ -69,8 +69,7 @@ public Application register(Application app) {
 			if ((app.getUrl().equals(oldApp.getUrl()) && app.getName().equals(oldApp.getName()))) {
 				LOGGER.debug("Application {} refreshed", newApp);
 			} else {
-				LOGGER.warn("Application {} not registered because of conflict with {}", newApp, oldApp);
-				throw new ApplicationRegistryConflictException(oldApp, app);
+				LOGGER.warn("Application {} replaced by Application {}", newApp, oldApp);
 			}
 		}
 		return newApp;

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/registry/ApplicationRegistryConflictException.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package de.codecentric.boot.admin.registry.store;
 
 import java.util.Collection;
@@ -17,7 +32,7 @@ public HazelcastApplicationStore(IMap<String, Application> store) {
 
 	@Override
 	public Application save(Application app) {
-		return store.putIfAbsent(app.getId(), app);
+		return store.put(app.getId(), app);
 	}
 
 	@Override

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/registry/store/HazelcastApplicationStore.java

@@ -31,7 +31,7 @@ public class SimpleApplicationStore implements ApplicationStore {
 
 	@Override
 	public Application save(Application app) {
-		return map.putIfAbsent(app.getId(), app);
+		return map.put(app.getId(), app);
 	}
 
 	@Override

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/registry/store/SimpleApplicationStore.java

@@ -69,7 +69,7 @@ public void register_twice() {
 	public void register_sameUrl() {
 		controller.register(new Application("http://localhost", "FOO"));
 		ResponseEntity<?> response = controller.register(new Application("http://localhost", "BAR"));
-		assertEquals(HttpStatus.CONFLICT, response.getStatusCode());
+		assertEquals(HttpStatus.CREATED, response.getStatusCode());
 	}
 
 	@Test