Projects >> jboss-eap-quickstarts >>fd701680aabb6b5074928eac606cd8deb947ee2e

Chunk
Conflicting content 
      assertTrue(leftEntity.hasField("right"));
      assertTrue(leftEntity.getField("right").getType().equals("Set<" + rightEntity.getName() + ">"));
      assertTrue(leftEntity.getField("right").hasAnnotation(OneToMany.class));
<<<<<<< HEAD
     // assertNull(leftEntity.getField("right").getAnnotation(ManyToOne.class).getStringValue("mappedBy"));
=======
>>>>>>> 7750b7fdaf338135cb3b3960c01872df37e3b150
      assertTrue(leftEntity.hasImport(rightEntity.getQualifiedName()));
      assertTrue(leftEntity.hasImport(OneToMany.class));
      assertFalse(leftEntity.hasSyntaxErrors());
Solution content 
      assertTrue(leftEntity.hasField("right"));
      assertTrue(leftEntity.getField("right").getType().equals("Set<" + rightEntity.getName() + ">"));
      assertTrue(leftEntity.getField("right").hasAnnotation(OneToMany.class));
      assertTrue(leftEntity.hasImport(rightEntity.getQualifiedName()));
      assertTrue(leftEntity.hasImport(OneToMany.class));
      assertFalse(leftEntity.hasSyntaxErrors());
File
NewFieldPluginTest.java
Developer's decision
Version 2
Kind of conflict
Comment