diff --git a/extended/src/main/java/apoc/export/arrow/ExportArrow.java b/extended/src/main/java/apoc/export/arrow/ExportArrowExtended.java similarity index 89% rename from extended/src/main/java/apoc/export/arrow/ExportArrow.java rename to extended/src/main/java/apoc/export/arrow/ExportArrowExtended.java index cb923e44c5..76d7443fd1 100644 --- a/extended/src/main/java/apoc/export/arrow/ExportArrow.java +++ b/extended/src/main/java/apoc/export/arrow/ExportArrowExtended.java @@ -18,6 +18,7 @@ */ package apoc.export.arrow; +import apoc.Extended; import apoc.Pools; import apoc.export.util.NodesAndRelsSubGraph; import apoc.result.ByteArrayResult; @@ -45,7 +46,8 @@ import java.util.Map; import java.util.stream.Stream; -public class ExportArrow { +@Extended +public class ExportArrowExtended { @Context public Transaction tx; @@ -63,8 +65,7 @@ public class ExportArrow { public TerminationGuard terminationGuard; @NotThreadSafe - @Procedure(name = "apoc.export.arrow.stream.all", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.export.arrow.stream.all") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Exports the full database as an arrow byte array.") public Stream all( @@ -75,10 +76,7 @@ public Stream all( } @NotThreadSafe - @Procedure( - name = "apoc.export.arrow.stream.graph", - deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.export.arrow.stream.graph") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Exports the given graph as an arrow byte array.") public Stream graph( @@ -104,10 +102,7 @@ public Stream graph( } @NotThreadSafe - @Procedure( - name = "apoc.export.arrow.stream.query", - deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.export.arrow.stream.query") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Exports the given Cypher query as an arrow byte array.") public Stream query( @@ -122,8 +117,7 @@ public Stream query( } @NotThreadSafe - @Procedure(name = "apoc.export.arrow.all", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.export.arrow.all") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Exports the full database as an arrow file.") public Stream all( @@ -135,8 +129,7 @@ public Stream all( } @NotThreadSafe - @Procedure(name = "apoc.export.arrow.graph", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.export.arrow.graph") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Exports the given graph as an arrow file.") public Stream graph( @@ -164,8 +157,7 @@ public Stream graph( } @NotThreadSafe - @Procedure(name = "apoc.export.arrow.query", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.export.arrow.query") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Exports the results from the given Cypher query as an arrow file.") public Stream query( diff --git a/extended/src/main/java/apoc/load/LoadJsonExtended.java b/extended/src/main/java/apoc/load/LoadJsonExtended.java index 9f1e24a2a0..44d06b5629 100644 --- a/extended/src/main/java/apoc/load/LoadJsonExtended.java +++ b/extended/src/main/java/apoc/load/LoadJsonExtended.java @@ -18,6 +18,7 @@ */ package apoc.load; +import apoc.Extended; import apoc.result.LoadDataMapResult; import apoc.util.CompressionAlgo; import org.neo4j.graphdb.security.URLAccessChecker; @@ -37,6 +38,7 @@ import static apoc.load.LoadJsonUtils.loadJsonStream; import static apoc.util.CompressionConfig.COMPRESSION; +@Extended public class LoadJsonExtended { @Context @@ -46,8 +48,7 @@ public class LoadJsonExtended { public URLAccessChecker urlAccessChecker; @SuppressWarnings("unchecked") - @Procedure(name = "apoc.load.jsonParams", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.load.jsonParams") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description( "Loads parameters from a JSON URL (e.g. web-API) as a stream of values if the given JSON file is a `LIST`.\n" diff --git a/extended/src/main/java/apoc/load/LoadArrow.java b/extended/src/main/java/apoc/load/arrow/LoadArrowExtended.java similarity index 95% rename from extended/src/main/java/apoc/load/LoadArrow.java rename to extended/src/main/java/apoc/load/arrow/LoadArrowExtended.java index 68bc238935..e1b3f879d0 100644 --- a/extended/src/main/java/apoc/load/LoadArrow.java +++ b/extended/src/main/java/apoc/load/arrow/LoadArrowExtended.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package apoc.load; +package apoc.load.arrow; +import apoc.Extended; import apoc.result.LoadDataMapResult; import apoc.util.FileUtils; import apoc.util.JsonUtil; @@ -58,7 +59,8 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -public class LoadArrow { +@Extended +public class LoadArrowExtended { @Context public URLAccessChecker urlAccessChecker; @@ -101,8 +103,7 @@ public synchronized boolean tryAdvance(Consumer actio } } - @Procedure(name = "apoc.load.arrow.stream", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.load.arrow.stream") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Imports `NODE` and `RELATIONSHIP` values from the provided arrow byte array.") public Stream stream( @@ -123,8 +124,7 @@ public Stream stream( }); } - @Procedure(name = "apoc.load.arrow", deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + @Procedure(name = "apoc.load.arrow") @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Imports `NODE` and `RELATIONSHIP` values from the provided arrow file.") public Stream file( @@ -163,7 +163,7 @@ private static Object read(FieldVector fieldVector, int index) { private static Object getObject(Object object) { if (object instanceof Collection) { - return ((Collection) object).stream().map(LoadArrow::getObject).collect(Collectors.toList()); + return ((Collection) object).stream().map(LoadArrowExtended::getObject).collect(Collectors.toList()); } if (object instanceof Map) { return ((Map) object) diff --git a/extended/src/main/java/apoc/log/Neo4jLogStream.java b/extended/src/main/java/apoc/log/Neo4jLogStreamExtended.java similarity index 96% rename from extended/src/main/java/apoc/log/Neo4jLogStream.java rename to extended/src/main/java/apoc/log/Neo4jLogStreamExtended.java index 10ef47304b..238bcacfc7 100644 --- a/extended/src/main/java/apoc/log/Neo4jLogStream.java +++ b/extended/src/main/java/apoc/log/Neo4jLogStreamExtended.java @@ -18,6 +18,7 @@ */ package apoc.log; +import apoc.Extended; import apoc.util.FileUtils; import org.neo4j.kernel.api.QueryLanguage; import org.neo4j.kernel.api.procedure.QueryLanguageScope; @@ -41,7 +42,8 @@ * @author moxious * @since 27.02.19 */ -public class Neo4jLogStream { +@Extended +public class Neo4jLogStreamExtended { public static class FileEntry implements Comparable { @Description("The line number.") @@ -67,9 +69,7 @@ public int compareTo(FileEntry o) { @Admin @Procedure( name = "apoc.log.stream", - mode = Mode.DBMS, - deprecatedBy = "This procedure is being moved to APOC Extended.") - @Deprecated + mode = Mode.DBMS) @QueryLanguageScope(scope = {QueryLanguage.CYPHER_25}) @Description("Returns the file contents from the given log, optionally returning only the last n lines.\n" + "This procedure requires users to have an admin role.") diff --git a/extended/src/test/java/apoc/export/arrow/ArrowTest.java b/extended/src/test/java/apoc/export/arrow/ArrowExtendedTest.java similarity index 98% rename from extended/src/test/java/apoc/export/arrow/ArrowTest.java rename to extended/src/test/java/apoc/export/arrow/ArrowExtendedTest.java index 5ff4355475..87be53f5a7 100644 --- a/extended/src/test/java/apoc/export/arrow/ArrowTest.java +++ b/extended/src/test/java/apoc/export/arrow/ArrowExtendedTest.java @@ -19,7 +19,7 @@ package apoc.export.arrow; import apoc.graph.Graphs; -import apoc.load.LoadArrow; +import apoc.load.arrow.*; import apoc.meta.Meta; import apoc.util.JsonUtil; import apoc.util.TestUtil; @@ -50,7 +50,7 @@ import static apoc.ApocConfig.apocConfig; import static org.junit.Assert.assertEquals; -public class ArrowTest { +public class ArrowExtendedTest { private static File directory = new File("target/arrow import"); @@ -128,7 +128,7 @@ public class ArrowTest { public static void beforeClass() { db.executeTransactionally( "CREATE (f:User {name:'Adam',age:42,male:true,kids:['Sam','Anna','Grace'], born:localdatetime('2015-05-18T19:32:24.000'), place:point({latitude: 13.1, longitude: 33.46789, height: 100.0})})-[:KNOWS {since: 1993, bffSince: duration('P5M1.5D')}]->(b:User {name:'Jim',age:42})"); - TestUtil.registerProcedure(db, ExportArrow.class, LoadArrow.class, Graphs.class, Meta.class); + TestUtil.registerProcedure(db, ExportArrowExtended.class, LoadArrowExtended.class, Graphs.class, Meta.class); } @AfterClass diff --git a/extended/src/test/java/apoc/export/arrow/ImportArrowTest.java b/extended/src/test/java/apoc/export/arrow/ImportArrowExtendedTest.java similarity index 97% rename from extended/src/test/java/apoc/export/arrow/ImportArrowTest.java rename to extended/src/test/java/apoc/export/arrow/ImportArrowExtendedTest.java index aa5619d208..bb2b1c0826 100644 --- a/extended/src/test/java/apoc/export/arrow/ImportArrowTest.java +++ b/extended/src/test/java/apoc/export/arrow/ImportArrowExtendedTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -public class ImportArrowTest { +public class ImportArrowExtendedTest { private static File directory = new File("target/arrowImport"); static { //noinspection ResultOfMethodCallIgnored directory.mkdirs(); @@ -53,7 +53,7 @@ public class ImportArrowTest { @BeforeClass public static void beforeClass() { - TestUtil.registerProcedure(db, ExportArrow.class, ImportArrow.class, Meta.class); + TestUtil.registerProcedure(db, ExportArrowExtended.class, ImportArrow.class, Meta.class); } @Before diff --git a/extended/src/test/java/apoc/log/Neo4jLogStreamTest.java b/extended/src/test/java/apoc/log/Neo4jLogStreamExtendedTest.java similarity index 95% rename from extended/src/test/java/apoc/log/Neo4jLogStreamTest.java rename to extended/src/test/java/apoc/log/Neo4jLogStreamExtendedTest.java index f0fb5ac268..6cef0ac5cf 100644 --- a/extended/src/test/java/apoc/log/Neo4jLogStreamTest.java +++ b/extended/src/test/java/apoc/log/Neo4jLogStreamExtendedTest.java @@ -37,7 +37,7 @@ import static apoc.util.TestUtil.testResult; import static org.junit.Assert.assertTrue; -public class Neo4jLogStreamTest { +public class Neo4jLogStreamExtendedTest { private GraphDatabaseService db; private DatabaseManagementService dbManagementService; @@ -50,7 +50,7 @@ public void setUp() { .build(); apocConfig().setProperty("server.directories.logs", ""); db = dbManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME); - TestUtil.registerProcedure(db, Neo4jLogStream.class); + TestUtil.registerProcedure(db, Neo4jLogStreamExtended.class); } @After