Skip to content

Commit ea5817d

Browse files
knutwalkerknutwalker
committed
Revert "Another attempt at 5.23 compat for the signature change in login context"
This reverts commit f804d1ffe8b1433dd1583189df05b38a695cceb1.
1 parent 4cd7d92 commit ea5817d

File tree

10 files changed

+0
-228
lines changed

10 files changed

+0
-228
lines changed

‎compatibility/5.17/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_517/Neo4jProxyImpl.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,9 +39,6 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.KernelTransaction;
@@ -284,26 +280,4 @@ public void relationshipProperties(
284280
) {
285281
read.relationshipProperties(relationshipReference, reference, selection, cursor);
286282
}
287-
288-
@Override
289-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
290-
final class LoginContextImpl extends LoginContext {
291-
private final SecurityContext securityContext;
292-
293-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
294-
super(
295-
compatLoginContext.subject(),
296-
compatLoginContext.connectionInfo()
297-
);
298-
this.securityContext = compatLoginContext.securityContext();
299-
}
300-
301-
@Override
302-
public SecurityContext authorize(IdLookup idLookup, String s, AbstractSecurityLog abstractSecurityLog) {
303-
return this.securityContext;
304-
}
305-
}
306-
307-
return new LoginContextImpl(compatLoginContext);
308-
}
309283
}

‎compatibility/5.18/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_518/Neo4jProxyImpl.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,9 +39,6 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.KernelTransaction;
@@ -292,26 +288,4 @@ public void relationshipProperties(
292288
) {
293289
read.relationshipProperties(relationshipReference, reference, selection, cursor);
294290
}
295-
296-
@Override
297-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
298-
final class LoginContextImpl extends LoginContext {
299-
private final SecurityContext securityContext;
300-
301-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
302-
super(
303-
compatLoginContext.subject(),
304-
compatLoginContext.connectionInfo()
305-
);
306-
this.securityContext = compatLoginContext.securityContext();
307-
}
308-
309-
@Override
310-
public SecurityContext authorize(IdLookup idLookup, String s, AbstractSecurityLog abstractSecurityLog) {
311-
return this.securityContext;
312-
}
313-
}
314-
315-
return new LoginContextImpl(compatLoginContext);
316-
}
317291
}

‎compatibility/5.19/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_519/Neo4jProxyImpl.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,9 +39,6 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.KernelTransaction;
@@ -292,26 +288,4 @@ public void relationshipProperties(
292288
) {
293289
read.relationshipProperties(relationshipReference, reference, selection, cursor);
294290
}
295-
296-
@Override
297-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
298-
final class LoginContextImpl extends LoginContext {
299-
private final SecurityContext securityContext;
300-
301-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
302-
super(
303-
compatLoginContext.subject(),
304-
compatLoginContext.connectionInfo()
305-
);
306-
this.securityContext = compatLoginContext.securityContext();
307-
}
308-
309-
@Override
310-
public SecurityContext authorize(IdLookup idLookup, String s, AbstractSecurityLog abstractSecurityLog) {
311-
return this.securityContext;
312-
}
313-
}
314-
315-
return new LoginContextImpl(compatLoginContext);
316-
}
317291
}

‎compatibility/5.20/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_520/Neo4jProxyImpl.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,9 +39,6 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.KernelTransaction;
@@ -294,26 +290,4 @@ public void relationshipProperties(
294290
) {
295291
read.relationshipProperties(relationshipReference, reference, selection, cursor);
296292
}
297-
298-
@Override
299-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
300-
final class LoginContextImpl extends LoginContext {
301-
private final SecurityContext securityContext;
302-
303-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
304-
super(
305-
compatLoginContext.subject(),
306-
compatLoginContext.connectionInfo()
307-
);
308-
this.securityContext = compatLoginContext.securityContext();
309-
}
310-
311-
@Override
312-
public SecurityContext authorize(IdLookup idLookup, String s, AbstractSecurityLog abstractSecurityLog) {
313-
return this.securityContext;
314-
}
315-
}
316-
317-
return new LoginContextImpl(compatLoginContext);
318-
}
319293
}

‎compatibility/5.21/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_521/Neo4jProxyImpl.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,9 +39,6 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.CypherScope;
@@ -297,26 +293,4 @@ public void relationshipProperties(
297293
) {
298294
read.relationshipProperties(relationshipReference, reference, selection, cursor);
299295
}
300-
301-
@Override
302-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
303-
final class LoginContextImpl extends LoginContext {
304-
private final SecurityContext securityContext;
305-
306-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
307-
super(
308-
compatLoginContext.subject(),
309-
compatLoginContext.connectionInfo()
310-
);
311-
this.securityContext = compatLoginContext.securityContext();
312-
}
313-
314-
@Override
315-
public SecurityContext authorize(IdLookup idLookup, String s, AbstractSecurityLog abstractSecurityLog) {
316-
return this.securityContext;
317-
}
318-
}
319-
320-
return new LoginContextImpl(compatLoginContext);
321-
}
322296
}

