TFP-5818: Sjekker at kobling er aktiv da man skal ta skrive lås. Sonar. (#2646)

Author: mrsladek

domenetjenester/kobling/src/main/java/no/nav/foreldrepenger/abakus/kobling/repository/KoblingRepository.java

@@ -43,7 +43,11 @@ public Optional<Kobling> hentForKoblingReferanse(KoblingReferanse referanse) {
     }
 
     public Optional<Kobling> hentForKoblingReferanse(KoblingReferanse referanse, boolean taSkriveLås) {
-        var query = entityManager.createQuery("FROM Kobling k WHERE koblingReferanse = :referanse", Kobling.class);
+        var jpql = "FROM Kobling k WHERE koblingReferanse = :referanse";
+        if (taSkriveLås) {
+            jpql += " and k.aktiv = true";
+        }
+        var query = entityManager.createQuery(jpql, Kobling.class);
         query.setParameter("referanse", referanse);
         if (taSkriveLås) {
             query.setLockMode(LockModeType.PESSIMISTIC_WRITE);

web/src/main/java/no/nav/foreldrepenger/abakus/jetty/JettyServer.java

@@ -42,7 +42,7 @@ public class JettyServer {
         this.serverPort = serverPort;
     }
 
-    public static void main(String[] args) throws NamingException {
+    public static void main(String[] args) throws Exception {
         jettyServer(args).bootStrap();
     }
 
@@ -53,7 +53,7 @@ private static JettyServer jettyServer(String[] args) {
         return new JettyServer(ENV.getProperty("server.port", Integer.class, 8080));
     }
 
-    void bootStrap() throws NamingException {
+    void bootStrap() throws Exception {
         konfigurerSikkerhet();
         konfigurerJndi();
         konfigurerLogging();
@@ -87,40 +87,36 @@ private static void konfigurerLogging() {
         SLF4JBridgeHandler.install();
     }
 
-    private void start() {
-        try {
-            var server = new Server(getServerPort());
-            LOG.info("Starter server");
-            var context = new ServletContextHandler(CONTEXT_PATH, ServletContextHandler.NO_SESSIONS);
-
-            // Sikkerhet
-            context.setSecurityHandler(simpleConstraints());
-
-            // Servlets
-            registerDefaultServlet(context);
-            registerServlet(context, 0, InternalApiConfig.API_URI, InternalApiConfig.class);
-            registerServlet(context, 1, ApiConfig.API_URI, ApiConfig.class);
-            registerServlet(context, 2, ForvaltningApiConfig.API_URI, ForvaltningApiConfig.class);
-            registerServlet(context, 3, EksternApiConfig.API_URI, EksternApiConfig.class);
-
-            // Starter tjenester
-            context.addEventListener(new ServiceStarterListener());
-
-            // Enable Weld + CDI
-            context.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE);
-            context.addServletContainerInitializer(new CdiServletContainerInitializer());
-            context.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener());
-
-            server.setHandler(context);
-            server.setStopAtShutdown(true);
-            server.setStopTimeout(10000);
-            server.start();
-
-            LOG.info("Server startet på port: {}", getServerPort());
-            server.join();
-        } catch (Exception e) {
-            LOG.error("Feilet under oppstart.", e);
-        }
+    private void start() throws Exception{
+        var server = new Server(getServerPort());
+        LOG.info("Starter server");
+        var context = new ServletContextHandler(CONTEXT_PATH, ServletContextHandler.NO_SESSIONS);
+
+        // Sikkerhet
+        context.setSecurityHandler(simpleConstraints());
+
+        // Servlets
+        registerDefaultServlet(context);
+        registerServlet(context, 0, InternalApiConfig.API_URI, InternalApiConfig.class);
+        registerServlet(context, 1, ApiConfig.API_URI, ApiConfig.class);
+        registerServlet(context, 2, ForvaltningApiConfig.API_URI, ForvaltningApiConfig.class);
+        registerServlet(context, 3, EksternApiConfig.API_URI, EksternApiConfig.class);
+
+        // Starter tjenester
+        context.addEventListener(new ServiceStarterListener());
+
+        // Enable Weld + CDI
+        context.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE);
+        context.addServletContainerInitializer(new CdiServletContainerInitializer());
+        context.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener());
+
+        server.setHandler(context);
+        server.setStopAtShutdown(true);
+        server.setStopTimeout(10000);
+        server.start();
+
+        LOG.info("Server startet på port: {}", getServerPort());
+        server.join();
     }
 
     private static void registerDefaultServlet(ServletContextHandler context) {

web/src/test/java/no/nav/foreldrepenger/abakus/jetty/JettyDevServer.java

@@ -7,8 +7,6 @@
 
 import no.nav.foreldrepenger.konfig.Environment;
 
-import javax.naming.NamingException;
-
 public class JettyDevServer extends JettyServer {
 
     private static final Environment ENV = Environment.current();
@@ -18,7 +16,7 @@ private JettyDevServer(int serverPort) {
         super(serverPort);
     }
 
-    public static void main(String[] args) throws NamingException {
+    public static void main(String[] args) throws Exception {
         jettyServer(args).bootStrap();
     }