No need to redo it, github could have automatically merged the pull request. I rebased our branch, so now the commit history will look like the changes in the pull request came after all of your javadoc cleanup.
I still haven't been able to get the audit manager tests to pass, regardless of how I change the build.properties, the same 5 tests always fail. ----- Original Message ----- From: "Shawn McKinney" <[email protected]> To: [email protected] Sent: Friday, January 8, 2016 12:31:29 PM Subject: Re: Multiple Set Methods on Models > On Jan 6, 2016, at 7:33 AM, Chris Pike <[email protected]> wrote: > > I made the change and submitted a pull request on github, however I got an > error when trying to run the junit tests. I reverted the code and still get > the same error when running the test so it is not an issue with something I > changed. I put the error in the github comment. Chris this pull request came in the middle of a javadoc cleanup effort led by Emmanuel. Rather than trying to merge it back with those changes I propose we redo it. Let me know if you feel otherwise. Here is original request: > On Jan 5, 2016, at 10:35 AM, Chris Pike <[email protected]> wrote: > > There are a couple instances where models have multiple set methods for the > same field. > > UserAdminRole has... > > public void setOsP( String osP ) > public void setOsP( Set<String> osPs ) > > public void setOsU( Set<String> osUs ) > public void setOsU( String osU ) > > User has... > > public void setRole( String roleName ) > public void setRole( UserRole role ) > > public void setAdminRole( UserAdminRole role ) > public void setAdminRole( String roleName ) > > This is causing some issues down the line with jackson. I have a workaround > but wanted to see if there was any possibility of changing one of the method > names. Here are proposed changes as they stand now (w/ suggestion on using list in the name): UserAdminRole has... public void setOsP( String osP ) public void setOsPList( Set<String> osPs ) public void setOsUList( Set<String> osUs ) public void setOsU( String osU ) User has... public void setRoleName( String roleName ) public void setRole( UserRole role ) public void setAdminRole( UserAdminRole role ) public void setAdminRoleName( String roleName ) Will this work for you? If we’re in agreement I can make the change. Shawn