‎compatibility/5.22/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_522/Neo4jProxyImpl.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,9 +39,6 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.CypherScope;
@@ -297,26 +293,4 @@ public void relationshipProperties(
297293
) {
298294
read.relationshipProperties(relationshipReference, startNodeReference, reference, selection, cursor);
299295
}
300-
301-
@Override
302-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
303-
final class LoginContextImpl extends LoginContext {
304-
private final SecurityContext securityContext;
305-
306-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
307-
super(
308-
compatLoginContext.subject(),
309-
compatLoginContext.connectionInfo()
310-
);
311-
this.securityContext = compatLoginContext.securityContext();
312-
}
313-
314-
@Override
315-
public SecurityContext authorize(IdLookup idLookup, String s, AbstractSecurityLog abstractSecurityLog) {
316-
return this.securityContext;
317-
}
318-
}
319-
320-
return new LoginContextImpl(compatLoginContext);
321-
}
322296
}

‎compatibility/5.23/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/_523/Neo4jProxyImpl.java

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.neo4j.configuration.Config;
2323
import org.neo4j.exceptions.KernelException;
24-
import org.neo4j.gds.compat.CompatLoginContext;
2524
import org.neo4j.gds.compat.GlobalProcedureRegistry;
2625
import org.neo4j.gds.compat.Neo4jProxyApi;
2726
import org.neo4j.gds.compat.Write;
@@ -40,15 +39,11 @@
4039
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
4140
import org.neo4j.internal.kernel.api.procs.QualifiedName;
4241
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
43-
import org.neo4j.internal.kernel.api.security.AbstractSecurityLog;
44-
import org.neo4j.internal.kernel.api.security.LoginContext;
45-
import org.neo4j.internal.kernel.api.security.SecurityContext;
4642
import org.neo4j.io.fs.FileSystemAbstraction;
4743
import org.neo4j.io.layout.DatabaseLayout;
4844
import org.neo4j.kernel.api.CypherScope;
4945
import org.neo4j.kernel.api.KernelTransaction;
5046
import org.neo4j.kernel.api.procedure.GlobalProcedures;
51-
import org.neo4j.kernel.database.PrivilegeDatabaseReference;
5247
import org.neo4j.logging.internal.LogService;
5348
import org.neo4j.procedure.Mode;
5449
import org.neo4j.scheduler.JobScheduler;
@@ -298,30 +293,4 @@ public void relationshipProperties(
298293
) {
299294
read.relationshipProperties(relationshipReference, startNodeReference, reference, selection, cursor);
300295
}
301-
302-
@Override
303-
public LoginContext loginContext(CompatLoginContext compatLoginContext) {
304-
final class LoginContextImpl extends LoginContext {
305-
private final SecurityContext securityContext;
306-
307-
private LoginContextImpl(CompatLoginContext compatLoginContext) {
308-
super(
309-
compatLoginContext.subject(),
310-
compatLoginContext.connectionInfo()
311-
);
312-
this.securityContext = compatLoginContext.securityContext();
313-
}
314-
315-
@Override
316-
public SecurityContext authorize(
317-
IdLookup idLookup,
318-
PrivilegeDatabaseReference privilegeDatabaseReference,
319-
AbstractSecurityLog abstractSecurityLog
320-
) {
321-
return this.securityContext;
322-
}
323-
}
324-
325-
return new LoginContextImpl(compatLoginContext);
326-
}
327296
}

‎compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/CompatLoginContext.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎compatibility/api/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxyApi.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.neo4j.internal.kernel.api.procs.ProcedureSignature;
3737
import org.neo4j.internal.kernel.api.procs.QualifiedName;
3838
import org.neo4j.internal.kernel.api.procs.UserFunctionSignature;
39-
import org.neo4j.internal.kernel.api.security.LoginContext;
4039
import org.neo4j.io.fs.FileSystemAbstraction;
4140
import org.neo4j.io.layout.DatabaseLayout;
4241
import org.neo4j.kernel.api.KernelTransaction;
@@ -157,7 +156,4 @@ Estimates knownEstimates(
157156
long sizeOfRelationshipProperties,
158157
long numberOfNodeLabels
159158
);
160-
161-
@CompatSince(minor = 23)
162-
LoginContext loginContext(CompatLoginContext compatLoginContext);
163159
}

‎compatibility/common/neo4j-kernel-adapter/src/main/java/org/neo4j/gds/compat/Neo4jProxy.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import org.neo4j.internal.kernel.api.security.AccessMode;
5858
import org.neo4j.internal.kernel.api.security.AuthSubject;
5959
import org.neo4j.internal.kernel.api.security.AuthenticationResult;
60-
import org.neo4j.internal.kernel.api.security.LoginContext;
6160
import org.neo4j.internal.kernel.api.security.SecurityContext;
6261
import org.neo4j.internal.recordstorage.RecordIdType;
6362
import org.neo4j.io.fs.FileSystemAbstraction;
@@ -486,10 +485,6 @@ public static String versionLongToString(long storeVersion) {
486485
return new String(result);
487486
}
488487

489-
public static LoginContext loginContext(CompatLoginContext compatLoginContext) {
490-
return IMPL.loginContext(compatLoginContext);
491-
}
492-
493488
public static TestLog testLog() {
494489
return new TestLogImpl();
495490
}

0 commit comments

Comments
 (0)