From 9c9b750afec2c061cde1d63dbe6c527625887c60 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 8 Jun 2021 13:42:19 +0200
Subject: [PATCH] STY: formatting
---
.../java/org/caosdb/server/CaosDBServer.java | 267 +++++++++---------
.../server/grpc/EntityTransactionImpl.java | 11 +-
.../org/caosdb/server/grpc/GRPCServer.java | 8 +-
3 files changed, 146 insertions(+), 140 deletions(-)
diff --git a/src/main/java/org/caosdb/server/CaosDBServer.java b/src/main/java/org/caosdb/server/CaosDBServer.java
index 9b727412..3669722e 100644
--- a/src/main/java/org/caosdb/server/CaosDBServer.java
+++ b/src/main/java/org/caosdb/server/CaosDBServer.java
@@ -371,10 +371,10 @@ public class CaosDBServer extends Application {
*/
private static void runHTTPServer(
final int port_http, final int initialConnections, final int maxTotalConnections)
- throws Exception {
+ throws Exception {
Engine.getInstance()
- .getRegisteredServers()
- .add(new org.restlet.ext.jetty.HttpServerHelper(null));
+ .getRegisteredServers()
+ .add(new org.restlet.ext.jetty.HttpServerHelper(null));
// Create a component.
component = new CaosDBComponent();
@@ -397,16 +397,16 @@ public class CaosDBServer extends Application {
// Create an application (this class).
final Application application = new CaosDBServer();
application
- .getStatusService()
- .setContactEmail(getServerProperty(ServerProperties.KEY_ADMIN_EMAIL));
+ .getStatusService()
+ .setContactEmail(getServerProperty(ServerProperties.KEY_ADMIN_EMAIL));
application
- .getStatusService()
- .setHomeRef(new Reference(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT) + "/"));
+ .getStatusService()
+ .setHomeRef(new Reference(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT) + "/"));
// Attach the application to the component with a defined contextRoot.
component
- .getDefaultHost()
- .attach(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT), application);
+ .getDefaultHost()
+ .attach(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT), application);
component.start();
@@ -432,7 +432,7 @@ public class CaosDBServer extends Application {
final int port_redirect_https,
final int initialConnections,
final int maxTotalConnections)
- throws Exception {
+ throws Exception {
Engine.getInstance().getRegisteredServers().add(new CaosDBServerConnectorHelper(null));
@@ -453,9 +453,9 @@ public class CaosDBServer extends Application {
if (port_http != 0) {
logger.info("Redirecting to " + port_redirect_https);
component
- .getServers()
- .add(Protocol.HTTP, port_http)
- .setNext(new HttpToHttpsRedirector(port_redirect_https));
+ .getServers()
+ .add(Protocol.HTTP, port_http)
+ .setNext(new HttpToHttpsRedirector(port_redirect_https));
}
// set initial and maximal connections
@@ -485,20 +485,20 @@ public class CaosDBServer extends Application {
// Create an application (this class).
final Application application = new CaosDBServer();
application
- .getStatusService()
- .setContactEmail(
- getServerProperty(ServerProperties.KEY_ADMIN_NAME)
- + " <"
- + getServerProperty(ServerProperties.KEY_ADMIN_EMAIL)
- + ">");
+ .getStatusService()
+ .setContactEmail(
+ getServerProperty(ServerProperties.KEY_ADMIN_NAME)
+ + " <"
+ + getServerProperty(ServerProperties.KEY_ADMIN_EMAIL)
+ + ">");
application
- .getStatusService()
- .setHomeRef(new Reference(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT) + "/"));
+ .getStatusService()
+ .setHomeRef(new Reference(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT) + "/"));
component
- .getDefaultHost()
- .attach(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT), application);
+ .getDefaultHost()
+ .attach(getServerProperty(ServerProperties.KEY_CONTEXT_ROOT), application);
component.start();
@@ -520,16 +520,16 @@ public class CaosDBServer extends Application {
/** ProtectedRouter. Is protected by the authenticator. */
final Router protectedRouter =
new Router(getContext()) {
- @Override
- public void handle(final Request request, final Response response) {
- try {
- super.handle(request, response);
- } catch (final NullPointerException e) {
- response.setStatus(Status.CLIENT_ERROR_REQUEST_URI_TOO_LONG);
- response.setEntity(null);
- }
- }
- };
+ @Override
+ public void handle(final Request request, final Response response) {
+ try {
+ super.handle(request, response);
+ } catch (final NullPointerException e) {
+ response.setStatus(Status.CLIENT_ERROR_REQUEST_URI_TOO_LONG);
+ response.setEntity(null);
+ }
+ }
+ };
/**
* BaseRouter. Routes the call to some special Resources, which are available without any
@@ -538,59 +538,59 @@ public class CaosDBServer extends Application {
*/
final Router baseRouter =
new Router(getContext()) {
- @Override
- public void handle(final Request request, final Response response) {
- try {
- super.handle(request, response);
-
- // after everything, set session cookies
- setSessionCookies(response);
-
- } finally {
- // remove subject from this thread so that we can reuse the
- // thread.
- ThreadContext.unbindSubject();
- }
- }
-
- private void setSessionCookies(final Response response) {
+ @Override
+ public void handle(final Request request, final Response response) {
+ try {
+ super.handle(request, response);
- final Subject subject = SecurityUtils.getSubject();
- // if authenticated as a normal user: generate and set session cookie.
- if (subject.isAuthenticated()
- && subject.getPrincipal() != AnonymousAuthenticationToken.PRINCIPAL) {
- final SessionToken sessionToken = SessionToken.generate(subject);
+ // after everything, set session cookies
+ setSessionCookies(response);
- // set session token cookie (httpOnly, secure cookie which
- // is used to recognize a user session)
- final CookieSetting sessionTokenCookie =
- AuthenticationUtils.createSessionTokenCookie(sessionToken);
- if (sessionTokenCookie != null) {
- response.getCookieSettings().add(sessionTokenCookie);
+ } finally {
+ // remove subject from this thread so that we can reuse the
+ // thread.
+ ThreadContext.unbindSubject();
+ }
}
- // set session timeout cookie (secure cookie which may be
- // used
- // by the user interfaces for anything)
- final CookieSetting sessionTimeoutCookie =
- AuthenticationUtils.createSessionTimeoutCookie(sessionToken);
- if (sessionTimeoutCookie != null) {
- response.getCookieSettings().add(sessionTimeoutCookie);
+ private void setSessionCookies(final Response response) {
+
+ final Subject subject = SecurityUtils.getSubject();
+ // if authenticated as a normal user: generate and set session cookie.
+ if (subject.isAuthenticated()
+ && subject.getPrincipal() != AnonymousAuthenticationToken.PRINCIPAL) {
+ final SessionToken sessionToken = SessionToken.generate(subject);
+
+ // set session token cookie (httpOnly, secure cookie which
+ // is used to recognize a user session)
+ final CookieSetting sessionTokenCookie =
+ AuthenticationUtils.createSessionTokenCookie(sessionToken);
+ if (sessionTokenCookie != null) {
+ response.getCookieSettings().add(sessionTokenCookie);
+ }
+
+ // set session timeout cookie (secure cookie which may be
+ // used
+ // by the user interfaces for anything)
+ final CookieSetting sessionTimeoutCookie =
+ AuthenticationUtils.createSessionTimeoutCookie(sessionToken);
+ if (sessionTimeoutCookie != null) {
+ response.getCookieSettings().add(sessionTimeoutCookie);
+ }
+ }
}
- }
- }
- };
+ };
// These routes can be used without logging in:
baseRouter.attach("/webinterface/version/build", WebinterfaceBuildNumber.class);
baseRouter
- .attach("/webinterface/{path}", Webinterface.class)
- .getTemplate()
- .getDefaultVariable()
- .setType(Variable.TYPE_URI_PATH);
+ .attach("/webinterface/{path}", Webinterface.class)
+ .getTemplate()
+ .getDefaultVariable()
+ .setType(Variable.TYPE_URI_PATH);
baseRouter
- .attach("/login?username={username}", AuthenticationResource.class)
- .setMatchingQuery(true);
+ .attach("/login?username={username}", AuthenticationResource.class)
+ .setMatchingQuery(true);
baseRouter.attach("/login", AuthenticationResource.class);
baseRouter.attach("", authenticator).setMatchingQuery(false);
@@ -656,22 +656,22 @@ public class CaosDBServer extends Application {
// FileSystem etc. needs to accept parameters which contain slashes and would otherwise be
// split at the first separator
protectedRouter
- .attach("/FileSystem/{path}", FileSystemResource.class)
- .getTemplate()
- .getDefaultVariable()
- .setType(Variable.TYPE_URI_PATH);
+ .attach("/FileSystem/{path}", FileSystemResource.class)
+ .getTemplate()
+ .getDefaultVariable()
+ .setType(Variable.TYPE_URI_PATH);
protectedRouter
- .attach("/Thumbnails/{path}", ThumbnailsResource.class)
- .getTemplate()
- .getDefaultVariable()
- .setType(Variable.TYPE_URI_PATH);
+ .attach("/Thumbnails/{path}", ThumbnailsResource.class)
+ .getTemplate()
+ .getDefaultVariable()
+ .setType(Variable.TYPE_URI_PATH);
protectedRouter.attach("/Shared", SharedFileResource.class);
protectedRouter.attach("/Shared/", SharedFileResource.class);
protectedRouter
- .attach("/Shared/{path}", SharedFileResource.class)
- .getTemplate()
- .getDefaultVariable()
- .setType(Variable.TYPE_URI_PATH);
+ .attach("/Shared/{path}", SharedFileResource.class)
+ .getTemplate()
+ .getDefaultVariable()
+ .setType(Variable.TYPE_URI_PATH);
;
protectedRouter.attach("/Info", InfoResource.class);
protectedRouter.attach("/Info/", InfoResource.class);
@@ -680,11 +680,11 @@ public class CaosDBServer extends Application {
protectedRouter.attach("/PermissionRules/{specifier}", PermissionRulesResource.class);
protectedRouter.attach("/PermissionRules/{realm}/{specifier}", PermissionRulesResource.class);
protectedRouter
- .attach("/ServerLogs/", ServerLogsResource.class)
- .setMatchingMode(Template.MODE_STARTS_WITH);
+ .attach("/ServerLogs/", ServerLogsResource.class)
+ .setMatchingMode(Template.MODE_STARTS_WITH);
protectedRouter
- .attach("/ServerLogs", ServerLogsResource.class)
- .setMatchingMode(Template.MODE_STARTS_WITH);
+ .attach("/ServerLogs", ServerLogsResource.class)
+ .setMatchingMode(Template.MODE_STARTS_WITH);
protectedRouter.attach("/login?username={username}", AuthenticationResource.class);
protectedRouter.attach("/logout", LogoutResource.class);
protectedRouter.attach("/_server_properties", ServerPropertiesResource.class);
@@ -700,37 +700,37 @@ public class CaosDBServer extends Application {
final Handler handler =
new Handler() {
- @Override
- public void publish(final LogRecord record) {
- if (record.getLevel() == Level.WARNING
- && record
- .getMessage()
- .startsWith(
- "StackOverflowError exception encountered while matching this string")) {
- // cause a NullPointerException
- throw new NullPointerException();
- }
- }
+ @Override
+ public void publish(final LogRecord record) {
+ if (record.getLevel() == Level.WARNING
+ && record
+ .getMessage()
+ .startsWith(
+ "StackOverflowError exception encountered while matching this string")) {
+ // cause a NullPointerException
+ throw new NullPointerException();
+ }
+ }
- @Override
- public void flush() {}
+ @Override
+ public void flush() {}
- @Override
- public void close() throws SecurityException {}
- };
+ @Override
+ public void close() throws SecurityException {}
+ };
routes:
- for (final Route r : protectedRouter.getRoutes()) {
- if (r instanceof TemplateRoute) {
- final TemplateRoute t = (TemplateRoute) r;
- for (final Handler h : t.getTemplate().getLogger().getHandlers()) {
- if (h == handler) {
- continue routes;
- }
+ for (final Route r : protectedRouter.getRoutes()) {
+ if (r instanceof TemplateRoute) {
+ final TemplateRoute t = (TemplateRoute) r;
+ for (final Handler h : t.getTemplate().getLogger().getHandlers()) {
+ if (h == handler) {
+ continue routes;
}
- t.getTemplate().getLogger().addHandler(handler);
}
+ t.getTemplate().getLogger().addHandler(handler);
}
+ }
return baseRouter;
}
@@ -779,22 +779,22 @@ public class CaosDBServer extends Application {
private static void initShutDownHook() {
Runtime.getRuntime()
- .addShutdownHook(
- new Thread("SHUTDOWN_HTTP_SERVER") {
- @Override
- public void run() {
- callPreShutdownHooks();
- try {
- component.stop();
- System.err.print("Stopping HTTP server [OK]\n");
- } catch (final Exception e) {
- System.err.print("Stopping HTTP server [failed]\n");
- e.printStackTrace();
- } finally {
- callPostShutdownHooks();
- }
- }
- });
+ .addShutdownHook(
+ new Thread("SHUTDOWN_HTTP_SERVER") {
+ @Override
+ public void run() {
+ callPreShutdownHooks();
+ try {
+ component.stop();
+ System.err.print("Stopping HTTP server [OK]\n");
+ } catch (final Exception e) {
+ System.err.print("Stopping HTTP server [failed]\n");
+ e.printStackTrace();
+ } finally {
+ callPostShutdownHooks();
+ }
+ }
+ });
}
public static Component getComponent() {
@@ -820,7 +820,8 @@ public class CaosDBServer extends Application {
return SERVER_PROPERTIES;
}
- public static void scheduleJob(final JobDetail job, final Trigger trigger) throws SchedulerException {
+ public static void scheduleJob(final JobDetail job, final Trigger trigger)
+ throws SchedulerException {
SCHEDULER.scheduleJob(job, trigger);
}
}
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java
index 6165b316..b312e252 100644
--- a/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionImpl.java
@@ -1,19 +1,22 @@
package org.caosdb.server.grpc;
+import io.grpc.stub.StreamObserver;
import org.caosdb.api.info.v1alpha1.GeneralInfoServiceGrpc.GeneralInfoServiceImplBase;
import org.caosdb.api.info.v1alpha1.GetVersionInfoRequest;
import org.caosdb.api.info.v1alpha1.GetVersionInfoResponse;
import org.caosdb.api.info.v1alpha1.VersionInfo;
-import io.grpc.stub.StreamObserver;
public class EntityTransactionImpl extends GeneralInfoServiceImplBase {
@Override
- public void getVersionInfo(final GetVersionInfoRequest request,
+ public void getVersionInfo(
+ final GetVersionInfoRequest request,
final StreamObserver<GetVersionInfoResponse> responseObserver) {
- final VersionInfo versionInfo = VersionInfo.newBuilder().setMajor(0).setMinor(0).setPatch(1).build();
- final GetVersionInfoResponse response = GetVersionInfoResponse.newBuilder().setVersionInfo(versionInfo).build();
+ final VersionInfo versionInfo =
+ VersionInfo.newBuilder().setMajor(0).setMinor(0).setPatch(1).build();
+ final GetVersionInfoResponse response =
+ GetVersionInfoResponse.newBuilder().setVersionInfo(versionInfo).build();
responseObserver.onNext(response);
responseObserver.onCompleted();
diff --git a/src/main/java/org/caosdb/server/grpc/GRPCServer.java b/src/main/java/org/caosdb/server/grpc/GRPCServer.java
index 3bbba23e..c614a17d 100644
--- a/src/main/java/org/caosdb/server/grpc/GRPCServer.java
+++ b/src/main/java/org/caosdb/server/grpc/GRPCServer.java
@@ -1,8 +1,8 @@
package org.caosdb.server.grpc;
-import java.io.IOException;
import io.grpc.Server;
import io.grpc.ServerBuilder;
+import java.io.IOException;
public class GRPCServer {
@@ -11,9 +11,11 @@ public class GRPCServer {
// Server https_server =
// ServerBuilder.forPort(port_https)
// .useTransportSecurity(
- // new File("/home/tf/ssl/server-certificates/localhost-belial/localhost-belial.pem"),
+ // new
+ // File("/home/tf/ssl/server-certificates/localhost-belial/localhost-belial.pem"),
// new File(
- // "/home/tf/ssl/server-certificates/localhost-belial/localhost-belial.key.pk8"))
+ //
+ // "/home/tf/ssl/server-certificates/localhost-belial/localhost-belial.key.pk8"))
// .addService(new EntityTransactionImpl())
// .build();
// https_server.start();
--
GitLab