greg/jpa-eclipselink-crud-tests
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A few fixes.

Browse source
This commit is contained in:
Greg Burd 2017-04-11 14:38:48 -04:00
parent 123658753e
commit 6cb09ecbc2
7 changed files with 169 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -12,6 +12,8 @@
*~
#*#
gradle
gradlew
._git_gburd
.gradle
run-jetty-run/
license.err

18
build.gradle
View file

@ -195,21 +195,15 @@ dependencyManagement {
// user = 'root'
// }
task performJPAWeaving(type: JavaExec, dependsOn: "compileJava"){
task weaveJpaEntities(type: JavaExec, dependsOn: "compileJava"){
inputs.dir compileJava.destinationDir
outputs.dir compileJava.destinationDir
main "org.eclipse.persistence.tools.weaving.jpa.StaticWeave"
args "-persistenceinfo",
"src/main/resources",
compileJava.destinationDir.getAbsolutePath(),
compileJava.destinationDir.getAbsolutePath()
args "-loglevel", "FINE",
"-persistenceinfo", "src/main/resources",
compileJava.destinationDir.getAbsolutePath(),
compileJava.destinationDir.getAbsolutePath()
classpath = configurations.compile
}
tasks.withType(JavaCompile){
doLast{
tasks.performJPAWeaving.execute()
}
}
// http://stackoverflow.com/questions/6431026/generating-jpa2-metamodel-from-a-gradle-build-script
// http://bsideup.blogspot.com/2015/04/querydsl-with-gradle-and-idea.html
classes.dependsOn weaveJpaEntities

111
ops/haproxy.conf Normal file
View file

@ -0,0 +1,111 @@
global
log 127.0.0.1 local0
log 127.0.0.1 local1 notice
maxconn 256000
spread-checks 5
daemon
quiet
# chroot /var/lib/haproxy
# user haproxy
# group haproxy
defaults
log global
option dontlognull
option allbackups
maxconn 256000
timeout connect 5000
timeout check 5000
timeout client 30000
timeout server 30000
# Load balancer stats page access at hostname:8080/haproxy_stats
listen stats
bind *:9876
mode http
stats enable
stats realm Haproxy\ Statistics\ CrDB
stats uri /stats
stats hide-version
# stats auth admin:admin@crdb
backend crdb_pg_n_cr_backend
balance leastconn
mode tcp
option tcpka
option tcplog
option srvtcpka
option log-health-checks
option redispatch
option pgsql-check user haproxy
balance roundrobin
timeout connect 3s
timeout server 20s
server usw2c-756 storage-base-usw2c-756.ops:26257 check
server usw2b-755 storage-base-usw2b-755.ops:26257 check
server use1b-754 storage-base-use1b-754.ops:26257 check
server euw1c-753 storage-base-euw1c-753.ops:26257 check
server euw1b-752 storage-base-euw1b-752.ops:26257 check
# server aps2b-751 storage-base-aps2b-751.ops:26257 check
server aps1b-750 storage-base-aps1b-750.ops:26257 check
server aps1a-749 storage-base-aps1a-749.ops:26257 check
server apn1c-748 storage-base-apn1c-748.ops:26257 check
server apn1a-747 storage-base-apn1a-747.ops:26257 check
server apn1a-746 storage-base-apn1a-746.ops:26257 check
server aps1a-745 storage-base-aps1a-745.ops:26257 check
# server aps2a-744 storage-base-aps2a-744.ops:26257 check
server euw1a-743 storage-base-euw1a-743.ops:26257 check
# server usw2a-742 storage-base-usw2a-742.ops:26257 check
server use1a-740 storage-base-use1a-740.ops:26257 check
frontend crdb_cr_frontend
bind *:26257
mode tcp
option tcplog
option contstats
option tcpka
default_backend crdb_pg_n_cr_backend
frontend crdb_pg_frontend
bind *:5432
mode tcp
option tcplog
option contstats
option tcpka
default_backend crdb_pg_n_cr_backend
backend crdb_admin_gui_backend
balance leastconn
mode tcp
option tcpka
option tcplog
option srvtcpka
option log-health-checks
option redispatch
balance roundrobin
timeout connect 3s
timeout server 20s
server usw2c-756 storage-base-usw2c-756.ops:8080 check
server usw2b-755 storage-base-usw2b-755.ops:8080 check
server use1b-754 storage-base-use1b-754.ops:8080 check
server euw1c-753 storage-base-euw1c-753.ops:8080 check
server euw1b-752 storage-base-euw1b-752.ops:8080 check
# server aps2b-751 storage-base-aps2b-751.ops:8080 check
server aps1b-750 storage-base-aps1b-750.ops:8080 check
server aps1a-749 storage-base-aps1a-749.ops:8080 check
server apn1c-748 storage-base-apn1c-748.ops:8080 check
server apn1a-747 storage-base-apn1a-747.ops:8080 check
server apn1a-746 storage-base-apn1a-746.ops:8080 check
server aps1a-745 storage-base-aps1a-745.ops:8080 check
# server aps2a-744 storage-base-aps2a-744.ops:8080 check
server euw1a-743 storage-base-euw1a-743.ops:8080 check
server usw2a-742 storage-base-usw2a-742.ops:8080 check
server use1a-740 storage-base-use1a-740.ops:8080 check
frontend crdb_admin_gui_frontend
bind *:7777
mode tcp
option tcplog
option contstats
option tcpka
default_backend crdb_admin_gui_backend

4
src/main/java/com/example/crud/Application.java
View file

@ -111,7 +111,7 @@ public class Application {
@Bean
public Map<String, String> jpaProperties() {
Map<String, String> props = new HashMap<>();
props.put("eclipselink.weaving", "static"); //TODO(gburd): enable
props.put("eclipselink.weaving", "static");
return props;
}
@ -133,6 +133,7 @@ public class Application {
return dataSource;
}
/*
@Bean
public CacheManager cacheManager() {
//TODO(gburd): is there an eclipselink cache manager? or caffeine? or...?
@ -143,5 +144,6 @@ public class Application {
return manager;
}
*/
}

75
src/main/java/com/example/crud/controllers/EmployeeController.java
View file

@ -26,6 +26,13 @@ public class EmployeeController {
@Autowired private EmployeeService employeeService;
/**
* Read all employees.
*
* Examples:
* 1. HTTP GET localhost:8443/api/v1/employees
* 2. curl -i -X GET localhost:8443/employees
*/
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
@RequestMapping(value = "/api/v1/employees", method = GET, produces = "application/json")
public ResponseEntity<List<Employee>> index() {
@ -44,6 +51,13 @@ public class EmployeeController {
return response;
}
/**
* Create a new employee.
*
* Examples:
* 1. HTTP POST localhost:8443/api/v1/employee firstName=Tedd lastName=Hanson honorific=Mr suffix=Jr. socialSecurityNumber=555-55-5555
* 2. curl -i -X POST -H "Content-Type:application/json" -d '{ "firstName" : "Karl", "lastName" : "Pasim", "socialSecurityNumber" : "123-23-2312" }' localhost:8443/api/v1/employee
*/
@Retry(times = 3, on = org.springframework.dao.OptimisticLockingFailureException.class)
@Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.REPEATABLE_READ)
@RequestMapping(value = "/api/v1/employee", method = POST, consumes = "application/json")
@ -53,7 +67,7 @@ public class EmployeeController {
try {
val e = employeeService.saveEmployee(employee);
if (e != null) {
response = ResponseEntity.status(HttpStatus.CREATED).body(e.getId());
response = ResponseEntity.status(HttpStatus.CREATED).body(e);
} else {
response = ResponseEntity.status(HttpStatus.NOT_MODIFIED).build();
}
@ -63,23 +77,15 @@ public class EmployeeController {
return response;
}
@Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.SERIALIZABLE)
@RequestMapping(value = "/api/v1/employee/{id:[\\d]+}", method = DELETE)
public ResponseEntity<Long> deleteEmployee(@PathVariable Long id) {
log.debug("Deleting employee");
@SuppressWarnings("unchecked") ResponseEntity response = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
try {
employeeService.delete(id);
response = ResponseEntity.status(HttpStatus.OK).body(id);
} catch (Exception e) {
response = ResponseEntity.status(HttpStatus.NOT_FOUND).build();
}
return response;
}
/**
* Read an employee by primary key (id).
*
* Examples:
* 1. HTTP GET localhost:8443/api/v1/employee/851864136237137920
* 2. curl -i -X GET localhost:8443/employee/851864136237137920
*/
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
//@RequestMapping(value = "/api/v1/employee/{id:[\\d]+}", method = GET)
@RequestMapping(value = "/api/v1/employee/{id}", method = GET)
@RequestMapping(value = "/api/v1/employee/{id:[\\d]+}", method = GET)
public ResponseEntity<Employee> find(@PathVariable Long id) {
log.debug("Getting a specific employee by id {}", id);
@SuppressWarnings("unchecked") ResponseEntity response = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
@ -96,6 +102,13 @@ public class EmployeeController {
return response;
}
/**
* Read the set of employees with a given last name.
*
* Examples:
* 1. HTTP GET localhost:8443/api/v1/employee?last=washington
* 2. curl -i -X GET localhost:8443/employee?last=washington
*/
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
@RequestMapping(value = "/api/v1/employee/named", method = GET)
public ResponseEntity<List<Employee>> find(@RequestParam("last") String name) {
@ -114,19 +127,25 @@ public class EmployeeController {
return response;
}
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
/**
* Delete a new employee.
*
* Examples:
* 1. HTTP DELETE localhost:8443/api/v1/employee/851864136237137920
* 2. curl -i -X DELETE localhost:8443/api/v1/employee/851864136237137920
*/
@Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.SERIALIZABLE)
@RequestMapping(value = "/api/v1/employee/{id:[\\d]+}", method = DELETE)
public @ResponseBody Long delete(@PathVariable Long id) {
public ResponseEntity<Long> deleteEmployee(@PathVariable Long id) {
log.debug("Remove an employee by id {}", id);
employeeService.delete(id);
return id;
@SuppressWarnings("unchecked") ResponseEntity response = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
try {
employeeService.delete(id);
response = ResponseEntity.status(HttpStatus.OK).body(id);
} catch (Exception e) {
response = ResponseEntity.status(HttpStatus.NOT_FOUND).build();
}
return response;
}
/*
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
@RequestMapping("/api/v1/employee/lastNameLength")
public List<Employee> fetchByLength(Long length) {
return employeeService.fetchByLastNameLength(length);
}
*/
}

39
src/main/java/com/example/crud/db/monitoring/EclipseLinkCache.java
View file

@ -1,39 +0,0 @@
package com.example.crud.db.monitoring;
import org.eclipse.persistence.internal.sessions.IdentityMapAccessor;
import org.eclipse.persistence.jpa.JpaEntityManager;
import org.eclipse.persistence.internal.sessions.UnitOfWorkImpl;
import org.eclipse.persistence.sessions.Session;
import org.eclipse.persistence.sessions.server.ServerSession;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
public class EclipseLinkCache {
EntityManagerFactory emf = Persistence.createEntityManagerFactory("default");
EntityManager em = emf.createEntityManager();
Session session = em.unwrap(Session.class);
JpaEntityManager jem = em.unwrap(JpaEntityManager.class);
UnitOfWorkImpl ouw = jem.unwrap(UnitOfWorkImpl.class);
ServerSession ss = jem.unwrap(ServerSession.class);
IdentityMapAccessor ima = (IdentityMapAccessor) ss.getIdentityMapAccessor();
/**
* long count = countCachedEntitiesL1(clazz);
*/
public long countCachedEntitiesL1(Class clazz) {
return ouw.getCloneMapping().keySet().stream()
.filter(entity -> entity.getClass().equals(clazz))
.count();
}
/**
* int count = countCachedEntitiesL2(clazz);
*/
public int countCachedEntitiesL2(Class clazz) {
return ima.getIdentityMap(clazz).getSize();
}
}

118
src/main/java/com/example/crud/db/monitoring/EclipseLinkGaugeSet.java
View file

@ -1,118 +0,0 @@
package com.example.crud.db.monitoring;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricSet;
import java.lang.management.ManagementFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
/**
* A set of gauges for operating system settings.
*/
public class EclipseLinkGaugeSet implements MetricSet {
private final Optional<Method> level1CacheObjectCount;
private final Optional<Method> level1CacheMemorySize;
private final Optional<Method> level1CacheHitMissRatio;
private final Optional<Method> level2CacheObjectCount;
private final Optional<Method> level2CacheHitMissRatio;
/**
* Creates new gauges using the platform OS bean.
*/
public EclipseLinkGaugeSet() {
this(ManagementFactory.getEclipseLinkMXBean());
}
/**
* Creates a new gauges using the given OS bean.
*
* @param mxBean an {@link EclipseLinkMXBean}
*/
public EclipseLinkGaugeSet(EclipseLinkMXBean mxBean) {
this.mxBean = mxBean;
committedVirtualMemorySize = getMethod("getCommittedVirtualMemorySize");
totalSwapSpaceSize = getMethod("getTotalSwapSpaceSize");
freeSwapSpaceSize = getMethod("getFreeSwapSpaceSize");
processCpuTime = getMethod("getProcessCpuTime");
freePhysicalMemorySize = getMethod("getFreePhysicalMemorySize");
totalPhysicalMemorySize = getMethod("getTotalPhysicalMemorySize");
openFileDescriptorCount = getMethod("getOpenFileDescriptorCount");
maxFileDescriptorCount = getMethod("getMaxFileDescriptorCount");
systemCpuLoad = getMethod("getSystemCpuLoad");
processCpuLoad = getMethod("getProcessCpuLoad");
}
@Override
public Map<String, Metric> getMetrics() {
final Map<String, Metric> gauges = new HashMap<>();
gauges.put("committedVirtualMemorySize", (Gauge<Long>) () -> invokeLong(committedVirtualMemorySize));
gauges.put("totalSwapSpaceSize", (Gauge<Long>) () -> invokeLong(totalSwapSpaceSize));
gauges.put("freeSwapSpaceSize", (Gauge<Long>) () -> invokeLong(freeSwapSpaceSize));
gauges.put("processCpuTime", (Gauge<Long>) () -> invokeLong(processCpuTime));
gauges.put("freePhysicalMemorySize", (Gauge<Long>) () -> invokeLong(freePhysicalMemorySize));
gauges.put("totalPhysicalMemorySize", (Gauge<Long>) () -> invokeLong(totalPhysicalMemorySize));
gauges.put("fd.usage", (Gauge<Double>) () -> invokeRatio(openFileDescriptorCount, maxFileDescriptorCount));
gauges.put("systemCpuLoad", (Gauge<Double>) () -> invokeDouble(systemCpuLoad));
gauges.put("processCpuLoad", (Gauge<Double>) () -> invokeDouble(processCpuLoad));
return gauges;
}
private Optional<Method> getMethod(String name) {
try {
final Method method = mxBean.getClass().getDeclaredMethod(name);
method.setAccessible(true);
return Optional.of(method);
} catch (NoSuchMethodException e) {
return Optional.empty();
}
}
private long invokeLong(Optional<Method> method) {
if (method.isPresent()) {
try {
return (long) method.get().invoke(mxBean);
} catch (IllegalAccessException | InvocationTargetException ite) {
return 0L;
}
}
return 0L;
}
private double invokeDouble(Optional<Method> method) {
if (method.isPresent()) {
try {
return (double) method.get().invoke(mxBean);
} catch (IllegalAccessException | InvocationTargetException ite) {
return 0.0;
}
}
return 0.0;
}
private double invokeRatio(Optional<Method> numeratorMethod, Optional<Method> denominatorMethod) {
if (numeratorMethod.isPresent() && denominatorMethod.isPresent()) {
try {
long numerator = (long) numeratorMethod.get().invoke(mxBean);
long denominator = (long) denominatorMethod.get().invoke(mxBean);
if (0 == denominator) {
return Double.NaN;
}
return 1.0 * numerator / denominator;
} catch (IllegalAccessException | InvocationTargetException ite) {
return Double.NaN;
}
}
return Double.NaN;
}
}