|
@@ -25,6 +25,7 @@ import java.time.format.DateTimeFormatter;
|
|
import java.util.Timer;
|
|
import java.util.Timer;
|
|
import java.util.TimerTask;
|
|
import java.util.TimerTask;
|
|
import java.util.concurrent.ThreadFactory;
|
|
import java.util.concurrent.ThreadFactory;
|
|
|
|
+import java.util.logging.Logger;
|
|
|
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
|
|
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
|
|
@@ -32,7 +33,7 @@ import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
import net.officefloor.frame.api.manage.OfficeFloor;
|
|
import net.officefloor.frame.api.manage.OfficeFloor;
|
|
import net.officefloor.frame.api.manage.ProcessManager;
|
|
import net.officefloor.frame.api.manage.ProcessManager;
|
|
-import net.officefloor.frame.api.managedobject.ProcessAwareContext;
|
|
|
|
|
|
+import net.officefloor.frame.api.managedobject.ManagedObjectContext;
|
|
import net.officefloor.frame.api.managedobject.ProcessSafeOperation;
|
|
import net.officefloor.frame.api.managedobject.ProcessSafeOperation;
|
|
import net.officefloor.server.SocketManager;
|
|
import net.officefloor.server.SocketManager;
|
|
import net.officefloor.server.http.AbstractHttpServicerFactory;
|
|
import net.officefloor.server.http.AbstractHttpServicerFactory;
|
|
@@ -64,6 +65,11 @@ public class RawOfficeFloorMain {
|
|
*/
|
|
*/
|
|
public static SocketManager socketManager = null;
|
|
public static SocketManager socketManager = null;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * {@link Logger}.
|
|
|
|
+ */
|
|
|
|
+ private static Logger logger = Logger.getLogger(RawOfficeFloorMain.class.getName());
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* Run application.
|
|
* Run application.
|
|
*/
|
|
*/
|
|
@@ -145,9 +151,20 @@ public class RawOfficeFloorMain {
|
|
private final ObjectMapper objectMapper = new ObjectMapper();
|
|
private final ObjectMapper objectMapper = new ObjectMapper();
|
|
|
|
|
|
/**
|
|
/**
|
|
- * {@link ProcessAwareContext}.
|
|
|
|
|
|
+ * {@link ManagedObjectContext}.
|
|
*/
|
|
*/
|
|
- private static ProcessAwareContext processAwareContext = new ProcessAwareContext() {
|
|
|
|
|
|
+ private static ManagedObjectContext managedObjectContext = new ManagedObjectContext() {
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getBoundName() {
|
|
|
|
+ return RawOfficeFloorMain.class.getSimpleName();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Logger getLogger() {
|
|
|
|
+ return logger;
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public <R, T extends Throwable> R run(ProcessSafeOperation<R, T> operation) throws T {
|
|
public <R, T extends Throwable> R run(ProcessSafeOperation<R, T> operation) throws T {
|
|
return operation.run();
|
|
return operation.run();
|
|
@@ -189,8 +206,8 @@ public class RawOfficeFloorMain {
|
|
protected ProcessManager service(ProcessAwareServerHttpConnectionManagedObject<ByteBuffer> connection)
|
|
protected ProcessManager service(ProcessAwareServerHttpConnectionManagedObject<ByteBuffer> connection)
|
|
throws IOException {
|
|
throws IOException {
|
|
|
|
|
|
- // Configure process awareness
|
|
|
|
- connection.setProcessAwareContext(processAwareContext);
|
|
|
|
|
|
+ // Configure context
|
|
|
|
+ connection.setManagedObjectContext(managedObjectContext);
|
|
|
|
|
|
// Service the connection
|
|
// Service the connection
|
|
HttpRequest request = connection.getRequest();
|
|
HttpRequest request = connection.getRequest();
|