Compare Strings using .equals() instead of ==

[bencomp]

This was a warning raised by the Inspector in IntelliJ IDEA.

(Plus some parametrised instantiations :))

[landreev]

Yeah, this is embarrassing.
The code in IngestServiceBean.java is mine; as in, I copy-and-pasted it
from somewhere in the old DVN 2-3.*.
I should've looked at it more closely.

So, what is the plan with these pull requests? Are we going to merge
them once everybody whose code is affected reviews them?
Or what?

Alternatively, I can just go ahead and incorporate the changes below
into my code.
I already did that with the SAVFileReader; I was doing work on that
class anyway, so I just fixed the raw declarations while I was at it.

On 9/25/14 2:55 AM, bencomp wrote:

This was a warning raised by the Inspector in IntelliJ IDEA.

(Plus some parametrised instantiations :))

---

    You can merge this Pull Request by running

git pull https://github.com/bencomp/dataverse master

Or view, comment on, or merge it at:

#935

    Commit Summary

• Add generics to instantiations in Dataverse class

• Resolve merge conflict; use types in generic variable instantiation

• Update bencomp's fork with IQSS commits

• Compare Strings with empty string using equals() instead of ==

• Merge remote-tracking branch 'iqss/master'

  File Changes
  

• M src/main/java/edu/harvard/iq/dataverse/Dataverse.java
  https://github.com/IQSS/dataverse/pull/935/files#diff-0 (10)

• M
  src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
  https://github.com/IQSS/dataverse/pull/935/files#diff-1 (2)

• M
  src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
  https://github.com/IQSS/dataverse/pull/935/files#diff-2 (6)

  Patch Links:
  

• https://github.com/IQSS/dataverse/pull/935.patch

• https://github.com/IQSS/dataverse/pull/935.diff

—
Reply to this email directly or view it on GitHub
#935.

[raprasad]

I incorporated the ShapefileHandler.java changes into my code.

Same for the IngestServiceBean.java, there was an additional bug in the next line--both are checked in.

[pdurbin]

I incorporated the ShapefileHandler.java changes into my code.

That's fine. It means we can automatically merge the pull request, but that's ok. I think @bencomp is just trying to raise awareness.

So, what is the plan with these pull requests?

I thought maybe this small one could get merged but again, I don't think @bencomp will be offended if we don't. @landreev maybe you can just close this request if you've already made your own changes to the code. I'll assign this pull request to you so you can decide.

[pdurbin]

Equally, we could use diamond inference here, right? Like this: new ArrayList<>();

[bencomp]

Yes, you could. And in many other places ;)

[pdurbin]

My preference would be to use diamond inference, so I'm going to close this pull request. Note that @raprasad already merged in a lot of the other changes.

See also #775 in which we are defining our coding standards in a Google doc for now, where public comments are enabled.