📍Use lombok, reformat, and optimize the code (#1560)

* Use lombok, reformat, and optimize the code

* Fix merge conflicts and some sonar issues

Co-authored-by: va1m <va1m@email.com>
This commit is contained in:
va1m
2021-03-13 13:19:21 +01:00
committed by GitHub
parent 0e26a6adb5
commit 5cf2fe009b
681 changed files with 2472 additions and 4966 deletions

View File

@ -40,7 +40,7 @@ public class SimpleObjectTest {
public void setUp() {
simpleObject = new SimpleObject();
}
@Test
public void testName() {
// given

View File

@ -23,10 +23,9 @@
package domainapp.dom.modules.simple;
import com.google.common.collect.Lists;
import static org.junit.Assert.assertEquals;
import com.google.common.collect.Lists;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@ -56,7 +55,7 @@ public class SimpleObjectsTest {
simpleObjects = new SimpleObjects();
simpleObjects.container = mockContainer;
}
@Test
public void testCreate() {
@ -83,7 +82,7 @@ public class SimpleObjectsTest {
assertEquals(simpleObject, obj);
assertEquals(objectName, obj.getName());
}
@Test
public void testListAll() {

View File

@ -35,7 +35,7 @@ import cucumber.api.junit.Cucumber;
@RunWith(Cucumber.class)
@CucumberOptions(format = {"html:target/cucumber-html-report", "json:target/cucumber.json"},
glue = {"classpath:domainapp.integtests.specglue"}, strict = true, tags = {"~@backlog",
"~@ignore"})
"~@ignore"})
public class RunSpecs {
// intentionally empty
}

View File

@ -50,7 +50,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
RecreateSimpleObjects fs;
SimpleObject simpleObjectPojo;
SimpleObject simpleObjectWrapped;
private static final String NEW_NAME = "new name";
@Before
@ -64,7 +64,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
assertNotNull(simpleObjectPojo);
simpleObjectWrapped = wrap(simpleObjectPojo);
}
@Test
public void testNameAccessible() {
/* when */
@ -72,7 +72,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
// then
assertEquals(fs.names.get(0), name);
}
@Test
public void testNameCannotBeUpdatedDirectly() {
@ -82,7 +82,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
// when
simpleObjectWrapped.setName(NEW_NAME);
}
@Test
public void testUpdateName() {
@ -92,7 +92,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
// then
assertEquals(NEW_NAME, simpleObjectWrapped.getName());
}
@Test
public void testUpdateNameFailsValidation() {
@ -103,7 +103,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
// when
simpleObjectWrapped.updateName(NEW_NAME + "!");
}
@Test
public void testInterpolatesName() {

View File

@ -46,6 +46,7 @@ public class SimpleObjectsIntegTest extends SimpleAppIntegTest {
@Inject
FixtureScripts fixtureScripts;
@Inject
SimpleObjects simpleObjects;

View File

@ -37,14 +37,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
import org.apache.wicket.Session;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.http.WebRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@ -63,9 +62,8 @@ import org.slf4j.LoggerFactory;
* &lt;/filter&gt;
* </pre>
*/
@Slf4j
public class SimpleApplication extends IsisWicketApplication {
private static final Logger LOGGER = LoggerFactory.getLogger(SimpleApplication.class);
private static final long serialVersionUID = 1L;
/**