Hi Chamila, Thanks for sharing this.But this is not resolve the current code formatting issue as those two comparing files has two different formats.Those diff changes happen not only with the white spaces.
As a long term solutions to this,shall we re-format our whole java code base into new coding standards[1] in a one commit as suggested above and maintain the same coding standard with every source file.WDYT? [1][Discuss] Coding Standards & Best Practices Guidelines Thanks, Gayan On Tue, Sep 23, 2014 at 1:59 AM, Chamila De Alwis <chami...@wso2.com> wrote: > Hi Gayan, > > May be following tips would help to separate your existing changes in to > formatting and business logic without reformatting. [1] deals with removing > white space from the changes, but additionally [2], git add -p, allows > selecting the sections that need to be staged for a particular commit. > > [1] - > http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes > [2] - > http://johnkary.net/blog/git-add-p-the-most-powerful-git-feature-youre-not-using-yet/ > > > Regards, > Chamila de Alwis > Software Engineer | WSO2 | +94772207163 > Blog: code.chamiladealwis.com > > > > On Mon, Sep 22, 2014 at 5:48 PM, Gayan Gunarathne <gay...@wso2.com> wrote: > >> >> What is the code format template are we following previously? This is to >> revert the code with the previous code format. >> >> Thanks, >> Gayan >> >> On Mon, Sep 22, 2014 at 5:03 PM, Isuru Haththotuwa <isu...@apache.org> >> wrote: >> >>> >>> >>> On Mon, Sep 22, 2014 at 4:45 PM, Isuru Perera <isu...@wso2.com> wrote: >>> >>>> Hi Gayan, >>>> >>>> IMHO, the formatting should be done with a different commit. >>>> >>> +1 >>> >>>> The problem is that you have done logic changes along with formatting. >>>> I can't figure out what you changed in the code to support MQTT. >>>> >>>> As a practice, I usually try to keep the diff minimum when doing code >>>> changes and do formatting changes in a different commit. I suggest others >>>> to do the same. Then we can make sure that the code history is easy to >>>> understand. >>>> >>>> Just my 2 cents! :) >>>> >>>> Best Regards, >>>> >>>> On Mon, Sep 22, 2014 at 4:20 PM, Gayan Gunarathne <gay...@wso2.com> >>>> wrote: >>>> >>>>> Hi Isuru, >>>>> >>>>> Yeah.It is formatted according to the discussion[1].In the GIT source >>>>> comparing window it may show white spaces due to this.Is n't? >>>>> >>>>> Please find the following code as it is formatted as the discussion[1]. >>>>> >>>>> >>>>> https://github.com/gayangunarathne/stratos/blob/msgtopichierachchy-1/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java >>>>> >>>>> [1] Coding Standards & Best Practices Guidelines >>>>> >>>>> Thanks, >>>>> Gayan >>>>> >>>>> On Mon, Sep 22, 2014 at 3:42 PM, Isuru Perera <isu...@wso2.com> wrote: >>>>> >>>>>> Your PR seems to be messed up due to white space changes :( >>>>>> >>>>>> Did you format classes? >>>>>> >>>>>> On Mon, Sep 22, 2014 at 2:39 PM, Gayan Gunarathne <gay...@wso2.com> >>>>>> wrote: >>>>>> >>>>>>> Hi All, >>>>>>> >>>>>>> I have changed the Stratos messaging model to support MQTT. >>>>>>> >>>>>>> Please find the pull request for this. >>>>>>> >>>>>>> https://github.com/apache/stratos/pull/47 >>>>>>> >>>>>>> >>>>>>> Also I have updated the relevant JIRA(STRATOS-791) as well. >>>>>>> >>>>>>> Thanks, >>>>>>> Gayan >>>>>>> >>>>>>> >>>>>>> On Thu, Sep 11, 2014 at 12:58 PM, Gayan Gunarathne <gay...@wso2.com> >>>>>>> wrote: >>>>>>> >>>>>>>> Hi All, >>>>>>>> >>>>>>>> Based on the discussion[1] and our initial research, we are going >>>>>>>> to use the following client library for the Stratos MQTT based message >>>>>>>> component. >>>>>>>> >>>>>>>> http://www.eclipse.org/paho/ >>>>>>>> >>>>>>>> We have done initial research[2] of the functionality of that >>>>>>>> library with both java[3] and python[4]. >>>>>>>> >>>>>>>> Please feel free to share if you have any thoughts on this. >>>>>>>> >>>>>>>> >>>>>>>> [1] Messaging protocol with Stratos python cartridge agent >>>>>>>> [2] https://github.com/gayangunarathne/MQTT-Pub-Sub >>>>>>>> [3] https://repo.eclipse.org/content/repositories/paho-releases/ >>>>>>>> [4] http://www.eclipse.org/paho/clients/python/ >>>>>>>> >>>>>>>> Thanks, >>>>>>>> Gayan >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Best Regards, >>>>>>>> >>>>>>>> Gayan Gunarathne >>>>>>>> Technical Lead >>>>>>>> WSO2 Inc. (http://wso2.com) >>>>>>>> email : gay...@wso2.com | mobile : +94 766819985 >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Best Regards, >>>>>>> >>>>>>> Gayan Gunarathne >>>>>>> Technical Lead >>>>>>> WSO2 Inc. (http://wso2.com) >>>>>>> email : gay...@wso2.com | mobile : +94 766819985 >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Isuru Perera >>>>>> Senior Software Engineer | WSO2, Inc. | http://wso2.com/ >>>>>> Lean . Enterprise . Middleware >>>>>> >>>>>> about.me/chrishantha >>>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Best Regards, >>>>> >>>>> Gayan Gunarathne >>>>> Technical Lead >>>>> WSO2 Inc. (http://wso2.com) >>>>> email : gay...@wso2.com | mobile : +94 766819985 >>>>> >>>>> >>>> >>>> >>>> >>>> -- >>>> Isuru Perera >>>> Senior Software Engineer | WSO2, Inc. | http://wso2.com/ >>>> Lean . Enterprise . Middleware >>>> >>>> about.me/chrishantha >>>> >>>> -- >>>> <http://about.me/chrishantha> >>>> Thanks and Regards, >>>> >>>> Isuru H. >>>> <http://about.me/chrishantha> >>>> +94 716 358 048 <http://about.me/chrishantha>* <http://wso2.com/>* >>>> >>>> >>>> * <http://wso2.com/>* >>>> >>>> >>>> >> >> >> -- >> Best Regards, >> >> Gayan Gunarathne >> Technical Lead >> WSO2 Inc. (http://wso2.com) >> email : gay...@wso2.com | mobile : +94 766819985 >> >> > > -- Best Regards, Gayan Gunarathne Technical Lead WSO2 Inc. (http://wso2.com) email : gay...@wso2.com | mobile : +94 766819985
