You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2017/11/13 14:20:04 UTC
wicket git commit: WICKET-6496 Duplicate definition of interface
JSONString
Repository: wicket
Updated Branches:
refs/heads/master d2286b2bc -> 81260044c
WICKET-6496 Duplicate definition of interface JSONString
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/81260044
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/81260044
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/81260044
Branch: refs/heads/master
Commit: 81260044ce93f5903a33dc66c8feb9e0b0fbbd35
Parents: d2286b2
Author: Andrea Del Bene <ad...@apache.org>
Authored: Mon Nov 13 15:16:13 2017 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Mon Nov 13 15:16:13 2017 +0100
----------------------------------------------------------------------
.../apache/wicket/ajax/json/JSONFunction.java | 1 +
.../org/apache/wicket/ajax/json/JSONString.java | 34 --------------------
2 files changed, 1 insertion(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/81260044/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
index 006a798..525e16e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONFunction.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.ajax.json;
+import com.github.openjson.JSONString;
import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Args;
http://git-wip-us.apache.org/repos/asf/wicket/blob/81260044/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONString.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONString.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONString.java
deleted file mode 100755
index a3d25b6..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONString.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.ajax.json;
-/**
- * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
- * method so that a class can change the behavior of
- * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
- * and <code>JSONWriter.value(</code>Object<code>)</code>. The
- * <code>toJSONString</code> method will be used instead of the default behavior
- * of using the Object's <code>toString()</code> method and quoting the result.
- */
-public interface JSONString {
- /**
- * The <code>toJSONString</code> method allows a class to produce its own JSON
- * serialization.
- *
- * @return A strictly syntactically correct JSON text.
- */
- String toJSONString();
-}