Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stream.Collector initialized + some updates #201

Closed
wants to merge 82 commits into from

Conversation

AmirHossein
Copy link

For JSONObject and JSONArray

douglascrockford and others added 30 commits May 20, 2014 14:39
…n-CDL

Fix spelling error in CDL.java comment
…oString-JSONArray

fix toString(JSONArray) to emit object.toString() values
Proposed BigInteger, BigDecimal support
JSONObject(Map<String, ?> map) allows to initialize the JSONObject with
a Map<String, String>

JSONArray(Collection<?> collection) allows to initialize a JSONArray
with a Collection<JSONObject>
wildcard generic types, e.g. Collection<?> instead of
Collection<Object>. This was proposed by other pull requests (stleary#111,
stleary#112) already. Consider this commit as merge with stleary#111 and stleary#112.

JSONArray:
	- put(Collection<?> value) {...}
	- put(Map<String, ?> value) {...}
	- put(int index, Collection<?> value) throws JSONException {...}
	- put(int index, Map<String, ?> value) throws JSONException {...}

JSONObject:
	- put(String key, Collection<?> value) throws JSONException {...}
	- put(String key, Map<String, ?> value) throws JSONException {...}


Changed all code affected by new JSONObject and JSONArray constructors:
	
JSONObject:
	- valueToString(Object value) throws JSONException {
		- value instanceof Map
		- value instanceof Collection
	  }
	- wrap(Object object) {
		- value instanceof Map
		- value instanceof Collection
	  }
	- writeValue(Writer writer, Object value,
			 int indentFactor, int indent){
        - value instanceof Map
        - value instanceof Collection
      }
@AmirHossein AmirHossein changed the title stream.Collector initialized + some updated stream.Collector initialized + some updates Feb 24, 2016
@johnjaylward
Copy link
Contributor

the java-1.8 branch was created for reference only on a historical commit that broke backwards compatibility. At this time there is no case for requiring java1.8 but there are use cases for maintaining 1.6 compatibility.

In the future, you should only apply merge requests against the master branch and not side branches.

Also, you should either disable auto formatting in your IDE or update the settings to match the OSS project that you are contributing to.

@AmirHossein
Copy link
Author

@johnjaylward i knew that the project has 1.6 compatibilities and 1.8 updates won't be merged to master so i just wanted to push some updates as a 1.8 fork of project for anybody needs.

@stleary
Copy link
Owner

stleary commented Feb 25, 2016

I suppose we could maintain 2 release trains; one for 1.6 and another for 1.8 that is functionally identical. But this pull request contains files which are not even in the build anymore. If you really want to do this, consider taking the latest 1.6 code and adding your 1.8 code to it. If it looks reasonable, maybe a new branch can be created for it.

@AmirHossein
Copy link
Author

@johnjaylward Currently the long commits list above are for merging with master and just last 3 commits are mine

@stleary
Copy link
Owner

stleary commented Feb 26, 2016

Thanks for the pull request. The idea is reasonable, but can't be accepted in its current form.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants