Projects >> spring-insight-plugins >>f04e05e05568ab771e4886fa37e81d1691ddcc35

Chunk
Conflicting content 
			Integer portProperty = op.get("port", Integer.class);
			int port = portProperty == null ? -1 : portProperty.intValue();
            String color = colorManager.getColor(op);
<<<<<<< HEAD
			String hashString = MD5NameGenerator.getName(label + host + port + isIncoming);
=======
>>>>>>> cf626edf253cd18071ed5c079e7d763a358180a1

			ExternalResourceDescriptor descriptor =
			        new ExternalResourceDescriptor(queueFrame,
Solution content 
			Integer portProperty = op.get("port", Integer.class);
			int port = portProperty == null ? -1 : portProperty.intValue();
            String color = colorManager.getColor(op);			

			ExternalResourceDescriptor descriptor =
			        new ExternalResourceDescriptor(queueFrame,
File
AbstractRabbitMQResourceAnalyzer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		Operation op = createOperation();   	
		KeyValPair	props=addOperationProps(op, false, true);
		Trace trace = createValidTrace(op);
<<<<<<< HEAD

		List externalResourceDescriptors = analyzer.locateExternalResourceName(trace);
		assertExternalResourceDescriptors(externalResourceDescriptors, "Exchange#e", trace, "Exchange#e127.0.0.15672" + isIncoming);
=======
		assertExternalResourceDescriptors(trace, props);
>>>>>>> cf626edf253cd18071ed5c079e7d763a358180a1
	}

	@Test
Solution content 
		Operation op = createOperation();   	
		KeyValPair	props=addOperationProps(op, false, true);
		Trace trace = createValidTrace(op);
		assertExternalResourceDescriptors(trace, props);
	}

	@Test
File
AbstractRabbitMQResourceAnalyzerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		Operation op = createOperation();   	
		KeyValPair	props=addOperationProps(op, true, false);
		Trace trace = createValidTrace(op);
<<<<<<< HEAD

		List externalResourceDescriptors = analyzer.locateExternalResourceName(trace);
		assertExternalResourceDescriptors(trace, props);
>>>>>>> cf626edf253cd18071ed5c079e7d763a358180a1
	}

	@Test
=======
		assertExternalResourceDescriptors(externalResourceDescriptors, "RoutingKey#rk", trace, "RoutingKey#rk127.0.0.15672" + isIncoming);
Solution content 
		Operation op = createOperation();   	
		KeyValPair	props=addOperationProps(op, true, false);
		Trace trace = createValidTrace(op);
		assertExternalResourceDescriptors(trace, props);
	}

	@Test
File
AbstractRabbitMQResourceAnalyzerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		Operation op = createOperation();
		KeyValPair	props=addOperationProps(op, true, true);
		Trace trace = createValidTrace(op);
<<<<<<< HEAD

		List externalResourceDescriptors = analyzer.locateExternalResourceName(trace);

		assertExternalResourceDescriptors(externalResourceDescriptors, "Exchange#e RoutingKey#rk", trace, "Exchange#e RoutingKey#rk127.0.0.15672" + isIncoming);
=======
		assertExternalResourceDescriptors(trace, props);
>>>>>>> cf626edf253cd18071ed5c079e7d763a358180a1
	}

	@Test
Solution content 
		Operation op = createOperation();
		KeyValPair	props=addOperationProps(op, true, true);
		Trace trace = createValidTrace(op);
		assertExternalResourceDescriptors(trace, props);
	}

	@Test
File
AbstractRabbitMQResourceAnalyzerTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		assertSame("Mismatched 1st frame operation", op1, desc1.getFrame().getOperation());
	}

<<<<<<< HEAD
		assertEquals(2, externalResourceDescriptors.size());        

		ExternalResourceDescriptor descriptor = externalResourceDescriptors.get(0);        
		assertEquals(op2, descriptor.getFrame().getOperation());
		assertEquals("RabbitMQ-" + "RoutingKey#rk", descriptor.getLabel());
		assertEquals(ExternalResourceType.QUEUE.name(), descriptor.getType());
		assertEquals("RabbitMQ", descriptor.getVendor());
		assertEquals("127.0.0.2", descriptor.getHost());
		assertEquals(5673, descriptor.getPort());
		String expectedHash = MD5NameGenerator.getName("RoutingKey#rk127.0.0.25673" + isIncoming);
		assertEquals("RabbitMQ:" + expectedHash, descriptor.getName());

		descriptor = externalResourceDescriptors.get(1);        
		assertEquals(op1, descriptor.getFrame().getOperation());
		assertEquals("RabbitMQ-" + "Exchange#e RoutingKey#rk", descriptor.getLabel());
		assertEquals(ExternalResourceType.QUEUE.name(), descriptor.getType());
		assertEquals("RabbitMQ", descriptor.getVendor());
		assertEquals("127.0.0.1", descriptor.getHost());
		assertEquals(5672, descriptor.getPort());
		expectedHash = MD5NameGenerator.getName("Exchange#e RoutingKey#rk127.0.0.15672" + isIncoming);
		assertEquals("RabbitMQ:" + expectedHash, descriptor.getName());
=======
	// returns exchange + routing key
	protected KeyValPair addOperationProps(Operation operation, boolean addRouting, boolean addExchange){
		return null;
	}

	protected static final KeyValPair setExchange (KeyValPair org, String exchange) {
		return new KeyValPair(exchange, (org == null) ? null : org.getValue());
	}

	protected static final KeyValPair setRoutingKey (KeyValPair org, String key) {
		return new KeyValPair((org == null) ? null : org.getKey(), key);
>>>>>>> cf626edf253cd18071ed5c079e7d763a358180a1
	}

	static Trace createValidTrace(Operation op) {
Solution content 
		assertSame("Mismatched 1st frame operation", op1, desc1.getFrame().getOperation());
	}

	// returns exchange + routing key
	protected KeyValPair addOperationProps(Operation operation, boolean addRouting, boolean addExchange){
		return null;
	}

	protected static final KeyValPair setExchange (KeyValPair org, String exchange) {
		return new KeyValPair(exchange, (org == null) ? null : org.getValue());
	}

	protected static final KeyValPair setRoutingKey (KeyValPair org, String key) {
		return new KeyValPair((org == null) ? null : org.getKey(), key);
	}

	static Trace createValidTrace(Operation op) {
File
AbstractRabbitMQResourceAnalyzerTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Return statement
Variable